1 ;;; vc.el --- drive a version-control system from within Emacs
3 ;; Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
8 ;; Per Cederqvist <ceder@lysator.liu.edu>
9 ;; Andre Spiegel <spiegel@berlin.informatik.uni-stuttgart.de>
11 ;; This file is part of GNU Emacs.
13 ;; GNU Emacs is free software; you can redistribute it and/or modify
14 ;; it under the terms of the GNU General Public License as published by
15 ;; the Free Software Foundation; either version 2, or (at your option)
18 ;; GNU Emacs is distributed in the hope that it will be useful,
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 ;; GNU General Public License for more details.
23 ;; You should have received a copy of the GNU General Public License
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
26 ;; Boston, MA 02111-1307, USA.
30 ;; This mode is fully documented in the Emacs user's manual.
32 ;; This was designed and implemented by Eric Raymond <esr@snark.thyrsus.com>.
33 ;; Paul Eggert <eggert@twinsun.com>, Sebastian Kremer <sk@thp.uni-koeln.de>,
34 ;; and Richard Stallman contributed valuable criticism, support, and testing.
35 ;; CVS support was added by Per Cederqvist <ceder@lysator.liu.se>
38 ;; Supported version-control systems presently include SCCS, RCS, and CVS.
40 ;; Some features will not work with old RCS versions. Where
41 ;; appropriate, VC finds out which version you have, and allows or
42 ;; disallows those features (stealing locks, for example, works only
43 ;; from 5.6.2 onwards).
44 ;; Even initial checkins will fail if your RCS version is so old that ci
45 ;; doesn't understand -t-; this has been known to happen to people running
48 ;; You can support the RCS -x option by adding pairs to the
49 ;; vc-master-templates list.
51 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff
52 ;; to be installed somewhere on Emacs's path for executables.
54 ;; If your site uses the ChangeLog convention supported by Emacs, the
55 ;; function vc-comment-to-change-log should prove a useful checkin hook.
57 ;; This code depends on call-process passing back the subprocess exit
58 ;; status. Thus, you need Emacs 18.58 or later to run it. For the
59 ;; vc-directory command to work properly as documented, you need 19.
60 ;; You also need Emacs 19's ring.el.
62 ;; The vc code maintains some internal state in order to reduce expensive
63 ;; version-control operations to a minimum. Some names are only computed
64 ;; once. If you perform version control operations with RCS/SCCS/CVS while
65 ;; vc's back is turned, or move/rename master files while vc is running,
66 ;; vc may get seriously confused. Don't do these things!
68 ;; Developer's notes on some concurrency issues are included at the end of
75 (eval-when-compile (require 'dired)) ; for dired-map-over-marks macro
77 (if (not (assoc 'vc-parent-buffer minor-mode-alist))
78 (setq minor-mode-alist
79 (cons '(vc-parent-buffer vc-parent-buffer-name)
82 ;; To implement support for a new version-control system, add another
83 ;; branch to the vc-backend-dispatch macro and fill it in in each
84 ;; call. The variable vc-master-templates in vc-hooks.el will also
87 (defmacro vc-backend-dispatch (f s r c)
88 "Execute FORM1, FORM2 or FORM3 for SCCS, RCS or CVS respectively.
89 If FORM3 is `RCS', use FORM2 for CVS as well as RCS.
90 \(CVS shares some code with RCS)."
91 (list 'let (list (list 'type (list 'vc-backend f)))
93 (list (list 'eq 'type (quote 'SCCS)) s) ;; SCCS
94 (list (list 'eq 'type (quote 'RCS)) r) ;; RCS
95 (list (list 'eq 'type (quote 'CVS)) ;; CVS
99 ;; General customization
101 (defvar vc-suppress-confirm nil
102 "*If non-nil, treat user as expert; suppress yes-no prompts on some things.")
103 (defvar vc-initial-comment nil
104 "*If non-nil, prompt for initial comment when a file is registered.")
105 (defvar vc-command-messages nil
106 "*If non-nil, display run messages from back-end commands.")
107 (defvar vc-checkin-switches nil
108 "*A string or list of strings specifying extra switches passed
109 to the checkin program by \\[vc-checkin].")
110 (defvar vc-checkout-switches nil
111 "*A string or list of strings specifying extra switches passed
112 to the checkout program by \\[vc-checkout].")
113 (defvar vc-directory-exclusion-list '("SCCS" "RCS" "CVS")
114 "*A list of directory names ignored by functions that recursively
117 (defconst vc-maximum-comment-ring-size 32
118 "Maximum number of saved comments in the comment ring.")
120 ;;; This is duplicated in diff.el.
121 (defvar diff-switches "-c"
122 "*A string or list of strings specifying switches to be be passed to diff.")
125 (defvar vc-checkin-hook nil
126 "*List of functions called after a checkin is done. See `run-hooks'.")
128 (defvar vc-make-buffer-writable-hook nil
129 "*List of functions called when a buffer is made writable. See `run-hooks.'
130 This hook is only used when the version control system is CVS. It
131 might be useful for sites who uses locking with CVS, or who uses link
132 farms to gold trees.")
134 ;; Header-insertion hair
136 (defvar vc-header-alist
137 '((SCCS "\%W\%") (RCS "\$Id\$") (CVS "\$Id\$"))
138 "*Header keywords to be inserted by `vc-insert-headers'.
139 Must be a list of two-element lists, the first element of each must
140 be `RCS', `CVS', or `SCCS'. The second element is the string to
141 be inserted for this particular backend.")
142 (defvar vc-static-header-alist
144 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
145 "*Associate static header string templates with file types. A \%s in the
146 template is replaced with the first string associated with the file's
147 version-control type in `vc-header-alist'.")
149 (defvar vc-comment-alist
150 '((nroff-mode ".\\\"" ""))
151 "*Special comment delimiters to be used in generating vc headers only.
152 Add an entry in this list if you need to override the normal comment-start
153 and comment-end variables. This will only be necessary if the mode language
154 is sensitive to blank lines.")
156 ;; Default is to be extra careful for super-user.
157 (defvar vc-checkout-carefully (= (user-uid) 0)
158 "*Non-nil means be extra-careful in checkout.
159 Verify that the file really is not locked
160 and that its contents match what the master file says.")
162 (defvar vc-rcs-release nil
163 "*The release number of your RCS installation, as a string.
164 If nil, VC itself computes this value when it is first needed.")
166 (defvar vc-sccs-release nil
167 "*The release number of your SCCS installation, as a string.
168 If nil, VC itself computes this value when it is first needed.")
170 (defvar vc-cvs-release nil
171 "*The release number of your CVS installation, as a string.
172 If nil, VC itself computes this value when it is first needed.")
174 ;; Variables the user doesn't need to know about.
175 (defvar vc-log-entry-mode nil)
176 (defvar vc-log-operation nil)
177 (defvar vc-log-after-operation-hook nil)
178 (defvar vc-checkout-writable-buffer-hook 'vc-checkout-writable-buffer)
179 ;; In a log entry buffer, this is a local variable
180 ;; that points to the buffer for which it was made
181 ;; (either a file, or a VC dired buffer).
182 (defvar vc-parent-buffer nil)
183 (defvar vc-parent-buffer-name nil)
186 (defvar vc-log-version)
188 (defconst vc-name-assoc-file "VC-names")
190 (defvar vc-dired-mode nil)
191 (make-variable-buffer-local 'vc-dired-mode)
193 (defvar vc-comment-ring (make-ring vc-maximum-comment-ring-size))
194 (defvar vc-comment-ring-index nil)
195 (defvar vc-last-comment-match nil)
197 ;; Back-portability to Emacs 18
199 (defun file-executable-p-18 (f)
200 (let ((modes (file-modes f)))
201 (and modes (not (zerop (logand 292))))))
203 (defun file-regular-p-18 (f)
204 (let ((attributes (file-attributes f)))
205 (and attributes (not (car attributes)))))
207 ; Conditionally rebind some things for Emacs 18 compatibility
208 (if (not (boundp 'minor-mode-map-alist))
210 (setq compilation-old-error-list nil)
211 (fset 'file-executable-p 'file-executable-p-18)
212 (fset 'shrink-window-if-larger-than-buffer 'beginning-of-buffer)
215 (if (not (fboundp 'file-regular-p))
216 (fset 'file-regular-p 'file-regular-p-18))
218 ;;; Find and compare backend releases
220 (defun vc-backend-release (backend)
221 ;; Returns which backend release is installed on this system.
225 (and (zerop (vc-do-command nil 2 "rcs" nil nil "-V"))
227 (set-buffer (get-buffer "*vc*"))
229 (car (vc-parse-buffer
230 '(("^RCS version \\([0-9.]+ *.*\\)" 1)))))))
231 (setq vc-rcs-release 'unknown)))
234 (and (zerop (vc-do-command nil 1 "cvs" nil nil "-v"))
236 (set-buffer (get-buffer "*vc*"))
238 (car (vc-parse-buffer
239 '(("^Concurrent Versions System (CVS) \\([0-9.]+\\)"
241 (setq vc-cvs-release 'unknown)))
245 (defun vc-release-greater-or-equal (r1 r2)
246 ;; Compare release numbers, represented as strings.
247 ;; Release components are assumed cardinal numbers, not decimal
248 ;; fractions (5.10 is a higher release than 5.9). Omitted fields
249 ;; are considered lower (5.6.7 is earlier than 5.6.7.1).
250 ;; Comparison runs till the end of the string is found, or a
251 ;; non-numeric component shows up (5.6.7 is earlier than "5.6.7 beta",
252 ;; which is probably not what you want in some cases).
253 ;; This code is suitable for existing RCS release numbers.
254 ;; CVS releases are handled reasonably, too (1.3 < 1.4* < 1.5).
257 (or (and (string-match "^\\.?\\([0-9]+\\)" r1)
258 (setq i1 (match-end 0))
259 (setq v1 (string-to-number (match-string 1 r1)))
260 (or (and (string-match "^\\.?\\([0-9]+\\)" r2)
261 (setq i2 (match-end 0))
262 (setq v2 (string-to-number (match-string 1 r2)))
263 (if (> v1 v2) (throw 'done t)
264 (if (< v1 v2) (throw 'done nil)
266 (vc-release-greater-or-equal
268 (substring r2 i2)))))))
270 (or (and (string-match "^\\.?\\([0-9]+\\)" r2)
274 (defun vc-backend-release-p (backend release)
275 ;; Return t if we have RELEASE of BACKEND or better
276 (let (i r (ri 0) (ii 0) is rs (installation (vc-backend-release backend)))
277 (if (not (eq installation 'unknown))
279 ((or (eq backend 'RCS) (eq backend 'CVS))
280 (vc-release-greater-or-equal installation release))))))
282 ;;; functions that operate on RCS revision numbers
284 (defun vc-trunk-p (rev)
285 ;; return t if REV is a revision on the trunk
286 (not (eq nil (string-match "\\`[0-9]+\\.[0-9]+\\'" rev))))
288 (defun vc-branch-part (rev)
289 ;; return the branch part of a revision number REV
290 (substring rev 0 (string-match "\\.[0-9]+\\'" rev)))
292 ;; File property caching
294 (defun vc-clear-context ()
295 "Clear all cached file properties and the comment ring."
297 (fillarray vc-file-prop-obarray nil)
298 ;; Note: there is potential for minor lossage here if there is an open
299 ;; log buffer with a nonzero local value of vc-comment-ring-index.
300 (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size)))
302 (defun vc-file-clear-masterprops (file)
303 ;; clear all properties of FILE that were retrieved
304 ;; from the master file
305 (vc-file-setprop file 'vc-latest-version nil)
306 (vc-file-setprop file 'vc-your-latest-version nil)
307 (vc-backend-dispatch file
309 (vc-file-setprop file 'vc-master-locks nil))
311 (vc-file-setprop file 'vc-default-branch nil)
312 (vc-file-setprop file 'vc-head-version nil)
313 (vc-file-setprop file 'vc-master-workfile-version nil)
314 (vc-file-setprop file 'vc-master-locks nil))
316 (vc-file-setprop file 'vc-cvs-status nil))))
318 (defun vc-head-version (file)
319 ;; Return the RCS head version of FILE
320 (cond ((vc-file-getprop file 'vc-head-version))
321 (t (vc-fetch-master-properties file)
322 (vc-file-getprop file 'vc-head-version))))
324 ;; Random helper functions
326 (defun vc-latest-on-branch-p (file)
327 ;; return t iff the current workfile version of FILE is
328 ;; the latest on its branch.
329 (vc-backend-dispatch file
331 (string= (vc-workfile-version file) (vc-latest-version file))
333 (let ((workfile-version (vc-workfile-version file)) tip-version)
334 (if (vc-trunk-p workfile-version)
336 ;; Re-fetch the head version number. This is to make
337 ;; sure that no-one has checked in a new version behind
339 (vc-fetch-master-properties file)
340 (string= (vc-file-getprop file 'vc-head-version)
342 ;; If we are not on the trunk, we need to examine the
343 ;; whole current branch. (vc-master-workfile-version
344 ;; is not what we need.)
346 (set-buffer (get-buffer-create "*vc-info*"))
347 (vc-insert-file (vc-name file) "^desc")
348 (setq tip-version (car (vc-parse-buffer (list (list
349 (concat "^\\(" (regexp-quote (vc-branch-part workfile-version))
350 "\\.[0-9]+\\)\ndate[ \t]+\\([0-9.]+\\);") 1 2)))))
351 (if (get-buffer "*vc-info*")
352 (kill-buffer (get-buffer "*vc-info*")))
353 (string= tip-version workfile-version))))
357 (defun vc-registration-error (file)
359 (error "File %s is not under version control" file)
360 (error "Buffer %s is not associated with a file" (buffer-name))))
362 (defvar vc-binary-assoc nil)
364 (defun vc-find-binary (name)
365 "Look for a command anywhere on the subprocess-command search path."
366 (or (cdr (assoc name vc-binary-assoc))
372 (let ((full (concat s "/" name)))
373 (if (file-executable-p full)
375 (setq vc-binary-assoc
376 (cons (cons name full) vc-binary-assoc))
377 (throw 'found full)))))))
381 (defun vc-do-command (buffer okstatus command file last &rest flags)
382 "Execute a version-control command, notifying user and checking for errors.
383 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil.
384 The command is successful if its exit status does not exceed OKSTATUS.
385 The last argument of the command is the master name of FILE if LAST is
386 `MASTER', or the workfile of FILE if LAST is `WORKFILE'; this is appended
387 to an optional list of FLAGS."
388 (and file (setq file (expand-file-name file)))
389 (if (not buffer) (setq buffer "*vc*"))
390 (if vc-command-messages
391 (message "Running %s on %s..." command file))
392 (let ((obuf (current-buffer)) (camefrom (current-buffer))
394 (vc-file (and file (vc-name file)))
395 (olddir default-directory)
397 (set-buffer (get-buffer-create buffer))
398 (set (make-local-variable 'vc-parent-buffer) camefrom)
399 (set (make-local-variable 'vc-parent-buffer-name)
400 (concat " from " (buffer-name camefrom)))
401 (setq default-directory olddir)
406 (function (lambda (s) (and s (setq squeezed (append squeezed (list s))))))
408 (if (and vc-file (eq last 'MASTER))
409 (setq squeezed (append squeezed (list vc-file))))
410 (if (eq last 'WORKFILE)
412 (let* ((pwd (expand-file-name default-directory))
413 (preflen (length pwd)))
414 (if (string= (substring file 0 preflen) pwd)
415 (setq file (substring file preflen))))
416 (setq squeezed (append squeezed (list file)))))
417 (let ((exec-path (append vc-path exec-path))
418 ;; Add vc-path to PATH for the execution of this command.
420 (cons (concat "PATH=" (getenv "PATH")
422 (mapconcat 'identity vc-path path-separator))
423 process-environment)))
424 (setq status (apply 'call-process command nil t nil squeezed)))
425 (goto-char (point-max))
426 (set-buffer-modified-p nil)
428 (if (or (not (integerp status)) (< okstatus status))
430 (pop-to-buffer buffer)
431 (goto-char (point-min))
432 (shrink-window-if-larger-than-buffer)
433 (error "Running %s...FAILED (%s)" command
434 (if (integerp status)
435 (format "status %d" status)
438 (if vc-command-messages
439 (message "Running %s...OK" command))
445 ;;; Save a bit of the text around POSN in the current buffer, to help
446 ;;; us find the corresponding position again later. This works even
447 ;;; if all markers are destroyed or corrupted.
448 ;;; A lot of this was shamelessly lifted from Sebastian Kremer's rcs.el mode.
449 (defun vc-position-context (posn)
452 (buffer-substring posn
453 (min (point-max) (+ posn 100)))))
455 ;;; Return the position of CONTEXT in the current buffer, or nil if we
456 ;;; couldn't find it.
457 (defun vc-find-position-by-context (context)
458 (let ((context-string (nth 2 context)))
459 (if (equal "" context-string)
462 (let ((diff (- (nth 1 context) (buffer-size))))
463 (if (< diff 0) (setq diff (- diff)))
464 (goto-char (nth 0 context))
465 (if (or (search-forward context-string nil t)
466 ;; Can't use search-backward since the match may continue
468 (progn (goto-char (- (point) diff (length context-string)))
469 ;; goto-char doesn't signal an error at
470 ;; beginning of buffer like backward-char would
471 (search-forward context-string nil t)))
472 ;; to beginning of OSTRING
473 (- (point) (length context-string))))))))
475 (defun vc-buffer-context ()
476 ;; Return a list '(point-context mark-context reparse); from which
477 ;; vc-restore-buffer-context can later restore the context.
478 (let ((point-context (vc-position-context (point)))
479 ;; Use mark-marker to avoid confusion in transient-mark-mode.
480 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer))
481 (vc-position-context (mark-marker))))
482 ;; Make the right thing happen in transient-mark-mode.
484 ;; We may want to reparse the compilation buffer after revert
485 (reparse (and (boundp 'compilation-error-list) ;compile loaded
486 (let ((curbuf (current-buffer)))
487 ;; Construct a list; each elt is nil or a buffer
488 ;; iff that buffer is a compilation output buffer
489 ;; that contains markers into the current buffer.
495 compilation-old-error-list
496 compilation-error-list))
497 (buffer-error-marked-p nil))
498 (while (and (consp errors)
499 (not buffer-error-marked-p))
500 (and (markerp (cdr (car errors)))
504 (setq buffer-error-marked-p t))
505 (setq errors (cdr errors)))
506 (if buffer-error-marked-p buffer))))
508 (list point-context mark-context reparse)))
510 (defun vc-restore-buffer-context (context)
511 ;; Restore point/mark, and reparse any affected compilation buffers.
512 ;; CONTEXT is that which vc-buffer-context returns.
513 (let ((point-context (nth 0 context))
514 (mark-context (nth 1 context))
515 (reparse (nth 2 context)))
516 ;; Reparse affected compilation buffers.
520 (set-buffer (car reparse))
521 (let ((compilation-last-buffer (current-buffer)) ;select buffer
522 ;; Record the position in the compilation buffer of
523 ;; the last error next-error went to.
524 (error-pos (marker-position
525 (car (car-safe compilation-error-list)))))
526 ;; Reparse the error messages as far as they were parsed before.
527 (compile-reinitialize-errors '(4) compilation-parsing-end)
528 ;; Move the pointer up to find the error we were at before
529 ;; reparsing. Now next-error should properly go to the next one.
530 (while (and compilation-error-list
531 (/= error-pos (car (car compilation-error-list))))
532 (setq compilation-error-list (cdr compilation-error-list))))))
533 (setq reparse (cdr reparse)))
535 ;; Restore point and mark
536 (let ((new-point (vc-find-position-by-context point-context)))
537 (if new-point (goto-char new-point)))
539 (let ((new-mark (vc-find-position-by-context mark-context)))
540 (if new-mark (set-mark new-mark))))))
542 (defun vc-revert-buffer1 (&optional arg no-confirm)
543 ;; Revert buffer, try to keep point and mark where user expects them in spite
544 ;; of changes because of expanded version-control key words.
545 ;; This is quite important since otherwise typeahead won't work as expected.
548 (let ((context (vc-buffer-context)))
549 ;; t means don't call normal-mode; that's to preserve various minor modes.
550 (revert-buffer arg no-confirm t)
551 (vc-restore-buffer-context context)))
554 (defun vc-buffer-sync (&optional not-urgent)
555 ;; Make sure the current buffer and its working file are in sync
556 ;; NOT-URGENT means it is ok to continue if the user says not to save.
557 (if (buffer-modified-p)
558 (if (or vc-suppress-confirm
559 (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name))))
563 (error "Aborted")))))
566 (defun vc-workfile-unchanged-p (file &optional want-differences-if-changed)
567 ;; Has the given workfile changed since last checkout?
568 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
569 (lastmod (nth 5 (file-attributes file))))
570 (or (equal checkout-time lastmod)
571 (and (or (not checkout-time) want-differences-if-changed)
572 (let ((unchanged (zerop (vc-backend-diff file nil nil
573 (not want-differences-if-changed)))))
574 ;; 0 stands for an unknown time; it can't match any mod time.
575 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))
578 (defun vc-next-action-on-file (file verbose &optional comment)
579 ;;; If comment is specified, it will be used as an admin or checkin comment.
580 (let ((vc-file (vc-name file))
581 (vc-type (vc-backend file))
582 owner version buffer)
585 ;; if there is no master file corresponding, create one
587 (vc-register verbose comment)
588 (if vc-initial-comment
589 (setq vc-log-after-operation-hook
590 'vc-checkout-writable-buffer-hook)
591 (vc-checkout-writable-buffer file)))
593 ;; CVS: changes to the master file need to be
594 ;; merged back into the working file
595 ((and (eq vc-type 'CVS)
596 (or (eq (vc-cvs-status file) 'needs-checkout)
597 (eq (vc-cvs-status file) 'needs-merge)))
598 (if (or vc-dired-mode
600 (format "%s is not up-to-date. Merge in changes now? "
604 (and (setq buffer (get-file-buffer file))
605 (buffer-modified-p buffer)
606 (switch-to-buffer-other-window buffer)
608 (setq buffer (current-buffer))
610 (if (and buffer (buffer-modified-p buffer)
613 "Buffer %s modified; merge file on disc anyhow? "
614 (buffer-name buffer)))))
615 (error "Merge aborted"))
616 (if (not (zerop (vc-backend-merge-news file)))
617 ;; Overlaps detected - what now? Should use some
618 ;; fancy RCS conflict resolving package, or maybe
619 ;; emerge, but for now, simply warn the user with a
621 (message "Conflicts detected!"))
623 (vc-resynch-buffer file t (not (buffer-modified-p buffer)))))
624 (error "%s needs update" (buffer-name))))
626 ;; if there is no lock on the file, assert one and get it
627 ((not (setq owner (vc-locking-user file)))
628 (if (and vc-checkout-carefully
629 (not (vc-workfile-unchanged-p file t)))
630 (if (save-window-excursion
631 (pop-to-buffer "*vc-diff*")
632 (goto-char (point-min))
633 (insert-string (format "Changes to %s since last lock:\n\n"
637 (concat "File has unlocked changes, "
638 "claim lock retaining changes? ")))
639 (progn (vc-backend-steal file)
641 (if (not (yes-or-no-p "Revert to checked-in version, instead? "))
642 (error "Checkout aborted")
643 (vc-revert-buffer1 t t)
644 (vc-checkout-writable-buffer file))
647 (if (not (eq vc-type 'SCCS))
648 (vc-checkout file nil
649 (read-string "Branch or version to move to: "))
650 (error "Sorry, this is not implemented for SCCS"))
651 (if (vc-latest-on-branch-p file)
652 (vc-checkout-writable-buffer file)
654 "This is not the latest version. Really lock it? ")
655 (vc-checkout-writable-buffer file)
656 (if (yes-or-no-p "Lock the latest version instead? ")
657 (vc-checkout-writable-buffer file
658 (if (vc-trunk-p (vc-workfile-version file))
659 "" ;; this means check out latest on trunk
660 (vc-branch-part (vc-workfile-version file)))))))
663 ;; a checked-out version exists, but the user may not own the lock
664 ((and (not (eq vc-type 'CVS))
665 (not (string-equal owner (user-login-name))))
667 (error "Sorry, you can't steal the lock on %s this way" file))
668 (and (eq vc-type 'RCS)
669 (not (vc-backend-release-p 'RCS "5.6.2"))
670 (error "File is locked by %s" owner))
673 (if verbose (read-string "Version to steal: ")
674 (vc-workfile-version file))
677 ;; OK, user owns the lock on the file
680 (find-file-other-window file)
683 ;; give luser a chance to save before checking in.
686 ;; Revert if file is unchanged and buffer is too.
687 ;; If buffer is modified, that means the user just said no
688 ;; to saving it; in that case, don't revert,
689 ;; because the user might intend to save
690 ;; after finishing the log entry.
691 (if (and (vc-workfile-unchanged-p file)
692 (not (buffer-modified-p)))
693 ;; DO NOT revert the file without asking the user!
695 ((yes-or-no-p "Revert to master version? ")
696 (vc-backend-revert file)
697 (vc-resynch-window file t t)))
699 ;; user may want to set nonstandard parameters
701 (setq version (read-string "New version level: ")))
703 ;; OK, let's do the checkin
704 (vc-checkin file version comment)
707 (defun vc-next-action-dired (file rev comment)
708 ;; Do a vc-next-action-on-file on all the marked files, possibly
709 ;; passing on the log comment we've just entered.
710 (let ((configuration (current-window-configuration))
711 (dired-buffer (current-buffer))
712 (dired-dir default-directory))
713 (dired-map-over-marks
714 (let ((file (dired-get-filename)) p
715 (default-directory default-directory))
716 (message "Processing %s..." file)
717 ;; Adjust the default directory so that checkouts
718 ;; go to the right place.
719 (setq default-directory (file-name-directory file))
720 (vc-next-action-on-file file nil comment)
721 (set-buffer dired-buffer)
722 (setq default-directory dired-dir)
723 (vc-dired-update-line file)
724 (set-window-configuration configuration)
725 (message "Processing %s...done" file))
728 ;; Here's the major entry point.
731 (defun vc-next-action (verbose)
732 "Do the next logical checkin or checkout operation on the current file.
733 If you call this from within a VC dired buffer with no files marked,
734 it will operate on the file in the current line.
735 If you call this from within a VC dired buffer, and one or more
736 files are marked, it will accept a log message and then operate on
737 each one. The log message will be used as a comment for any register
738 or checkin operations, but ignored when doing checkouts. Attempted
739 lock steals will raise an error.
740 A prefix argument lets you specify the version number to use.
742 For RCS and SCCS files:
743 If the file is not already registered, this registers it for version
744 control and then retrieves a writable, locked copy for editing.
745 If the file is registered and not locked by anyone, this checks out
746 a writable and locked file ready for editing.
747 If the file is checked out and locked by the calling user, this
748 first checks to see if the file has changed since checkout. If not,
749 it performs a revert.
750 If the file has been changed, this pops up a buffer for entry
751 of a log message; when the message has been entered, it checks in the
752 resulting changes along with the log message as change commentary. If
753 the variable `vc-keep-workfiles' is non-nil (which is its default), a
754 read-only copy of the changed file is left in place afterwards.
755 If the file is registered and locked by someone else, you are given
756 the option to steal the lock.
759 If the file is not already registered, this registers it for version
760 control. This does a \"cvs add\", but no \"cvs commit\".
761 If the file is added but not committed, it is committed.
762 If your working file is changed, but the repository file is
763 unchanged, this pops up a buffer for entry of a log message; when the
764 message has been entered, it checks in the resulting changes along
765 with the logmessage as change commentary. A writable file is retained.
766 If the repository file is changed, you are asked if you want to
767 merge in the changes into your working copy."
772 (let ((files (dired-get-marked-files)))
775 (function (lambda (f)
776 (if (eq (vc-backend f) 'CVS)
777 (if (or (eq (vc-cvs-status f) 'locally-modified)
778 (eq (vc-cvs-status f) 'locally-added))
780 (if (vc-locking-user f) "@" ""))))
782 (vc-next-action-dired nil nil "dummy")
783 (vc-start-entry nil nil nil
784 "Enter a change comment for the marked files."
785 'vc-next-action-dired))
787 (while vc-parent-buffer
788 (pop-to-buffer vc-parent-buffer))
790 (vc-next-action-on-file buffer-file-name verbose)
791 (vc-registration-error nil))))
793 ;;; These functions help the vc-next-action entry point
795 (defun vc-checkout-writable-buffer (&optional file rev)
796 "Retrieve a writable copy of the latest version of the current buffer's file."
797 (vc-checkout (or file (buffer-file-name)) t rev)
801 (defun vc-register (&optional override comment)
802 "Register the current file into your version-control system."
805 (error "No visited file"))
806 (let ((master (vc-name buffer-file-name)))
807 (and master (file-exists-p master)
808 (error "This file is already registered"))
810 (not (y-or-n-p "Previous master file has vanished. Make a new one? "))
811 (error "This file is already registered")))
812 ;; Watch out for new buffers of size 0: the corresponding file
813 ;; does not exist yet, even though buffer-modified-p is nil.
814 (if (and (not (buffer-modified-p))
815 (zerop (buffer-size))
816 (not (file-exists-p buffer-file-name)))
817 (set-buffer-modified-p t))
819 (cond ((not vc-make-backup-files)
820 ;; inhibit backup for this buffer
821 (make-local-variable 'backup-inhibited)
822 (setq backup-inhibited t)))
827 (format "Initial version level for %s: " buffer-file-name))))
830 (defun vc-resynch-window (file &optional keep noquery)
831 ;; If the given file is in the current buffer,
832 ;; either revert on it so we see expanded keywords,
833 ;; or unvisit it (depending on vc-keep-workfiles)
834 ;; NOQUERY if non-nil inhibits confirmation for reverting.
835 ;; NOQUERY should be t *only* if it is known the only difference
836 ;; between the buffer and the file is due to RCS rather than user editing!
837 (and (string= buffer-file-name file)
840 ;; temporarily remove vc-find-file-hook, so that
841 ;; we don't lose the properties
842 (remove-hook 'find-file-hooks 'vc-find-file-hook)
843 (vc-revert-buffer1 t noquery)
844 (add-hook 'find-file-hooks 'vc-find-file-hook)
845 (vc-mode-line buffer-file-name))
846 (kill-buffer (current-buffer)))))
848 (defun vc-resynch-buffer (file &optional keep noquery)
849 ;; if FILE is currently visited, resynch its buffer
850 (let ((buffer (get-file-buffer file)))
854 (vc-resynch-window file keep noquery)))))
856 (defun vc-start-entry (file rev comment msg action &optional after-hook)
857 ;; Accept a comment for an operation on FILE revision REV. If COMMENT
858 ;; is nil, pop up a VC-log buffer, emit MSG, and set the
859 ;; action on close to ACTION; otherwise, do action immediately.
860 ;; Remember the file's buffer in vc-parent-buffer (current one if no file).
861 ;; AFTER-HOOK specifies the local value for vc-log-operation-hook.
862 (let ((parent (if file (find-file-noselect file) (current-buffer))))
864 (set-buffer (get-buffer-create "*VC-log*"))
865 (pop-to-buffer (get-buffer-create "*VC-log*")))
866 (set (make-local-variable 'vc-parent-buffer) parent)
867 (set (make-local-variable 'vc-parent-buffer-name)
868 (concat " from " (buffer-name vc-parent-buffer)))
869 (if file (vc-mode-line file))
871 (make-local-variable 'vc-log-after-operation-hook)
873 (setq vc-log-after-operation-hook after-hook))
874 (setq vc-log-operation action)
875 (setq vc-log-file file)
876 (setq vc-log-version rev)
881 (vc-finish-logentry t)
883 (vc-finish-logentry nil)))
884 (message "%s Type C-c C-c when done." msg))))
886 (defun vc-admin (file rev &optional comment)
887 "Check a file into your version-control system.
888 FILE is the unmodified name of the file. REV should be the base version
889 level to check it in under. COMMENT, if specified, is the checkin comment."
890 (vc-start-entry file rev
891 (or comment (not vc-initial-comment))
892 "Enter initial comment." 'vc-backend-admin
895 (defun vc-checkout (file &optional writable rev)
896 "Retrieve a copy of the latest version of the given file."
897 ;; If ftp is on this system and the name matches the ange-ftp format
898 ;; for a remote file, the user is trying something that won't work.
899 (if (and (string-match "^/[^/:]+:" file) (vc-find-binary "ftp"))
900 (error "Sorry, you can't check out files over FTP"))
901 (vc-backend-checkout file writable rev)
902 (vc-resynch-buffer file t t))
904 (defun vc-steal-lock (file rev &optional owner)
905 "Steal the lock on the current workfile."
906 (let (file-description)
908 (setq owner (vc-locking-user file)))
910 (setq file-description (format "%s:%s" file rev))
911 (setq file-description file))
912 (if (not (y-or-n-p (format "Take the lock on %s from %s? "
913 file-description owner)))
914 (error "Steal cancelled"))
915 (pop-to-buffer (get-buffer-create "*VC-mail*"))
916 (setq default-directory (expand-file-name "~/"))
917 (auto-save-mode auto-save-default)
920 (mail-setup owner (format "Stolen lock on %s" file-description) nil nil nil
921 (list (list 'vc-finish-steal file rev)))
922 (goto-char (point-max))
924 (format "I stole the lock on %s, " file-description)
925 (current-time-string)
927 (message "Please explain why you stole the lock. Type C-c C-c when done.")))
929 ;; This is called when the notification has been sent.
930 (defun vc-finish-steal (file version)
931 (vc-backend-steal file version)
932 (if (get-file-buffer file)
934 (set-buffer (get-file-buffer file))
935 (vc-resynch-window file t t))))
937 (defun vc-checkin (file &optional rev comment)
938 "Check in the file specified by FILE.
939 The optional argument REV may be a string specifying the new version level
940 \(if nil increment the current level). The file is either retained with write
941 permissions zeroed, or deleted (according to the value of `vc-keep-workfiles').
942 If the back-end is CVS, a writable workfile is always kept.
943 COMMENT is a comment string; if omitted, a buffer is
944 popped up to accept a comment."
945 (vc-start-entry file rev comment
946 "Enter a change comment." 'vc-backend-checkin
949 ;;; Here is a checkin hook that may prove useful to sites using the
950 ;;; ChangeLog facility supported by Emacs.
951 (defun vc-comment-to-change-log (&optional whoami file-name)
952 "Enter last VC comment into change log file for current buffer's file.
953 Optional arg (interactive prefix) non-nil means prompt for user name and site.
954 Second arg is file name of change log. \
955 If nil, uses `change-log-default-name'."
956 (interactive (if current-prefix-arg
957 (list current-prefix-arg
958 (prompt-for-change-log-name))))
959 ;; Make sure the defvar for add-log-current-defun-function has been executed
960 ;; before binding it.
962 (let (;; Extract the comment first so we get any error before doing anything.
963 (comment (ring-ref vc-comment-ring 0))
964 ;; Don't let add-change-log-entry insert a defun name.
965 (add-log-current-defun-function 'ignore)
967 ;; Call add-log to do half the work.
968 (add-change-log-entry whoami file-name t t)
969 ;; Insert the VC comment, leaving point before it.
970 (setq end (save-excursion (insert comment) (point-marker)))
971 (if (looking-at "\\s *\\s(")
972 ;; It starts with an open-paren, as in "(foo): Frobbed."
973 ;; So remove the ": " add-log inserted.
975 ;; Canonicalize the white space between the file name and comment.
977 ;; Indent rest of the text the same way add-log indented the first line.
978 (let ((indentation (current-indentation)))
980 (while (< (point) end)
982 (indent-to indentation))
984 ;; Fill the inserted text, preserving open-parens at bol.
985 (let ((paragraph-separate (concat paragraph-separate "\\|\\s *\\s("))
986 (paragraph-start (concat paragraph-start "\\|\\s *\\s(")))
988 (fill-region (point) end))
989 ;; Canonicalize the white space at the end of the entry so it is
990 ;; separated from the next entry by a single blank line.
991 (skip-syntax-forward " " end)
992 (delete-char (- (skip-syntax-backward " ")))
993 (or (eobp) (looking-at "\n\n")
997 (defun vc-finish-logentry (&optional nocomment)
998 "Complete the operation implied by the current log entry."
1000 ;; Check and record the comment, if any.
1003 (goto-char (point-max))
1006 ;; Comment too long?
1007 (vc-backend-logentry-check vc-log-file)
1008 ;; Record the comment in the comment ring
1009 (ring-insert vc-comment-ring (buffer-string))
1011 ;; Sync parent buffer in case the user modified it while editing the comment.
1012 ;; But not if it is a vc-dired buffer.
1014 (set-buffer vc-parent-buffer)
1017 (if (not vc-log-operation) (error "No log operation is pending"))
1018 ;; save the parameters held in buffer-local variables
1019 (let ((log-operation vc-log-operation)
1020 (log-file vc-log-file)
1021 (log-version vc-log-version)
1022 (log-entry (buffer-string))
1023 (after-hook vc-log-after-operation-hook))
1024 ;; Return to "parent" buffer of this checkin and remove checkin window
1025 (pop-to-buffer vc-parent-buffer)
1026 (let ((logbuf (get-buffer "*VC-log*")))
1027 (delete-windows-on logbuf)
1028 (kill-buffer logbuf))
1031 (funcall log-operation
1035 ;; Now make sure we see the expanded headers
1036 (if buffer-file-name
1037 (vc-resynch-window buffer-file-name vc-keep-workfiles t))
1038 (run-hooks after-hook)))
1040 ;; Code for access to the comment ring
1042 (defun vc-previous-comment (arg)
1043 "Cycle backwards through comment history."
1045 (let ((len (ring-length vc-comment-ring)))
1047 (message "Empty comment ring")
1051 ;; Initialize the index on the first use of this command
1052 ;; so that the first M-p gets index 0, and the first M-n gets
1054 (if (null vc-comment-ring-index)
1055 (setq vc-comment-ring-index
1057 (if (< arg 0) 1 0))))
1058 (setq vc-comment-ring-index
1059 (mod (+ vc-comment-ring-index arg) len))
1060 (message "%d" (1+ vc-comment-ring-index))
1061 (insert (ring-ref vc-comment-ring vc-comment-ring-index))))))
1063 (defun vc-next-comment (arg)
1064 "Cycle forwards through comment history."
1066 (vc-previous-comment (- arg)))
1068 (defun vc-comment-search-reverse (str)
1069 "Searches backwards through comment history for substring match."
1070 (interactive "sComment substring: ")
1071 (if (string= str "")
1072 (setq str vc-last-comment-match)
1073 (setq vc-last-comment-match str))
1074 (if (null vc-comment-ring-index)
1075 (setq vc-comment-ring-index -1))
1076 (let ((str (regexp-quote str))
1077 (len (ring-length vc-comment-ring))
1078 (n (1+ vc-comment-ring-index)))
1079 (while (and (< n len) (not (string-match str (ring-ref vc-comment-ring n))))
1082 (vc-previous-comment (- n vc-comment-ring-index)))
1083 (t (error "Not found")))))
1085 (defun vc-comment-search-forward (str)
1086 "Searches forwards through comment history for substring match."
1087 (interactive "sComment substring: ")
1088 (if (string= str "")
1089 (setq str vc-last-comment-match)
1090 (setq vc-last-comment-match str))
1091 (if (null vc-comment-ring-index)
1092 (setq vc-comment-ring-index 0))
1093 (let ((str (regexp-quote str))
1094 (len (ring-length vc-comment-ring))
1095 (n vc-comment-ring-index))
1096 (while (and (>= n 0) (not (string-match str (ring-ref vc-comment-ring n))))
1099 (vc-next-comment (- n vc-comment-ring-index)))
1100 (t (error "Not found")))))
1102 ;; Additional entry points for examining version histories
1105 (defun vc-diff (historic &optional not-urgent)
1106 "Display diffs between file versions.
1107 Normally this compares the current file and buffer with the most recent
1108 checked in version of that file. This uses no arguments.
1109 With a prefix argument, it reads the file name to use
1110 and two version designators specifying which versions to compare."
1111 (interactive (list current-prefix-arg t))
1113 (set-buffer (find-file-noselect (dired-get-filename))))
1114 (while vc-parent-buffer
1115 (pop-to-buffer vc-parent-buffer))
1117 (call-interactively 'vc-version-diff)
1118 (if (or (null buffer-file-name) (null (vc-name buffer-file-name)))
1120 "There is no version-control master associated with this buffer"))
1121 (let ((file buffer-file-name)
1123 (or (and file (vc-name file))
1124 (vc-registration-error file))
1125 (vc-buffer-sync not-urgent)
1126 (setq unchanged (vc-workfile-unchanged-p buffer-file-name))
1128 (message "No changes to %s since latest version" file)
1129 (vc-backend-diff file)
1130 ;; Ideally, we'd like at this point to parse the diff so that
1131 ;; the buffer effectively goes into compilation mode and we
1132 ;; can visit the old and new change locations via next-error.
1133 ;; Unfortunately, this is just too painful to do. The basic
1134 ;; problem is that the `old' file doesn't exist to be
1135 ;; visited. This plays hell with numerous assumptions in
1136 ;; the diff.el and compile.el machinery.
1137 (set-buffer "*vc-diff*")
1138 (setq default-directory (file-name-directory file))
1139 (if (= 0 (buffer-size))
1142 (message "No changes to %s since latest version" file))
1143 (pop-to-buffer "*vc-diff*")
1144 (goto-char (point-min))
1145 (shrink-window-if-larger-than-buffer)))
1148 (defun vc-version-diff (file rel1 rel2)
1149 "For FILE, report diffs between two stored versions REL1 and REL2 of it.
1150 If FILE is a directory, generate diffs between versions for all registered
1151 files in or below it."
1152 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ")
1153 (if (string-equal rel1 "") (setq rel1 nil))
1154 (if (string-equal rel2 "") (setq rel2 nil))
1155 (if (file-directory-p file)
1156 (let ((camefrom (current-buffer)))
1157 (set-buffer (get-buffer-create "*vc-status*"))
1158 (set (make-local-variable 'vc-parent-buffer) camefrom)
1159 (set (make-local-variable 'vc-parent-buffer-name)
1160 (concat " from " (buffer-name camefrom)))
1162 (insert "Diffs between "
1163 (or rel1 "last version checked in")
1165 (or rel2 "current workfile(s)")
1167 (set-buffer (get-buffer-create "*vc-diff*"))
1171 (function (lambda (f)
1172 (message "Looking at %s" f)
1174 (not (file-directory-p f))
1176 (vc-backend-diff f rel1 rel2)
1177 (append-to-buffer "*vc-status*" (point-min) (point-max)))
1179 (pop-to-buffer "*vc-status*")
1180 (insert "\nEnd of diffs.\n")
1181 (goto-char (point-min))
1182 (set-buffer-modified-p nil)
1184 (if (zerop (vc-backend-diff file rel1 rel2))
1185 (message "No changes to %s between %s and %s." file rel1 rel2)
1186 (pop-to-buffer "*vc-diff*"))))
1189 (defun vc-version-other-window (rev)
1190 "Visit version REV of the current buffer in another window.
1191 If the current buffer is named `F', the version is named `F.~REV~'.
1192 If `F.~REV~' already exists, it is used instead of being re-created."
1193 (interactive "sVersion to visit (default is latest version): ")
1195 (set-buffer (find-file-noselect (dired-get-filename))))
1196 (while vc-parent-buffer
1197 (pop-to-buffer vc-parent-buffer))
1198 (if (and buffer-file-name (vc-name buffer-file-name))
1199 (let* ((version (if (string-equal rev "")
1200 (vc-latest-version buffer-file-name)
1202 (filename (concat buffer-file-name ".~" version "~")))
1203 (or (file-exists-p filename)
1204 (vc-backend-checkout buffer-file-name nil version filename))
1205 (find-file-other-window filename))
1206 (vc-registration-error buffer-file-name)))
1208 ;; Header-insertion code
1211 (defun vc-insert-headers ()
1212 "Insert headers in a file for use with your version-control system.
1213 Headers desired are inserted at the start of the buffer, and are pulled from
1214 the variable `vc-header-alist'."
1217 (find-file-other-window (dired-get-filename)))
1218 (while vc-parent-buffer
1219 (pop-to-buffer vc-parent-buffer))
1223 (if (or (not (vc-check-headers))
1224 (y-or-n-p "Version headers already exist. Insert another set? "))
1226 (let* ((delims (cdr (assq major-mode vc-comment-alist)))
1227 (comment-start-vc (or (car delims) comment-start "#"))
1228 (comment-end-vc (or (car (cdr delims)) comment-end ""))
1229 (hdstrings (cdr (assoc (vc-backend (buffer-file-name)) vc-header-alist))))
1230 (mapcar (function (lambda (s)
1231 (insert comment-start-vc "\t" s "\t"
1232 comment-end-vc "\n")))
1234 (if vc-static-header-alist
1235 (mapcar (function (lambda (f)
1236 (if (string-match (car f) buffer-file-name)
1237 (insert (format (cdr f) (car hdstrings))))))
1238 vc-static-header-alist))
1242 (defun vc-clear-headers ()
1243 ;; Clear all version headers in the current buffer, i.e. reset them
1244 ;; to the nonexpanded form. Only implemented for RCS, yet.
1245 ;; Don't lose point and mark during this.
1246 (let ((context (vc-buffer-context)))
1247 (goto-char (point-min))
1248 (while (re-search-forward "\\$\\([A-Za-z]+\\): [^\\$]+\\$" nil t)
1249 (replace-match "$\\1$"))
1250 (vc-restore-buffer-context context)))
1252 ;; The VC directory major mode. Coopt Dired for this.
1253 ;; All VC commands get mapped into logical equivalents.
1255 (define-derived-mode vc-dired-mode dired-mode "Dired under VC"
1256 "The major mode used in VC directory buffers. It is derived from Dired.
1257 All Dired commands operate normally. Users currently locking listed files
1258 are listed in place of the file's owner and group.
1259 Keystrokes bound to VC commands will execute as though they had been called
1260 on a buffer attached to the file named in the current Dired buffer line."
1261 (setq vc-dired-mode t))
1263 (define-key vc-dired-mode-map "\C-xv" vc-prefix-map)
1264 (define-key vc-dired-mode-map "g" 'vc-dired-update)
1265 (define-key vc-dired-mode-map "=" 'vc-diff)
1267 (defun vc-dired-state-info (file)
1268 ;; Return the string that indicates the version control status
1269 ;; on a VC dired line.
1270 (let ((cvs-state (and (eq (vc-backend file) 'CVS)
1271 (vc-cvs-status file))))
1273 (cond ((eq cvs-state 'up-to-date) nil)
1274 ((eq cvs-state 'needs-checkout) "patch")
1275 ((eq cvs-state 'locally-modified) "modified")
1276 ((eq cvs-state 'needs-merge) "merge")
1277 ((eq cvs-state 'unresolved-conflict) "conflict")
1278 ((eq cvs-state 'locally-added) "added"))
1279 (vc-locking-user file))))
1281 (defun vc-dired-reformat-line (x)
1282 ;; Hack a directory-listing line, plugging in locking-user info in
1283 ;; place of the user and group info. Should have the beneficial
1284 ;; side-effect of shortening the listing line. Each call starts with
1285 ;; point immediately following the dired mark area on the line to be
1288 ;; Simplest possible one:
1289 ;; (insert (concat x "\t")))
1291 ;; This code, like dired, assumes UNIX -l format.
1292 (let ((pos (point)) limit perm owner date-and-file)
1294 (setq limit (point))
1298 (re-search-forward ;; owner and group
1299 "\\([drwxlts-]+ \\) *[0-9]+ \\([^ ]+\\) +[^ ]+ +[0-9]+\\( [^ 0-9]+ [0-9 ][0-9] .*\\)"
1301 (re-search-forward ;; only owner displayed
1302 "\\([drwxlts-]+ \\) *[0-9]+ \\([^ ]+\\) +[0-9]+\\( [^ 0-9]+ [0-9 ][0-9] .*\\)"
1304 (setq perm (match-string 1)
1305 owner (match-string 2)
1306 date-and-file (match-string 3)))
1307 ((re-search-forward ;; OS/2 -l format, no links, owner, group
1308 "\\([drwxlts-]+ \\) *[0-9]+\\( [^ 0-9]+ [0-9 ][0-9] .*\\)"
1310 (setq perm (match-string 1)
1311 date-and-file (match-string 2))))
1312 (if (numberp x) (setq x (or owner (number-to-string x))))
1313 (if x (setq x (concat "(" x ")")))
1314 (let ((rep (substring (concat x " ") 0 10)))
1315 (replace-match (concat perm rep date-and-file)))))
1317 (defun vc-dired-update-line (file)
1318 ;; Update the vc-dired listing line of file -- it is assumed
1319 ;; that point is already on this line. Don't use dired-do-redisplay
1320 ;; for this, because it cannot handle the way vc-dired deals with
1324 (let ((start (point)))
1327 (delete-region start (point))
1328 (insert-directory file dired-listing-switches)
1331 (delete-char (- (length file)))
1332 (insert (substring file (length (expand-file-name default-directory))))
1334 (vc-dired-reformat-line (vc-dired-state-info file)))
1336 (defun vc-dired-update (verbose)
1338 (vc-directory default-directory verbose))
1340 ;;; Note in Emacs 18 the following defun gets overridden
1341 ;;; with the symbol 'vc-directory-18. See below.
1343 (defun vc-directory (dirname verbose)
1344 "Show version-control status of the current directory and subdirectories.
1345 Normally it creates a Dired buffer that lists only the locked files
1346 in all these directories. With a prefix argument, it lists all files."
1347 (interactive "DDired under VC (directory): \nP")
1349 (setq dirname (expand-file-name dirname))
1350 ;; force a trailing slash
1351 (if (not (eq (elt dirname (1- (length dirname))) ?/))
1352 (setq dirname (concat dirname "/")))
1354 (dl (length dirname))
1355 (filelist nil) (statelist nil)
1356 (old-dir default-directory)
1358 dired-buf-mod-count)
1363 (if (vc-registered f)
1364 (let ((state (vc-dired-state-info f)))
1365 (and (or verbose state)
1366 (setq filelist (cons (substring f dl) filelist))
1367 (setq statelist (cons state statelist))))))))
1368 (save-window-excursion
1370 ;; This uses a semi-documented feature of dired; giving a switch
1371 ;; argument forces the buffer to refresh each time.
1373 (dired-internal-noselect
1374 (cons dirname (nreverse filelist))
1375 dired-listing-switches 'vc-dired-mode))
1376 (setq nonempty (not (eq 0 (length filelist))))))
1377 (switch-to-buffer dired-buf)
1378 ;; Make a few modifications to the header
1379 (setq buffer-read-only nil)
1380 (goto-char (point-min))
1381 (forward-line 1) ;; Skip header line
1382 (let ((start (point))) ;; Erase (but don't remove) the
1383 (end-of-line) ;; "wildcard" line.
1384 (delete-region start (point)))
1388 ;; Plug the version information into the individual lines
1392 (forward-char 2) ;; skip dired's mark area
1393 (vc-dired-reformat-line x)
1394 (forward-line 1))) ;; go to next line
1395 (nreverse statelist))
1396 (setq buffer-read-only t)
1397 (goto-char (point-min))
1402 (setq buffer-read-only t)
1403 (message "No files are currently %s under %s"
1404 (if verbose "registered" "locked") dirname))
1408 (defun vc-directory-18 (verbose)
1409 "Show version-control status of all files under the current directory."
1411 (let (nonempty (dir default-directory))
1413 (set-buffer (get-buffer-create "*vc-status*"))
1418 (function (lambda (f)
1419 (if (vc-registered f)
1420 (let ((user (vc-locking-user f)))
1421 (if (or user verbose)
1424 (concat user) f))))))))
1425 (setq nonempty (not (zerop (buffer-size)))))
1429 (pop-to-buffer "*vc-status*" t)
1430 (goto-char (point-min))
1431 (shrink-window-if-larger-than-buffer)))
1432 (message "No files are currently %s under %s"
1433 (if verbose "registered" "locked") default-directory))
1436 (or (boundp 'minor-mode-map-alist)
1437 (fset 'vc-directory 'vc-directory-18))
1439 ;; Named-configuration support for SCCS
1441 (defun vc-add-triple (name file rev)
1443 (find-file (expand-file-name
1445 (file-name-as-directory
1446 (expand-file-name (vc-backend-subdirectory-name file)
1447 (file-name-directory file)))))
1448 (goto-char (point-max))
1449 (insert name "\t:\t" file "\t" rev "\n")
1451 (kill-buffer (current-buffer))
1454 (defun vc-record-rename (file newname)
1459 (file-name-as-directory
1460 (expand-file-name (vc-backend-subdirectory-name file)
1461 (file-name-directory file)))))
1462 (goto-char (point-min))
1463 ;; (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname))
1464 (while (re-search-forward (concat ":" (regexp-quote file) "$") nil t)
1465 (replace-match (concat ":" newname) nil nil))
1467 (kill-buffer (current-buffer))
1470 (defun vc-lookup-triple (file name)
1471 ;; Return the numeric version corresponding to a named snapshot of file
1472 ;; If name is nil or a version number string it's just passed through
1473 (cond ((null name) name)
1474 ((let ((firstchar (aref name 0)))
1475 (and (>= firstchar ?0) (<= firstchar ?9)))
1479 (set-buffer (get-buffer-create "*vc-info*"))
1483 (file-name-as-directory
1484 (expand-file-name (vc-backend-subdirectory-name file)
1485 (file-name-directory file)))))
1487 (car (vc-parse-buffer
1488 (list (list (concat name "\t:\t" file "\t\\(.+\\)") 1))))
1489 (kill-buffer "*vc-info*"))))
1492 ;; Named-configuration entry points
1494 (defun vc-snapshot-precondition ()
1495 ;; Scan the tree below the current directory.
1496 ;; If any files are locked, return the name of the first such file.
1497 ;; (This means, neither snapshot creation nor retrieval is allowed.)
1498 ;; If one or more of the files are currently visited, return `visited'.
1499 ;; Otherwise, return nil.
1501 (catch 'vc-locked-example
1504 (function (lambda (f)
1505 (and (vc-registered f)
1506 (if (vc-locking-user f) (throw 'vc-locked-example f)
1507 (if (get-file-buffer f) (setq status 'visited)))))))
1511 (defun vc-create-snapshot (name)
1512 "Make a snapshot called NAME.
1513 The snapshot is made from all registered files at or below the current
1514 directory. For each file, the version level of its latest
1515 version becomes part of the named configuration."
1516 (interactive "sNew snapshot name: ")
1517 (let ((result (vc-snapshot-precondition)))
1518 (if (stringp result)
1519 (error "File %s is locked" result)
1522 (function (lambda (f) (and
1524 (vc-backend-assign-name f name)))))
1528 (defun vc-retrieve-snapshot (name)
1529 "Retrieve the snapshot called NAME.
1530 This function fails if any files are locked at or below the current directory
1531 Otherwise, all registered files are checked out (unlocked) at their version
1532 levels in the snapshot."
1533 (interactive "sSnapshot name to retrieve: ")
1534 (let ((result (vc-snapshot-precondition))
1536 (if (stringp result)
1537 (error "File %s is locked" result)
1538 (if (eq result 'visited)
1539 (setq update (yes-or-no-p "Update the affected buffers? ")))
1542 (function (lambda (f) (and
1545 (vc-backend-checkout f nil name)
1546 (if update (vc-resynch-buffer f t t)))))))
1549 ;; Miscellaneous other entry points
1552 (defun vc-print-log ()
1553 "List the change log of the current buffer in a window."
1556 (set-buffer (find-file-noselect (dired-get-filename))))
1557 (while vc-parent-buffer
1558 (pop-to-buffer vc-parent-buffer))
1559 (if (and buffer-file-name (vc-name buffer-file-name))
1560 (let ((file buffer-file-name))
1561 (vc-backend-print-log file)
1562 (pop-to-buffer (get-buffer-create "*vc*"))
1563 (setq default-directory (file-name-directory file))
1564 (while (looking-at "=*\n")
1565 (delete-char (- (match-end 0) (match-beginning 0)))
1567 (goto-char (point-min))
1568 (if (looking-at "[\b\t\n\v\f\r ]+")
1569 (delete-char (- (match-end 0) (match-beginning 0))))
1570 (shrink-window-if-larger-than-buffer)
1572 (vc-registration-error buffer-file-name)
1577 (defun vc-revert-buffer ()
1578 "Revert the current buffer's file back to the latest checked-in version.
1579 This asks for confirmation if the buffer contents are not identical
1581 If the back-end is CVS, this will give you the most recent revision of
1582 the file on the branch you are editing."
1585 (find-file-other-window (dired-get-filename)))
1586 (while vc-parent-buffer
1587 (pop-to-buffer vc-parent-buffer))
1588 (let ((file buffer-file-name)
1589 ;; This operation should always ask for confirmation.
1590 (vc-suppress-confirm nil)
1591 (obuf (current-buffer)) (changed (vc-diff nil t)))
1592 (if (and changed (not (yes-or-no-p "Discard changes? ")))
1594 (if (and (window-dedicated-p (selected-window))
1595 (one-window-p t 'selected-frame))
1596 (make-frame-invisible (selected-frame))
1598 (error "Revert cancelled"))
1601 (if (and (window-dedicated-p (selected-window))
1602 (one-window-p t 'selected-frame))
1603 (make-frame-invisible (selected-frame))
1605 (vc-backend-revert file)
1606 (vc-resynch-window file t t)
1611 (defun vc-cancel-version (norevert)
1612 "Get rid of most recently checked in version of this file.
1613 A prefix argument means do not revert the buffer afterwards."
1616 (find-file-other-window (dired-get-filename)))
1617 (while vc-parent-buffer
1618 (pop-to-buffer vc-parent-buffer))
1620 ((not (vc-registered (buffer-file-name)))
1621 (vc-registration-error (buffer-file-name)))
1622 ((eq (vc-backend (buffer-file-name)) 'CVS)
1623 (error "Unchecking files under CVS is dangerous and not supported in VC"))
1624 ((vc-locking-user (buffer-file-name))
1625 (error "This version is locked; use vc-revert-buffer to discard changes"))
1626 ((not (vc-latest-on-branch-p (buffer-file-name)))
1627 (error "This is not the latest version--VC cannot cancel it")))
1628 (let* ((target (vc-workfile-version (buffer-file-name)))
1629 (recent (if (vc-trunk-p target) "" (vc-branch-part target)))
1630 (config (current-window-configuration)) done)
1631 (if (null (yes-or-no-p (format "Remove version %s from master? " target)))
1633 (setq norevert (or norevert (not
1634 (yes-or-no-p "Revert buffer to most recent remaining version? "))))
1635 (vc-backend-uncheck (buffer-file-name) target)
1636 ;; Check out the most recent remaining version. If it fails, because
1637 ;; the whole branch got deleted, do a double-take and check out the
1638 ;; version where the branch started.
1643 ;; Check out locked, but only to disc, and keep
1644 ;; modifications in the buffer.
1645 (vc-backend-checkout (buffer-file-name) t recent)
1646 ;; Check out unlocked, and revert buffer.
1647 (vc-checkout (buffer-file-name) nil recent))
1649 ;; If the checkout fails, vc-do-command signals an error.
1650 ;; We catch this error, check the reason, correct the
1651 ;; version number, and try a second time.
1652 (error (set-buffer "*vc*")
1653 (goto-char (point-min))
1654 (if (search-forward "no side branches present for" nil t)
1655 (progn (setq recent (vc-branch-part recent))
1656 ;; vc-do-command popped up a window with
1657 ;; the error message. Get rid of it, by
1658 ;; restoring the old window configuration.
1659 (set-window-configuration config))
1660 ;; No, it was some other error: re-signal it.
1661 (signal (car err) (cdr err))))))
1662 ;; If norevert, clear version headers and mark the buffer modified.
1665 (set-visited-file-name (buffer-file-name))
1666 (if (not vc-make-backup-files)
1667 ;; inhibit backup for this buffer
1668 (progn (make-local-variable 'backup-inhibited)
1669 (setq backup-inhibited t)))
1670 (if (eq (vc-backend (buffer-file-name)) 'RCS)
1671 (progn (setq buffer-read-only nil)
1672 (vc-clear-headers)))
1673 (vc-mode-line (buffer-file-name))))
1674 (message "Version %s has been removed from the master" target)
1678 (defun vc-rename-file (old new)
1679 "Rename file OLD to NEW, and rename its master file likewise."
1680 (interactive "fVC rename file: \nFRename to: ")
1681 ;; There are several ways of renaming files under CVS 1.3, but they all
1682 ;; have serious disadvantages. See the FAQ (available from think.com in
1683 ;; pub/cvs/). I'd rather send the user an error, than do something he might
1684 ;; consider to be wrong. When the famous, long-awaited rename database is
1685 ;; implemented things might change for the better. This is unlikely to occur
1686 ;; until CVS 2.0 is released. --ceder 1994-01-23 21:27:51
1687 (if (eq (vc-backend old) 'CVS)
1688 (error "Renaming files under CVS is dangerous and not supported in VC"))
1689 (let ((oldbuf (get-file-buffer old)))
1690 (if (and oldbuf (buffer-modified-p oldbuf))
1691 (error "Please save files before moving them"))
1692 (if (get-file-buffer new)
1693 (error "Already editing new file name"))
1694 (if (file-exists-p new)
1695 (error "New file already exists"))
1696 (let ((oldmaster (vc-name old)))
1699 (if (vc-locking-user old)
1700 (error "Please check in files before moving them"))
1701 (if (or (file-symlink-p oldmaster)
1702 ;; This had FILE, I changed it to OLD. -- rms.
1703 (file-symlink-p (vc-backend-subdirectory-name old)))
1704 (error "This is not a safe thing to do in the presence of symbolic links"))
1707 (let ((backend (vc-backend old))
1708 (newdir (or (file-name-directory new) ""))
1709 (newbase (file-name-nondirectory new)))
1714 (if (eq backend (cdr s))
1715 (let* ((newmaster (format (car s) newdir newbase))
1716 (newmasterdir (file-name-directory newmaster)))
1717 (if (or (not newmasterdir)
1718 (file-directory-p newmasterdir))
1719 (throw 'found newmaster))))))
1720 vc-master-templates)
1721 (error "New file lacks a version control directory"))))))
1722 (if (or (not oldmaster) (file-exists-p old))
1723 (rename-file old new)))
1724 ; ?? Renaming a file might change its contents due to keyword expansion.
1725 ; We should really check out a new copy if the old copy was precisely equal
1726 ; to some checked in version. However, testing for this is tricky....
1730 (let ((buffer-read-only buffer-read-only))
1731 (set-visited-file-name new))
1734 (set-buffer-modified-p nil))))
1735 ;; This had FILE, I changed it to OLD. -- rms.
1736 (vc-backend-dispatch old
1737 (vc-record-rename old new) ;SCCS
1744 (defun vc-update-change-log (&rest args)
1745 "Find change log file and add entries from recent RCS logs.
1746 The mark is left at the end of the text prepended to the change log.
1747 With prefix arg of C-u, only find log entries for the current buffer's file.
1748 With any numeric prefix arg, find log entries for all files currently visited.
1749 Otherwise, find log entries for all registered files in the default directory.
1750 From a program, any arguments are passed to the `rcs2log' script."
1752 (cond ((consp current-prefix-arg) ;C-u
1753 (list buffer-file-name))
1754 (current-prefix-arg ;Numeric argument.
1756 (buffers (buffer-list))
1759 (setq file (buffer-file-name (car buffers)))
1760 (and file (vc-backend file)
1761 (setq files (cons file files)))
1762 (setq buffers (cdr buffers)))
1765 (let ((RCS (concat default-directory "RCS")))
1766 (and (file-directory-p RCS)
1769 (if (string-match "\\(.*\\),v$" f)
1770 (substring f 0 (match-end 1))
1772 (directory-files RCS nil "...\\|^[^.]\\|^.[^.]")))))))
1773 (let ((odefault default-directory)
1774 (full-name (or add-log-full-name
1776 (mailing-address (or add-log-mailing-address
1777 user-mail-address)))
1778 (find-file-other-window (find-change-log))
1779 (barf-if-buffer-read-only)
1782 (goto-char (point-min))
1784 (message "Computing change log entries...")
1785 (message "Computing change log entries... %s"
1787 (eq 0 (apply 'call-process "rcs2log" nil t nil
1789 (concat (user-login-name)
1797 (if (file-name-absolute-p f)
1799 (concat odefault f)))))
1803 ;; Collect back-end-dependent stuff here
1805 (defun vc-backend-admin (file &optional rev comment)
1806 ;; Register a file into the version-control system
1807 ;; Automatically retrieves a read-only version of the file with
1808 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
1809 ;; it deletes the workfile.
1810 (vc-file-clearprops file)
1811 (or vc-default-back-end
1812 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS)))
1813 (message "Registering %s..." file)
1816 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end)
1817 ((file-exists-p "RCS") 'RCS)
1818 ((file-exists-p "SCCS") 'SCCS)
1819 ((file-exists-p "CVS") 'CVS)
1820 (t vc-default-back-end))))
1821 (cond ((eq backend 'SCCS)
1822 (vc-do-command nil 0 "admin" file 'MASTER ;; SCCS
1823 (and rev (concat "-r" rev))
1826 (and comment (concat "-y" comment))
1828 (car (rassq 'SCCS vc-master-templates))
1829 (or (file-name-directory file) "")
1830 (file-name-nondirectory file)))
1832 (if vc-keep-workfiles
1833 (vc-do-command nil 0 "get" file 'MASTER)))
1835 (vc-do-command nil 0 "ci" file 'MASTER ;; RCS
1836 ;; if available, use the secure registering option
1837 (and (vc-backend-release-p 'RCS "5.6.4") "-i")
1838 (concat (if vc-keep-workfiles "-u" "-r") rev)
1839 (and comment (concat "-t-" comment))
1842 (vc-do-command nil 0 "cvs" file 'WORKFILE ;; CVS
1844 (and comment (string-match "[^\t\n ]" comment)
1845 (concat "-m" comment)))
1847 (message "Registering %s...done" file)
1850 (defun vc-backend-checkout (file &optional writable rev workfile)
1851 ;; Retrieve a copy of a saved version into a workfile
1852 (let ((filename (or workfile file))
1853 (file-buffer (get-file-buffer file))
1855 (message "Checking out %s..." filename)
1857 ;; Change buffers to get local value of vc-checkout-switches.
1858 (if file-buffer (set-buffer file-buffer))
1859 (setq switches (if (stringp vc-checkout-switches)
1860 (list vc-checkout-switches)
1861 vc-checkout-switches))
1862 ;; Save this buffer's default-directory
1863 ;; and use save-excursion to make sure it is restored
1864 ;; in the same buffer it was saved in.
1865 (let ((default-directory default-directory))
1867 ;; Adjust the default-directory so that the check-out creates
1868 ;; the file in the right place.
1869 (setq default-directory (file-name-directory filename))
1870 (vc-backend-dispatch file
1872 (and rev (string= rev "") (setq rev nil))
1874 ;; Some SCCS implementations allow checking out directly to a
1875 ;; file using the -G option, but then some don't so use the
1876 ;; least common denominator approach and use the -p option
1878 (let ((vc-modes (logior (file-modes (vc-name file))
1879 (if writable 128 0)))
1883 (apply 'vc-do-command
1884 nil 0 "/bin/sh" file 'MASTER "-c"
1885 ;; Some shells make the "" dummy argument into $0
1886 ;; while others use the shell's name as $0 and
1887 ;; use the "" as $1. The if-statement
1888 ;; converts the latter case to the former.
1889 (format "if [ x\"$1\" = x ]; then shift; fi; \
1890 umask %o; exec >\"$1\" || exit; \
1891 shift; umask %o; exec get \"$@\""
1892 (logand 511 (lognot vc-modes))
1893 (logand 511 (lognot (default-file-modes))))
1894 "" ; dummy argument for shell's $0
1899 (concat "-r" (vc-lookup-triple file rev)))
1902 (and failed (file-exists-p filename)
1903 (delete-file filename))))
1904 (apply 'vc-do-command nil 0 "get" file 'MASTER ;; SCCS
1906 (and rev (concat "-r" (vc-lookup-triple file rev)))
1908 (vc-file-setprop file 'vc-workfile-version nil)))
1910 ;; RCS doesn't let us check out into arbitrary file names directly.
1911 ;; Use `co -p' and make stdout point to the correct file.
1912 (let ((vc-modes (logior (file-modes (vc-name file))
1913 (if writable 128 0)))
1917 (apply 'vc-do-command
1918 nil 0 "/bin/sh" file 'MASTER "-c"
1919 ;; See the SCCS case, above, regarding the
1921 (format "if [ x\"$1\" = x ]; then shift; fi; \
1922 umask %o; exec >\"$1\" || exit; \
1923 shift; umask %o; exec co \"$@\""
1924 (logand 511 (lognot vc-modes))
1925 (logand 511 (lognot (default-file-modes))))
1926 "" ; dummy argument for shell's $0
1932 (and failed (file-exists-p filename) (delete-file filename))))
1934 ;; if we should go to the head of the trunk,
1935 ;; clear the default branch first
1936 (and rev (string= rev "")
1937 (vc-do-command nil 0 "rcs" file 'MASTER "-b"))
1938 ;; now do the checkout
1939 (apply 'vc-do-command
1940 nil 0 "co" file 'MASTER
1941 ;; If locking is not strict, force to overwrite
1942 ;; the writable workfile.
1943 (if (eq (vc-checkout-model file) 'implicit) "-f")
1945 (if rev (concat "-r" rev)
1946 ;; if no explicit revision was specified,
1947 ;; check out that of the working file
1948 (let ((workrev (vc-workfile-version file)))
1949 (if workrev (concat "-r" workrev)
1952 ;; determine the new workfile version
1955 (goto-char (point-min))
1957 (if (re-search-forward "^revision \\([0-9.]+\\).*\n" nil t)
1958 (buffer-substring (match-beginning 1) (match-end 1)))))
1959 (vc-file-setprop file 'vc-workfile-version new-version)
1960 ;; if necessary, adjust the default branch
1961 (and rev (not (string= rev ""))
1962 (vc-do-command nil 0 "rcs" file 'MASTER
1963 (concat "-b" (if (vc-latest-on-branch-p file)
1964 (if (vc-trunk-p new-version) nil
1965 (vc-branch-part new-version))
1968 ;; CVS is much like RCS
1972 (apply 'vc-do-command
1973 nil 0 "/bin/sh" file 'WORKFILE "-c"
1974 "exec >\"$1\" || exit; shift; exec cvs update \"$@\""
1975 "" ; dummy argument for shell's $0
1981 (and failed (file-exists-p filename) (delete-file filename))))
1982 ;; default for verbose checkout: clear the sticky tag
1983 ;; so that the actual update will get the head of the trunk
1984 (and rev (string= rev "")
1985 (vc-do-command nil 0 "cvs" file 'WORKFILE "update" "-A"))
1986 ;; If a revision was specified, check that out.
1988 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE
1989 (and writable (eq (vc-checkout-model file) 'manual) "-w")
1991 (and rev (not (string= rev ""))
1994 ;; If no revision was specified, simply make the file writable.
1996 (or (eq (vc-checkout-model file) 'manual)
1997 (zerop (logand 128 (file-modes file))))
1998 (set-file-modes file (logior 128 (file-modes file)))))
1999 (if rev (vc-file-setprop file 'vc-workfile-version nil))))
2002 (vc-file-clear-masterprops file)
2004 (vc-file-setprop file 'vc-locking-user (user-login-name)))
2005 (vc-file-setprop file
2006 'vc-checkout-time (nth 5 (file-attributes file)))))
2007 (message "Checking out %s...done" filename))))))
2009 (defun vc-backend-logentry-check (file)
2010 (vc-backend-dispatch file
2011 (if (>= (buffer-size) 512) ;; SCCS
2015 "Log must be less than 512 characters; point is now at pos 512")))
2020 (defun vc-backend-checkin (file rev comment)
2021 ;; Register changes to FILE as level REV with explanatory COMMENT.
2022 ;; Automatically retrieves a read-only version of the file with
2023 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
2024 ;; it deletes the workfile.
2025 ;; Adaptation for RCS branch support: if this is an explicit checkin,
2026 ;; or if the checkin creates a new branch, set the master file branch
2028 (message "Checking in %s..." file)
2029 ;; "This log message intentionally left almost blank".
2030 ;; RCS 5.7 gripes about white-space-only comments too.
2031 (or (and comment (string-match "[^\t\n ]" comment))
2032 (setq comment "*** empty log message ***"))
2034 ;; Change buffers to get local value of vc-checkin-switches.
2035 (set-buffer (or (get-file-buffer file) (current-buffer)))
2037 (if (stringp vc-checkin-switches)
2038 (list vc-checkin-switches)
2039 vc-checkin-switches)))
2040 ;; Clear the master-properties. Do that here, not at the
2041 ;; end, because if the check-in fails we want them to get
2042 ;; re-computed before the next try.
2043 (vc-file-clear-masterprops file)
2044 (vc-backend-dispatch file
2047 (apply 'vc-do-command nil 0 "delta" file 'MASTER
2048 (if rev (concat "-r" rev))
2049 (concat "-y" comment)
2051 (vc-file-setprop file 'vc-locking-user 'none)
2052 (vc-file-setprop file 'vc-workfile-version nil)
2053 (if vc-keep-workfiles
2054 (vc-do-command nil 0 "get" file 'MASTER))
2057 (let ((old-version (vc-workfile-version file)) new-version)
2058 (apply 'vc-do-command nil 0 "ci" file 'MASTER
2059 ;; if available, use the secure check-in option
2060 (and (vc-backend-release-p 'RCS "5.6.4") "-j")
2061 (concat (if vc-keep-workfiles "-u" "-r") rev)
2062 (concat "-m" comment)
2064 (vc-file-setprop file 'vc-locking-user 'none)
2065 (vc-file-setprop file 'vc-workfile-version nil)
2067 ;; determine the new workfile version
2069 (goto-char (point-min))
2070 (if (or (re-search-forward
2071 "new revision: \\([0-9.]+\\);" nil t)
2073 "reverting to previous revision \\([0-9.]+\\)" nil t))
2074 (progn (setq new-version (buffer-substring (match-beginning 1)
2076 (vc-file-setprop file 'vc-workfile-version new-version)))
2078 ;; if we got to a different branch, adjust the default
2079 ;; branch accordingly
2081 ((and old-version new-version
2082 (not (string= (vc-branch-part old-version)
2083 (vc-branch-part new-version))))
2084 (vc-do-command nil 0 "rcs" file 'MASTER
2085 (if (vc-trunk-p new-version) "-b"
2086 (concat "-b" (vc-branch-part new-version))))
2087 ;; If this is an old RCS release, we might have
2088 ;; to remove a remaining lock.
2089 (if (not (vc-backend-release-p 'RCS "5.6.2"))
2090 ;; exit status of 1 is also accepted.
2091 ;; It means that the lock was removed before.
2092 (vc-do-command nil 1 "rcs" file 'MASTER
2093 (concat "-u" old-version))))))
2096 ;; explicit check-in to the trunk requires a
2097 ;; double check-in (first unexplicit) (CVS-1.3)
2100 (if (and rev (vc-trunk-p rev))
2101 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE
2102 "ci" "-m" "intermediate"
2104 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE
2105 "ci" (if rev (concat "-r" rev))
2106 (concat "-m" comment)
2108 (error (if (eq (vc-cvs-status file) 'needs-merge)
2109 ;; The CVS output will be on top of this message.
2110 (error "Type C-x 0 C-x C-q to merge in changes")
2111 (error "Check-in failed"))))
2112 ;; determine and store the new workfile version
2114 (goto-char (point-min))
2115 (if (re-search-forward
2116 "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" nil t)
2117 (vc-file-setprop file 'vc-workfile-version
2118 (buffer-substring (match-beginning 2)
2120 (vc-file-setprop file 'vc-workfile-version nil))
2121 ;; if this was an explicit check-in, remove the sticky tag
2123 (vc-do-command nil 0 "cvs" file 'WORKFILE "update" "-A"))
2124 (vc-file-setprop file 'vc-locking-user 'none)
2125 (vc-file-setprop file 'vc-checkout-time
2126 (nth 5 (file-attributes file)))))))
2127 (message "Checking in %s...done" file))
2129 (defun vc-backend-revert (file)
2130 ;; Revert file to latest checked-in version.
2131 ;; (for RCS, to workfile version)
2132 (message "Reverting %s..." file)
2133 (vc-file-clear-masterprops file)
2134 (vc-backend-dispatch
2138 (vc-do-command nil 0 "unget" file 'MASTER nil)
2139 (vc-do-command nil 0 "get" file 'MASTER nil))
2141 (vc-do-command nil 0 "co" file 'MASTER
2142 "-f" (concat "-u" (vc-workfile-version file)))
2146 (vc-do-command nil 0 "cvs" file 'WORKFILE "update")))
2147 (vc-file-setprop file 'vc-locking-user 'none)
2148 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file)))
2149 (message "Reverting %s...done" file)
2152 (defun vc-backend-steal (file &optional rev)
2153 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M.
2154 (message "Stealing lock on %s..." file)
2155 (vc-backend-dispatch file
2157 (vc-do-command nil 0 "unget" file 'MASTER "-n" (if rev (concat "-r" rev)))
2158 (vc-do-command nil 0 "get" file 'MASTER "-g" (if rev (concat "-r" rev)))
2160 (vc-do-command nil 0 "rcs" file 'MASTER ;RCS
2161 "-M" (concat "-u" rev) (concat "-l" rev))
2162 (error "You cannot steal a CVS lock; there are no CVS locks to steal") ;CVS
2164 (vc-file-setprop file 'vc-locking-user (user-login-name))
2165 (message "Stealing lock on %s...done" file)
2168 (defun vc-backend-uncheck (file target)
2169 ;; Undo the latest checkin.
2170 (message "Removing last change from %s..." file)
2171 (vc-backend-dispatch file
2172 (vc-do-command nil 0 "rmdel" file 'MASTER (concat "-r" target))
2173 (vc-do-command nil 0 "rcs" file 'MASTER (concat "-o" target))
2174 nil ;; this is never reached under CVS
2176 (message "Removing last change from %s...done" file)
2179 (defun vc-backend-print-log (file)
2180 ;; Get change log associated with FILE.
2181 (vc-backend-dispatch
2183 (vc-do-command nil 0 "prs" file 'MASTER)
2184 (vc-do-command nil 0 "rlog" file 'MASTER)
2185 (vc-do-command nil 0 "cvs" file 'WORKFILE "rlog")))
2187 (defun vc-backend-assign-name (file name)
2188 ;; Assign to a FILE's latest version a given NAME.
2189 (vc-backend-dispatch file
2190 (vc-add-triple name file (vc-latest-version file)) ;; SCCS
2191 (vc-do-command nil 0 "rcs" file 'MASTER (concat "-n" name ":")) ;; RCS
2192 (vc-do-command nil 0 "cvs" file 'WORKFILE "tag" name) ;; CVS
2196 (defun vc-backend-diff (file &optional oldvers newvers cmp)
2197 ;; Get a difference report between two versions of FILE.
2198 ;; Get only a brief comparison report if CMP, a difference report otherwise.
2199 (let ((backend (vc-backend file)))
2202 (setq oldvers (vc-lookup-triple file oldvers))
2203 (setq newvers (vc-lookup-triple file newvers)))
2205 (if (not oldvers) (setq oldvers (vc-workfile-version file)))
2206 ;; If we know that --brief is not supported, don't try it.
2207 (setq cmp (and cmp (not (eq vc-rcsdiff-knows-brief 'no))))))
2208 ;; SCCS and RCS shares a lot of code.
2210 ((or (eq backend 'SCCS) (eq backend 'RCS))
2211 (let* ((command (if (eq backend 'SCCS) "vcdiff" "rcsdiff"))
2212 (mode (if (eq backend 'RCS) 'WORKFILE 'MASTER))
2213 (options (append (list (and cmp "--brief")
2215 (and oldvers (concat "-r" oldvers))
2216 (and newvers (concat "-r" newvers)))
2218 (if (listp diff-switches)
2220 (list diff-switches)))))
2221 (status (apply 'vc-do-command "*vc-diff*" 2
2222 command file mode options)))
2223 ;; If --brief didn't work, do a double-take and remember it
2227 (apply 'vc-do-command "*vc-diff*" 1 command file 'WORKFILE
2228 (if cmp (cdr options) options))
2229 (if cmp (setq vc-rcsdiff-knows-brief 'no)))
2230 ;; If --brief DID work, remember that, too.
2231 (and cmp (not vc-rcsdiff-knows-brief)
2232 (setq vc-rcsdiff-knows-brief 'yes))
2234 ;; CVS is different.
2236 (if (string= (vc-workfile-version file) "0") ;CVS
2237 ;; This file is added but not yet committed; there is no master file.
2238 (if (or oldvers newvers)
2239 (error "No revisions of %s exist" file)
2240 (if cmp 1 ;; file is added but not committed,
2241 ;; we regard this as "changed".
2242 ;; diff it against /dev/null.
2243 (apply 'vc-do-command
2244 "*vc-diff*" 1 "diff" file 'WORKFILE
2245 (append (if (listp diff-switches)
2247 (list diff-switches)) '("/dev/null")))))
2248 ;; cmp is not yet implemented -- we always do a full diff.
2249 (apply 'vc-do-command
2250 "*vc-diff*" 1 "cvs" file 'WORKFILE "diff"
2251 (and oldvers (concat "-r" oldvers))
2252 (and newvers (concat "-r" newvers))
2253 (if (listp diff-switches)
2255 (list diff-switches)))))
2257 (vc-registration-error file)))))
2259 (defun vc-backend-merge-news (file)
2260 ;; Merge in any new changes made to FILE.
2261 (message "Merging changes into %s..." file)
2263 (vc-backend-dispatch
2265 (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS
2266 (error "vc-backend-merge-news not meaningful for RCS files") ;RCS
2267 (save-excursion ; CVS
2268 (vc-file-clear-masterprops file)
2269 (vc-file-setprop file 'vc-workfile-version nil)
2270 (vc-file-setprop file 'vc-locking-user nil)
2271 (vc-do-command nil 0 "cvs" file 'WORKFILE "update")
2272 ;; CVS doesn't return an error code if conflicts are detected.
2273 ;; Since we want to warn the user about it (and possibly start
2274 ;; emerge later), scan the output and see if this occurred.
2275 (set-buffer (get-buffer "*vc*"))
2276 (goto-char (point-min))
2277 (if (re-search-forward "^cvs update: conflicts found in .*" nil t)
2278 1 ;; error code for caller
2279 0 ;; no conflict detected
2281 (message "Merging changes into %s...done" file)))
2283 (defun vc-check-headers ()
2284 "Check if the current file has any headers in it."
2287 (goto-char (point-min))
2288 (vc-backend-dispatch buffer-file-name
2289 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS
2290 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t) ;; RCS
2291 'RCS ;; CVS works like RCS in this regard.
2295 ;; Back-end-dependent stuff ends here.
2297 ;; Set up key bindings for use while editing log messages
2299 (defun vc-log-mode ()
2300 "Minor mode for driving version-control tools.
2301 These bindings are added to the global keymap when you enter this mode:
2302 \\[vc-next-action] perform next logical version-control operation on current file
2303 \\[vc-register] register current file
2304 \\[vc-toggle-read-only] like next-action, but won't register files
2305 \\[vc-insert-headers] insert version-control headers in current file
2306 \\[vc-print-log] display change history of current file
2307 \\[vc-revert-buffer] revert buffer to latest version
2308 \\[vc-cancel-version] undo latest checkin
2309 \\[vc-diff] show diffs between file versions
2310 \\[vc-version-other-window] visit old version in another window
2311 \\[vc-directory] show all files locked by any user in or below .
2312 \\[vc-update-change-log] add change log entry from recent checkins
2314 While you are entering a change log message for a version, the following
2315 additional bindings will be in effect.
2317 \\[vc-finish-logentry] proceed with check in, ending log message entry
2319 Whenever you do a checkin, your log comment is added to a ring of
2320 saved comments. These can be recalled as follows:
2322 \\[vc-next-comment] replace region with next message in comment ring
2323 \\[vc-previous-comment] replace region with previous message in comment ring
2324 \\[vc-comment-search-reverse] search backward for regexp in the comment ring
2325 \\[vc-comment-search-forward] search backward for regexp in the comment ring
2327 Entry to the change-log submode calls the value of text-mode-hook, then
2328 the value of vc-log-mode-hook.
2330 Global user options:
2331 vc-initial-comment If non-nil, require user to enter a change
2332 comment upon first checkin of the file.
2334 vc-keep-workfiles Non-nil value prevents workfiles from being
2335 deleted when changes are checked in
2337 vc-suppress-confirm Suppresses some confirmation prompts,
2338 notably for reversions.
2340 vc-header-alist Which keywords to insert when adding headers
2341 with \\[vc-insert-headers]. Defaults to
2342 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under
2345 vc-static-header-alist By default, version headers inserted in C files
2346 get stuffed in a static string area so that
2347 ident(RCS/CVS) or what(SCCS) can see them in
2348 the compiled object code. You can override
2349 this by setting this variable to nil, or change
2350 the header template by changing it.
2352 vc-command-messages if non-nil, display run messages from the
2353 actual version-control utilities (this is
2354 intended primarily for people hacking vc
2358 (set-syntax-table text-mode-syntax-table)
2359 (use-local-map vc-log-entry-mode)
2360 (setq local-abbrev-table text-mode-abbrev-table)
2361 (setq major-mode 'vc-log-mode)
2362 (setq mode-name "VC-Log")
2363 (make-local-variable 'vc-log-file)
2364 (make-local-variable 'vc-log-version)
2365 (make-local-variable 'vc-comment-ring-index)
2366 (set-buffer-modified-p nil)
2367 (setq buffer-file-name nil)
2368 (run-hooks 'text-mode-hook 'vc-log-mode-hook)
2371 ;; Initialization code, to be done just once at load-time
2372 (if vc-log-entry-mode
2374 (setq vc-log-entry-mode (make-sparse-keymap))
2375 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment)
2376 (define-key vc-log-entry-mode "\M-p" 'vc-previous-comment)
2377 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse)
2378 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward)
2379 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry)
2382 ;;; These things should probably be generally available
2384 (defun vc-file-tree-walk (dirname func &rest args)
2385 "Walk recursively through DIRNAME.
2386 Invoke FUNC f ARGS on each non-directory file f underneath it."
2387 (vc-file-tree-walk-internal (expand-file-name dirname) func args)
2388 (message "Traversing directory %s...done" dirname))
2390 (defun vc-file-tree-walk-internal (file func args)
2391 (if (not (file-directory-p file))
2392 (apply func file args)
2393 (message "Traversing directory %s..." (abbreviate-file-name file))
2394 (let ((dir (file-name-as-directory file)))
2398 (string-equal f ".")
2399 (string-equal f "..")
2400 (member f vc-directory-exclusion-list)
2401 (let ((dirf (concat dir f)))
2403 (file-symlink-p dirf) ;; Avoid possible loops
2404 (vc-file-tree-walk-internal dirf func args))))))
2405 (directory-files dir)))))
2409 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE
2411 ;;; These may be useful to anyone who has to debug or extend the package.
2412 ;;; (Note that this information corresponds to versions 5.x. Some of it
2413 ;;; might have been invalidated by the additions to support branching
2414 ;;; and RCS keyword lookup. AS, 1995/03/24)
2416 ;;; A fundamental problem in VC is that there are time windows between
2417 ;;; vc-next-action's computations of the file's version-control state and
2418 ;;; the actions that change it. This is a window open to lossage in a
2419 ;;; multi-user environment; someone else could nip in and change the state
2420 ;;; of the master during it.
2422 ;;; The performance problem is that rlog/prs calls are very expensive; we want
2423 ;;; to avoid them as much as possible.
2427 ;;; The performance problem, it turns out, simplifies in practice to the
2428 ;;; problem of making vc-locking-user fast. The two other functions that call
2429 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one
2430 ;;; makes snapshots, the other deletes the calling user's last change in the
2433 ;;; The race condition implies that we have to either (a) lock the master
2434 ;;; during the entire execution of vc-next-action, or (b) detect and
2435 ;;; recover from errors resulting from dispatch on an out-of-date state.
2437 ;;; Alternative (a) appears to be infeasible. The problem is that we can't
2438 ;;; guarantee that the lock will ever be removed. Suppose a user starts a
2439 ;;; checkin, the change message buffer pops up, and the user, having wandered
2440 ;;; off to do something else, simply forgets about it?
2442 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up
2443 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/
2444 ;;; unlocked state and its current owner from its permissions.
2446 ;;; This shortcut will fail if someone has manually changed the workfile's
2447 ;;; permissions; also if developers are munging the workfile in several
2448 ;;; directories, with symlinks to a master (in this latter case, the
2449 ;;; permissions shortcut will fail to detect a lock asserted from another
2452 ;;; Note that these cases correspond exactly to the errors which could happen
2453 ;;; because of a competing checkin/checkout race in between two instances of
2456 ;;; For VC's purposes, a workfile/master pair may have the following states:
2458 ;;; A. Unregistered. There is a workfile, there is no master.
2460 ;;; B. Registered and not locked by anyone.
2462 ;;; C. Locked by calling user and unchanged.
2464 ;;; D. Locked by the calling user and changed.
2466 ;;; E. Locked by someone other than the calling user.
2468 ;;; This makes for 25 states and 20 error conditions. Here's the matrix:
2470 ;;; VC's idea of state
2472 ;;; V Actual state RCS action SCCS action Effect
2474 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin
2475 ;;; B 5 . 6 7 8 co -l get -e checkout
2476 ;;; C 9 10 . 11 12 co -u unget; get revert
2477 ;;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin
2478 ;;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock
2480 ;;; All commands take the master file name as a last argument (not shown).
2482 ;;; In the discussion below, a "self-race" is a pathological situation in
2483 ;;; which VC operations are being attempted simultaneously by two or more
2484 ;;; Emacsen running under the same username.
2486 ;;; The vc-next-action code has the following windows:
2489 ;;; Between the check for existence of a master file and the call to
2490 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may
2491 ;;; never close if the initial-comment feature is on.
2494 ;;; Between the call to vc-workfile-unchanged-p in and the immediately
2495 ;;; following revert (apparent state C).
2498 ;;; Between the call to vc-workfile-unchanged-p in and the following
2499 ;;; checkin (apparent state D). This window may never close.
2502 ;;; Between the unlock and the immediately following checkout during a
2503 ;;; revert operation (apparent state C). Included in window Q.
2506 ;;; Between vc-locking-user and the following checkout (apparent state B).
2509 ;;; Between vc-locking-user and the following revert (apparent state C).
2510 ;;; Includes windows Q and S.
2513 ;;; Between vc-locking-user and the following checkin (apparent state
2514 ;;; D). This window may never be closed if the user fails to complete the
2515 ;;; checkin message. Includes window R.
2518 ;;; Between vc-locking-user and the following steal-lock (apparent
2519 ;;; state E). This window may never close if the user fails to complete
2520 ;;; the steal-lock message. Includes window X.
2523 ;;; Between the unlock and the immediately following re-lock during a
2524 ;;; steal-lock operation (apparent state E). This window may never cloce
2525 ;;; if the user fails to complete the steal-lock message.
2529 ;;; Apparent state A ---
2531 ;;; 1. File looked unregistered but is actually registered and not locked.
2533 ;;; Potential cause: someone else's admin during window P, with
2534 ;;; caller's admin happening before their checkout.
2536 ;;; RCS: Prior to version 5.6.4, ci fails with message
2537 ;;; "no lock set by <user>". From 5.6.4 onwards, VC uses the new
2538 ;;; ci -i option and the message is "<file>,v: already exists".
2539 ;;; SCCS: admin will fail with error (ad19).
2541 ;;; We can let these errors be passed up to the user.
2543 ;;; 2. File looked unregistered but is actually locked by caller, unchanged.
2545 ;;; Potential cause: self-race during window P.
2547 ;;; RCS: Prior to version 5.6.4, reverts the file to the last saved
2548 ;;; version and unlocks it. From 5.6.4 onwards, VC uses the new
2549 ;;; ci -i option, failing with message "<file>,v: already exists".
2550 ;;; SCCS: will fail with error (ad19).
2552 ;;; Either of these consequences is acceptable.
2554 ;;; 3. File looked unregistered but is actually locked by caller, changed.
2556 ;;; Potential cause: self-race during window P.
2558 ;;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as
2559 ;;; a delta with a null change comment (the -t- switch will be
2560 ;;; ignored). From 5.6.4 onwards, VC uses the new ci -i option,
2561 ;;; failing with message "<file>,v: already exists".
2562 ;;; SCCS: will fail with error (ad19).
2564 ;;; 4. File looked unregistered but is locked by someone else.
2566 ;;; Potential cause: someone else's admin during window P, with
2567 ;;; caller's admin happening *after* their checkout.
2569 ;;; RCS: Prior to version 5.6.4, ci fails with a
2570 ;;; "no lock set by <user>" message. From 5.6.4 onwards,
2571 ;;; VC uses the new ci -i option, failing with message
2572 ;;; "<file>,v: already exists".
2573 ;;; SCCS: will fail with error (ad19).
2575 ;;; We can let these errors be passed up to the user.
2577 ;;; Apparent state B ---
2579 ;;; 5. File looked registered and not locked, but is actually unregistered.
2581 ;;; Potential cause: master file got nuked during window P.
2583 ;;; RCS: will fail with "RCS/<file>: No such file or directory"
2584 ;;; SCCS: will fail with error ut4.
2586 ;;; We can let these errors be passed up to the user.
2588 ;;; 6. File looked registered and not locked, but is actually locked by the
2589 ;;; calling user and unchanged.
2591 ;;; Potential cause: self-race during window T.
2593 ;;; RCS: in the same directory as the previous workfile, co -l will fail
2594 ;;; with "co error: writable foo exists; checkout aborted". In any other
2595 ;;; directory, checkout will succeed.
2596 ;;; SCCS: will fail with ge17.
2598 ;;; Either of these consequences is acceptable.
2600 ;;; 7. File looked registered and not locked, but is actually locked by the
2601 ;;; calling user and changed.
2605 ;;; 8. File looked registered and not locked, but is actually locked by another
2608 ;;; Potential cause: someone else checks it out during window T.
2610 ;;; RCS: co error: revision 1.3 already locked by <user>
2611 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it).
2613 ;;; We can let these errors be passed up to the user.
2615 ;;; Apparent state C ---
2617 ;;; 9. File looks locked by calling user and unchanged, but is unregistered.
2621 ;;; 10. File looks locked by calling user and unchanged, but is actually not
2624 ;;; Potential cause: a self-race in window U, or by the revert's
2625 ;;; landing during window X of some other user's steal-lock or window S
2626 ;;; of another user's revert.
2628 ;;; RCS: succeeds, refreshing the file from the identical version in
2630 ;;; SCCS: fails with error ut4 (p file nonexistent).
2632 ;;; Either of these consequences is acceptable.
2634 ;;; 11. File is locked by calling user. It looks unchanged, but is actually
2637 ;;; Potential cause: the file would have to be touched by a self-race
2638 ;;; during window Q.
2640 ;;; The revert will succeed, removing whatever changes came with
2641 ;;; the touch. It is theoretically possible that work could be lost.
2643 ;;; 12. File looks like it's locked by the calling user and unchanged, but
2644 ;;; it's actually locked by someone else.
2646 ;;; Potential cause: a steal-lock in window V.
2648 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u
2649 ;;; SCCS: fails with error un2
2651 ;;; We can pass these errors up to the user.
2653 ;;; Apparent state D ---
2655 ;;; 13. File looks like it's locked by the calling user and changed, but it's
2656 ;;; actually unregistered.
2658 ;;; Potential cause: master file got nuked during window P.
2660 ;;; RCS: Prior to version 5.6.4, checks in the user's version as an
2661 ;;; initial delta. From 5.6.4 onwards, VC uses the new ci -j
2662 ;;; option, failing with message "no such file or directory".
2663 ;;; SCCS: will fail with error ut4.
2665 ;;; This case is kind of nasty. Under RCS prior to version 5.6.4,
2666 ;;; VC may fail to detect the loss of previous version information.
2668 ;;; 14. File looks like it's locked by the calling user and changed, but it's
2669 ;;; actually unlocked.
2671 ;;; Potential cause: self-race in window V, or the checkin happening
2672 ;;; during the window X of someone else's steal-lock or window S of
2673 ;;; someone else's revert.
2675 ;;; RCS: ci will fail with "no lock set by <user>".
2676 ;;; SCCS: delta will fail with error ut4.
2678 ;;; 15. File looks like it's locked by the calling user and changed, but it's
2679 ;;; actually locked by the calling user and unchanged.
2681 ;;; Potential cause: another self-race --- a whole checkin/checkout
2682 ;;; sequence by the calling user would have to land in window R.
2684 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual.
2685 ;;; RCS: reverts to the file state as of the second user's checkin, leaving
2686 ;;; the file unlocked.
2688 ;;; It is theoretically possible that work could be lost under RCS.
2690 ;;; 16. File looks like it's locked by the calling user and changed, but it's
2691 ;;; actually locked by a different user.
2693 ;;; RCS: ci error: no lock set by <user>
2694 ;;; SCCS: unget will fail with error un2
2696 ;;; We can pass these errors up to the user.
2698 ;;; Apparent state E ---
2700 ;;; 17. File looks like it's locked by some other user, but it's actually
2705 ;;; 18. File looks like it's locked by some other user, but it's actually
2708 ;;; Potential cause: someone released a lock during window W.
2710 ;;; RCS: The calling user will get the lock on the file.
2711 ;;; SCCS: unget -n will fail with cm4.
2713 ;;; Either of these consequences will be OK.
2715 ;;; 19. File looks like it's locked by some other user, but it's actually
2716 ;;; locked by the calling user and unchanged.
2718 ;;; Potential cause: the other user relinquishing a lock followed by
2719 ;;; a self-race, both in window W.
2721 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making
2722 ;;; the sequence a no-op.
2724 ;;; 20. File looks like it's locked by some other user, but it's actually
2725 ;;; locked by the calling user and changed.
2731 ;;; In order of decreasing severity:
2733 ;;; Cases 11 and 15 are the only ones that potentially lose work.
2734 ;;; They would require a self-race for this to happen.
2736 ;;; Case 13 in RCS loses information about previous deltas, retaining
2737 ;;; only the information in the current workfile. This can only happen
2738 ;;; if the master file gets nuked in window P.
2740 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with
2741 ;;; no change comment in the master. This would require a self-race in
2742 ;;; window P or R respectively.
2744 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes.
2746 ;;; Unfortunately, it appears to me that no recovery is possible in these
2747 ;;; cases. They don't yield error messages, so there's no way to tell that
2748 ;;; a race condition has occurred.
2750 ;;; All other cases don't change either the workfile or the master, and
2751 ;;; trigger command errors which the user will see.
2753 ;;; Thus, there is no explicit recovery code.