1 ;;; vc.el --- drive a version-control system from within Emacs
3 ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
8 ;; $Id: vc.el,v 1.249 1999/06/15 17:40:09 kwzh Exp $
10 ;; This file is part of GNU Emacs.
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation; either version 2, or (at your option)
17 ;; GNU Emacs is distributed in the hope that it will be useful,
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 ;; GNU General Public License for more details.
22 ;; You should have received a copy of the GNU General Public License
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25 ;; Boston, MA 02111-1307, USA.
29 ;; This mode is fully documented in the Emacs user's manual.
31 ;; This was designed and implemented by Eric Raymond <esr@snark.thyrsus.com>.
32 ;; Paul Eggert <eggert@twinsun.com>, Sebastian Kremer <sk@thp.uni-koeln.de>,
33 ;; and Richard Stallman contributed valuable criticism, support, and testing.
34 ;; CVS support was added by Per Cederqvist <ceder@lysator.liu.se>
35 ;; in Jan-Feb 1994. Further enhancements came from ttn@netcom.com and
36 ;; Andre Spiegel <spiegel@inf.fu-berlin.de>.
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
102 "Version-control system in Emacs."
105 (defcustom vc-suppress-confirm nil
106 "*If non-nil, treat user as expert; suppress yes-no prompts on some things."
110 (defcustom vc-delete-logbuf-window t
111 "*If non-nil, delete the *VC-log* buffer and window after each logical action.
112 If nil, bury that buffer instead.
113 This is most useful if you have multiple windows on a frame and would like to
114 preserve the setting."
118 (defcustom vc-initial-comment nil
119 "*If non-nil, prompt for initial comment when a file is registered."
123 (defcustom vc-default-init-version "1.1"
124 "*A string used as the default version number when a new file is registered.
125 This can be overriden by giving a prefix argument to \\[vc-register]."
130 (defcustom vc-command-messages nil
131 "*If non-nil, display run messages from back-end commands."
135 (defcustom vc-checkin-switches nil
136 "*A string or list of strings specifying extra switches for checkin.
137 These are passed to the checkin program by \\[vc-checkin]."
138 :type '(choice (const :tag "None" nil)
139 (string :tag "Argument String")
140 (repeat :tag "Argument List"
145 (defcustom vc-checkout-switches nil
146 "*A string or list of strings specifying extra switches for checkout.
147 These are passed to the checkout program by \\[vc-checkout]."
148 :type '(choice (const :tag "None" nil)
149 (string :tag "Argument String")
150 (repeat :tag "Argument List"
155 (defcustom vc-register-switches nil
156 "*A string or list of strings; extra switches for registering a file.
157 These are passed to the checkin program by \\[vc-register]."
158 :type '(choice (const :tag "None" nil)
159 (string :tag "Argument String")
160 (repeat :tag "Argument List"
165 (defcustom vc-dired-recurse t
166 "*If non-nil, show directory trees recursively in VC Dired."
171 (defcustom vc-dired-terse-display t
172 "*If non-nil, show only locked files in VC Dired."
177 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS")
178 "*List of directory names to be ignored while recursively walking file trees."
179 :type '(repeat string)
182 (defconst vc-maximum-comment-ring-size 32
183 "Maximum number of saved comments in the comment ring.")
185 ;;; This is duplicated in diff.el.
186 (defvar diff-switches "-c"
187 "*A string or list of strings specifying switches to be be passed to diff.")
189 (defcustom vc-annotate-color-map
190 '(( 26.3672 . "#FF0000")
191 ( 52.7344 . "#FF3800")
192 ( 79.1016 . "#FF7000")
193 (105.4688 . "#FFA800")
194 (131.8359 . "#FFE000")
195 (158.2031 . "#E7FF00")
196 (184.5703 . "#AFFF00")
197 (210.9375 . "#77FF00")
198 (237.3047 . "#3FFF00")
199 (263.6719 . "#07FF00")
200 (290.0391 . "#00FF31")
201 (316.4063 . "#00FF69")
202 (342.7734 . "#00FFA1")
203 (369.1406 . "#00FFD9")
204 (395.5078 . "#00EEFF")
205 (421.8750 . "#00B6FF")
206 (448.2422 . "#007EFF"))
207 "*Association list of age versus color, for \\[vc-annotate].
208 Ages are given in units of 2**-16 seconds.
209 Default is eighteen steps using a twenty day increment."
213 (defcustom vc-annotate-very-old-color "#0046FF"
214 "*Color for lines older than CAR of last cons in `vc-annotate-color-map'."
218 (defcustom vc-annotate-background "black"
219 "*Background color for \\[vc-annotate].
220 Default color is used if nil."
224 (defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01)
225 "*Menu elements for the mode-specific menu of VC-Annotate mode.
226 List of factors, used to expand/compress the time scale. See `vc-annotate'."
231 (defcustom vc-checkin-hook nil
232 "*Normal hook (list of functions) run after a checkin is done.
235 :options '(vc-comment-to-change-log)
239 (defcustom vc-before-checkin-hook nil
240 "*Normal hook (list of functions) run before a file gets checked in.
246 (defcustom vc-annotate-mode-hook nil
247 "*Hooks to run when VC-Annotate mode is turned on."
251 ;; Header-insertion hair
253 (defcustom vc-header-alist
254 '((SCCS "\%W\%") (RCS "\$Id\$") (CVS "\$Id\$"))
255 "*Header keywords to be inserted by `vc-insert-headers'.
256 Must be a list of two-element lists, the first element of each must
257 be `RCS', `CVS', or `SCCS'. The second element is the string to
258 be inserted for this particular backend."
259 :type '(repeat (list :format "%v"
260 (choice :tag "System"
264 (string :tag "Header")))
267 (defcustom vc-static-header-alist
269 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
270 "*Associate static header string templates with file types. A \%s in the
271 template is replaced with the first string associated with the file's
272 version-control type in `vc-header-alist'."
273 :type '(repeat (cons :format "%v"
274 (regexp :tag "File Type")
275 (string :tag "Header String")))
278 (defcustom vc-comment-alist
279 '((nroff-mode ".\\\"" ""))
280 "*Special comment delimiters to be used in generating vc headers only.
281 Add an entry in this list if you need to override the normal comment-start
282 and comment-end variables. This will only be necessary if the mode language
283 is sensitive to blank lines."
284 :type '(repeat (list :format "%v"
286 (string :tag "Comment Start")
287 (string :tag "Comment End")))
290 ;; Default is to be extra careful for super-user.
291 (defcustom vc-checkout-carefully (= (user-uid) 0)
292 "*Non-nil means be extra-careful in checkout.
293 Verify that the file really is not locked
294 and that its contents match what the master file says."
298 (defcustom vc-rcs-release nil
299 "*The release number of your RCS installation, as a string.
300 If nil, VC itself computes this value when it is first needed."
301 :type '(choice (const :tag "Auto" nil)
303 (const :tag "Unknown" unknown))
306 (defcustom vc-sccs-release nil
307 "*The release number of your SCCS installation, as a string.
308 If nil, VC itself computes this value when it is first needed."
309 :type '(choice (const :tag "Auto" nil)
311 (const :tag "Unknown" unknown))
314 (defcustom vc-cvs-release nil
315 "*The release number of your CVS installation, as a string.
316 If nil, VC itself computes this value when it is first needed."
317 :type '(choice (const :tag "Auto" nil)
319 (const :tag "Unknown" unknown))
322 ;; Variables the user doesn't need to know about.
323 (defvar vc-log-entry-mode nil)
324 (defvar vc-log-operation nil)
325 (defvar vc-log-after-operation-hook nil)
326 (defvar vc-checkout-writable-buffer-hook 'vc-checkout-writable-buffer)
327 ;; In a log entry buffer, this is a local variable
328 ;; that points to the buffer for which it was made
329 ;; (either a file, or a VC dired buffer).
330 (defvar vc-parent-buffer nil)
331 (defvar vc-parent-buffer-name nil)
334 (defvar vc-log-version)
336 (defconst vc-name-assoc-file "VC-names")
338 (defvar vc-dired-mode nil)
339 (make-variable-buffer-local 'vc-dired-mode)
341 (defvar vc-comment-ring (make-ring vc-maximum-comment-ring-size))
342 (defvar vc-comment-ring-index nil)
343 (defvar vc-last-comment-match nil)
345 ;;; Find and compare backend releases
347 (defun vc-backend-release (backend)
348 ;; Returns which backend release is installed on this system.
352 (and (zerop (vc-do-command nil nil "rcs" nil nil "-V"))
354 (set-buffer (get-buffer "*vc*"))
356 (car (vc-parse-buffer
357 '(("^RCS version \\([0-9.]+ *.*\\)" 1)))))))
358 (setq vc-rcs-release 'unknown)))
361 (and (zerop (vc-do-command nil 1 "cvs" nil nil "-v"))
363 (set-buffer (get-buffer "*vc*"))
365 (car (vc-parse-buffer
366 '(("^Concurrent Versions System (CVS) \\([0-9.]+\\)"
368 (setq vc-cvs-release 'unknown)))
372 (defun vc-release-greater-or-equal (r1 r2)
373 ;; Compare release numbers, represented as strings.
374 ;; Release components are assumed cardinal numbers, not decimal
375 ;; fractions (5.10 is a higher release than 5.9). Omitted fields
376 ;; are considered lower (5.6.7 is earlier than 5.6.7.1).
377 ;; Comparison runs till the end of the string is found, or a
378 ;; non-numeric component shows up (5.6.7 is earlier than "5.6.7 beta",
379 ;; which is probably not what you want in some cases).
380 ;; This code is suitable for existing RCS release numbers.
381 ;; CVS releases are handled reasonably, too (1.3 < 1.4* < 1.5).
384 (or (and (string-match "^\\.?\\([0-9]+\\)" r1)
385 (setq i1 (match-end 0))
386 (setq v1 (string-to-number (match-string 1 r1)))
387 (or (and (string-match "^\\.?\\([0-9]+\\)" r2)
388 (setq i2 (match-end 0))
389 (setq v2 (string-to-number (match-string 1 r2)))
390 (if (> v1 v2) (throw 'done t)
391 (if (< v1 v2) (throw 'done nil)
393 (vc-release-greater-or-equal
395 (substring r2 i2)))))))
397 (or (and (string-match "^\\.?\\([0-9]+\\)" r2)
401 (defun vc-backend-release-p (backend release)
402 ;; Return t if we have RELEASE of BACKEND or better
403 (let (i r (ri 0) (ii 0) is rs (installation (vc-backend-release backend)))
404 (if (not (eq installation 'unknown))
406 ((or (eq backend 'RCS) (eq backend 'CVS))
407 (vc-release-greater-or-equal installation release))))))
409 ;;; functions that operate on RCS revision numbers
411 (defun vc-trunk-p (rev)
412 ;; return t if REV is a revision on the trunk
413 (not (eq nil (string-match "\\`[0-9]+\\.[0-9]+\\'" rev))))
415 (defun vc-branch-p (rev)
416 ;; return t if REV is a branch revision
417 (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev))))
419 (defun vc-branch-part (rev)
420 ;; return the branch part of a revision number REV
421 (substring rev 0 (string-match "\\.[0-9]+\\'" rev)))
423 (defun vc-minor-part (rev)
424 ;; return the minor version number of a revision number REV
425 (string-match "[0-9]+\\'" rev)
426 (substring rev (match-beginning 0) (match-end 0)))
428 (defun vc-previous-version (rev)
429 ;; guess the previous version number
430 (let ((branch (vc-branch-part rev))
431 (minor-num (string-to-number (vc-minor-part rev))))
433 ;; version does probably not start a branch or release
434 (concat branch "." (number-to-string (1- minor-num)))
436 ;; we are at the beginning of the trunk --
437 ;; don't know anything to return here
439 ;; we are at the beginning of a branch --
440 ;; return version of starting point
441 (vc-branch-part branch)))))
443 ;; File property caching
445 (defun vc-clear-context ()
446 "Clear all cached file properties and the comment ring."
448 (fillarray vc-file-prop-obarray nil)
449 ;; Note: there is potential for minor lossage here if there is an open
450 ;; log buffer with a nonzero local value of vc-comment-ring-index.
451 (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size)))
453 (defun vc-file-clear-masterprops (file)
454 ;; clear all properties of FILE that were retrieved
455 ;; from the master file
456 (vc-file-setprop file 'vc-latest-version nil)
457 (vc-file-setprop file 'vc-your-latest-version nil)
458 (vc-backend-dispatch file
460 (vc-file-setprop file 'vc-master-locks nil))
462 (vc-file-setprop file 'vc-default-branch nil)
463 (vc-file-setprop file 'vc-head-version nil)
464 (vc-file-setprop file 'vc-master-workfile-version nil)
465 (vc-file-setprop file 'vc-master-locks nil))
467 (vc-file-setprop file 'vc-cvs-status nil))))
469 (defun vc-head-version (file)
470 ;; Return the RCS head version of FILE
471 (cond ((vc-file-getprop file 'vc-head-version))
472 (t (vc-fetch-master-properties file)
473 (vc-file-getprop file 'vc-head-version))))
475 ;; Random helper functions
477 (defun vc-latest-on-branch-p (file)
478 ;; return t iff the current workfile version of FILE is
479 ;; the latest on its branch.
480 (vc-backend-dispatch file
482 (string= (vc-workfile-version file) (vc-latest-version file))
484 (let ((workfile-version (vc-workfile-version file)) tip-version)
485 (if (vc-trunk-p workfile-version)
487 ;; Re-fetch the head version number. This is to make
488 ;; sure that no-one has checked in a new version behind
490 (vc-fetch-master-properties file)
491 (string= (vc-file-getprop file 'vc-head-version)
493 ;; If we are not on the trunk, we need to examine the
494 ;; whole current branch. (vc-master-workfile-version
495 ;; is not what we need.)
497 (set-buffer (get-buffer-create "*vc-info*"))
498 (vc-insert-file (vc-name file) "^desc")
499 (setq tip-version (car (vc-parse-buffer (list (list
500 (concat "^\\(" (regexp-quote (vc-branch-part workfile-version))
501 "\\.[0-9]+\\)\ndate[ \t]+\\([0-9.]+\\);") 1 2)))))
502 (if (get-buffer "*vc-info*")
503 (kill-buffer (get-buffer "*vc-info*")))
504 (string= tip-version workfile-version))))
508 ;;; Two macros for elisp programming
510 (defmacro with-vc-file (file comment &rest body)
511 "Execute BODY, checking out a writable copy of FILE first if necessary.
512 After BODY has been executed, check-in FILE with COMMENT (a string).
513 FILE is passed through `expand-file-name'; BODY executed within
514 `save-excursion'. If FILE is not under version control, or locked by
515 somebody else, signal error."
516 `(let ((file (expand-file-name ,file)))
517 (or (vc-registered file)
518 (error (format "File not under version control: `%s'" file)))
519 (let ((locking-user (vc-locking-user file)))
520 (cond ((and (not locking-user)
521 (eq (vc-checkout-model file) 'manual))
522 (vc-checkout file t))
523 ((and (stringp locking-user)
524 (not (string= locking-user (vc-user-login-name))))
525 (error (format "`%s' is locking `%s'" locking-user file)))))
528 (vc-checkin file nil ,comment)))
531 (defmacro edit-vc-file (file comment &rest body)
532 "Edit FILE under version control, executing BODY. Checkin with COMMENT.
533 This macro uses `with-vc-file', passing args to it.
534 However, before executing BODY, find FILE, and after BODY, save buffer."
541 (defun vc-ensure-vc-buffer ()
542 ;; Make sure that the current buffer visits a version-controlled file.
544 (set-buffer (find-file-noselect (dired-get-filename)))
545 (while vc-parent-buffer
546 (pop-to-buffer vc-parent-buffer))
547 (if (not (buffer-file-name))
548 (error "Buffer %s is not associated with a file" (buffer-name))
549 (if (not (vc-backend (buffer-file-name)))
550 (error "File %s is not under version control" (buffer-file-name))))))
552 (defvar vc-binary-assoc nil)
553 (defvar vc-binary-suffixes
554 (if (memq system-type '(ms-dos windows-nt))
555 '(".exe" ".com" ".bat" ".cmd" ".btm" "")
557 (defun vc-find-binary (name)
558 "Look for a command anywhere on the subprocess-command search path."
559 (or (cdr (assoc name vc-binary-assoc))
565 (let ((full (concat s "/" name))
566 (suffixes vc-binary-suffixes)
569 (setq candidate (concat full (car suffixes)))
570 (if (and (file-executable-p candidate)
571 (not (file-directory-p candidate)))
573 (setq vc-binary-assoc
574 (cons (cons name candidate) vc-binary-assoc))
575 (throw 'found candidate))
576 (setq suffixes (cdr suffixes))))))))
580 (defun vc-do-command (buffer okstatus command file last &rest flags)
581 "Execute a version-control command, notifying user and checking for errors.
582 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil. The
583 command is considered successful if its exit status does not exceed
584 OKSTATUS (if OKSTATUS is nil, that means to ignore errors). FILE is
585 the name of the working file (may also be nil, to execute commands
586 that don't expect a file name). If FILE is non-nil, the argument LAST
587 indicates what filename should actually be passed to the command: if
588 it is `MASTER', the name of FILE's master file is used, if it is
589 `WORKFILE', then FILE is passed through unchanged. If an optional
590 list of FLAGS is present, that is inserted into the command line
591 before the filename."
592 (and file (setq file (expand-file-name file)))
593 (if (not buffer) (setq buffer "*vc*"))
594 (if vc-command-messages
595 (message "Running %s on %s..." command file))
596 (let ((obuf (current-buffer)) (camefrom (current-buffer))
598 (olddir default-directory)
600 (set-buffer (get-buffer-create buffer))
601 (set (make-local-variable 'vc-parent-buffer) camefrom)
602 (set (make-local-variable 'vc-parent-buffer-name)
603 (concat " from " (buffer-name camefrom)))
604 (setq default-directory olddir)
609 (function (lambda (s) (and s (setq squeezed (append squeezed (list s))))))
611 (if (and (eq last 'MASTER) file (setq vc-file (vc-name file)))
612 (setq squeezed (append squeezed (list vc-file))))
613 (if (and file (eq last 'WORKFILE))
615 (let* ((pwd (expand-file-name default-directory))
616 (preflen (length pwd)))
617 (if (string= (substring file 0 preflen) pwd)
618 (setq file (substring file preflen))))
619 (setq squeezed (append squeezed (list file)))))
620 (let ((exec-path (append vc-path exec-path))
621 ;; Add vc-path to PATH for the execution of this command.
623 (cons (concat "PATH=" (getenv "PATH")
625 (mapconcat 'identity vc-path path-separator))
626 process-environment))
627 (w32-quote-process-args t))
628 (setq status (apply 'call-process command nil t nil squeezed)))
629 (goto-char (point-max))
630 (set-buffer-modified-p nil)
632 (if (or (not (integerp status)) (and okstatus (< okstatus status)))
634 (pop-to-buffer buffer)
635 (goto-char (point-min))
636 (shrink-window-if-larger-than-buffer)
637 (error "Running %s...FAILED (%s)" command
638 (if (integerp status)
639 (format "status %d" status)
642 (if vc-command-messages
643 (message "Running %s...OK" command))
649 ;;; Save a bit of the text around POSN in the current buffer, to help
650 ;;; us find the corresponding position again later. This works even
651 ;;; if all markers are destroyed or corrupted.
652 ;;; A lot of this was shamelessly lifted from Sebastian Kremer's rcs.el mode.
653 (defun vc-position-context (posn)
656 (buffer-substring posn
657 (min (point-max) (+ posn 100)))))
659 ;;; Return the position of CONTEXT in the current buffer, or nil if we
660 ;;; couldn't find it.
661 (defun vc-find-position-by-context (context)
662 (let ((context-string (nth 2 context)))
663 (if (equal "" context-string)
666 (let ((diff (- (nth 1 context) (buffer-size))))
667 (if (< diff 0) (setq diff (- diff)))
668 (goto-char (nth 0 context))
669 (if (or (search-forward context-string nil t)
670 ;; Can't use search-backward since the match may continue
672 (progn (goto-char (- (point) diff (length context-string)))
673 ;; goto-char doesn't signal an error at
674 ;; beginning of buffer like backward-char would
675 (search-forward context-string nil t)))
676 ;; to beginning of OSTRING
677 (- (point) (length context-string))))))))
679 (defun vc-context-matches-p (posn context)
680 ;; Returns t if POSN matches CONTEXT, nil otherwise.
681 (let* ((context-string (nth 2 context))
682 (len (length context-string))
684 (if (> end (1+ (buffer-size)))
686 (string= context-string (buffer-substring posn end)))))
688 (defun vc-buffer-context ()
689 ;; Return a list '(point-context mark-context reparse); from which
690 ;; vc-restore-buffer-context can later restore the context.
691 (let ((point-context (vc-position-context (point)))
692 ;; Use mark-marker to avoid confusion in transient-mark-mode.
693 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer))
694 (vc-position-context (mark-marker))))
695 ;; Make the right thing happen in transient-mark-mode.
697 ;; We may want to reparse the compilation buffer after revert
698 (reparse (and (boundp 'compilation-error-list) ;compile loaded
699 (let ((curbuf (current-buffer)))
700 ;; Construct a list; each elt is nil or a buffer
701 ;; iff that buffer is a compilation output buffer
702 ;; that contains markers into the current buffer.
708 compilation-old-error-list
709 compilation-error-list))
710 (buffer-error-marked-p nil))
711 (while (and (consp errors)
712 (not buffer-error-marked-p))
713 (and (markerp (cdr (car errors)))
717 (setq buffer-error-marked-p t))
718 (setq errors (cdr errors)))
719 (if buffer-error-marked-p buffer))))
721 (list point-context mark-context reparse)))
723 (defun vc-restore-buffer-context (context)
724 ;; Restore point/mark, and reparse any affected compilation buffers.
725 ;; CONTEXT is that which vc-buffer-context returns.
726 (let ((point-context (nth 0 context))
727 (mark-context (nth 1 context))
728 (reparse (nth 2 context)))
729 ;; Reparse affected compilation buffers.
733 (set-buffer (car reparse))
734 (let ((compilation-last-buffer (current-buffer)) ;select buffer
735 ;; Record the position in the compilation buffer of
736 ;; the last error next-error went to.
737 (error-pos (marker-position
738 (car (car-safe compilation-error-list)))))
739 ;; Reparse the error messages as far as they were parsed before.
740 (compile-reinitialize-errors '(4) compilation-parsing-end)
741 ;; Move the pointer up to find the error we were at before
742 ;; reparsing. Now next-error should properly go to the next one.
743 (while (and compilation-error-list
744 (/= error-pos (car (car compilation-error-list))))
745 (setq compilation-error-list (cdr compilation-error-list))))))
746 (setq reparse (cdr reparse)))
748 ;; if necessary, restore point and mark
749 (if (not (vc-context-matches-p (point) point-context))
750 (let ((new-point (vc-find-position-by-context point-context)))
751 (if new-point (goto-char new-point))))
754 (not (vc-context-matches-p (mark) mark-context))
755 (let ((new-mark (vc-find-position-by-context mark-context)))
756 (if new-mark (set-mark new-mark))))))
758 (defun vc-revert-buffer1 (&optional arg no-confirm)
759 ;; Revert buffer, try to keep point and mark where user expects them in spite
760 ;; of changes because of expanded version-control key words.
761 ;; This is quite important since otherwise typeahead won't work as expected.
764 (let ((context (vc-buffer-context)))
765 ;; Use save-excursion here, because it may be able to restore point
766 ;; and mark properly even in cases where vc-restore-buffer-context
767 ;; would fail. However, save-excursion might also get it wrong --
768 ;; in this case, vc-restore-buffer-context gives it a second try.
770 ;; t means don't call normal-mode;
771 ;; that's to preserve various minor modes.
772 (revert-buffer arg no-confirm t))
773 (vc-restore-buffer-context context)))
776 (defun vc-buffer-sync (&optional not-urgent)
777 ;; Make sure the current buffer and its working file are in sync
778 ;; NOT-URGENT means it is ok to continue if the user says not to save.
779 (if (buffer-modified-p)
780 (if (or vc-suppress-confirm
781 (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name))))
785 (error "Aborted")))))
788 (defun vc-workfile-unchanged-p (file &optional want-differences-if-changed)
789 ;; Has the given workfile changed since last checkout?
790 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
791 (lastmod (nth 5 (file-attributes file))))
792 (or (equal checkout-time lastmod)
793 (and (or (not checkout-time) want-differences-if-changed)
794 (let ((unchanged (zerop (vc-backend-diff file nil nil
795 (not want-differences-if-changed)))))
796 ;; 0 stands for an unknown time; it can't match any mod time.
797 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))
800 (defun vc-next-action-on-file (file verbose &optional comment)
801 ;;; If comment is specified, it will be used as an admin or checkin comment.
802 (let ((vc-type (vc-backend file))
803 owner version buffer)
806 ;; If the file is not under version control, register it
808 (vc-register verbose comment))
810 ;; CVS: changes to the master file need to be
811 ;; merged back into the working file
812 ((and (eq vc-type 'CVS)
813 (or (eq (vc-cvs-status file) 'needs-checkout)
814 (eq (vc-cvs-status file) 'needs-merge)))
815 (if (or vc-dired-mode
817 (format "%s is not up-to-date. Merge in changes now? "
821 (and (setq buffer (get-file-buffer file))
822 (buffer-modified-p buffer)
823 (switch-to-buffer-other-window buffer)
825 (setq buffer (current-buffer))
827 (if (and buffer (buffer-modified-p buffer)
830 "Buffer %s modified; merge file on disc anyhow? "
831 (buffer-name buffer)))))
832 (error "Merge aborted"))
833 (let ((status (vc-backend-merge-news file)))
835 (vc-resynch-buffer file t
836 (not (buffer-modified-p buffer))))
837 (if (not (zerop status))
838 (if (y-or-n-p "Conflicts detected. Resolve them now? ")
839 (vc-resolve-conflicts)))))
840 (error "%s needs update" (buffer-name))))
842 ;; For CVS files with implicit checkout: if unmodified, don't do anything
843 ((and (eq vc-type 'CVS)
844 (eq (vc-checkout-model file) 'implicit)
845 (not (vc-locking-user file))
847 (message "%s is up to date" (buffer-name)))
849 ;; If there is no lock on the file, assert one and get it.
850 ((not (setq owner (vc-locking-user file)))
851 ;; With implicit checkout, make sure not to lose unsaved changes.
852 (and (eq (vc-checkout-model file) 'implicit)
853 (buffer-modified-p buffer)
855 (if (and vc-checkout-carefully
856 (not (vc-workfile-unchanged-p file t)))
857 (if (save-window-excursion
858 (pop-to-buffer "*vc-diff*")
859 (goto-char (point-min))
860 (insert-string (format "Changes to %s since last lock:\n\n"
864 (concat "File has unlocked changes, "
865 "claim lock retaining changes? ")))
866 (progn (vc-backend-steal file)
868 (if (not (yes-or-no-p "Revert to checked-in version, instead? "))
869 (error "Checkout aborted")
870 (vc-revert-buffer1 t t)
871 (vc-checkout-writable-buffer file))
874 (if (not (eq vc-type 'SCCS))
875 (vc-checkout file nil
876 (read-string "Branch or version to move to: "))
877 (error "Sorry, this is not implemented for SCCS"))
878 (if (vc-latest-on-branch-p file)
879 (vc-checkout-writable-buffer file)
881 "This is not the latest version. Really lock it? ")
882 (vc-checkout-writable-buffer file)
883 (if (yes-or-no-p "Lock the latest version instead? ")
884 (vc-checkout-writable-buffer file
885 (if (vc-trunk-p (vc-workfile-version file))
886 "" ;; this means check out latest on trunk
887 (vc-branch-part (vc-workfile-version file)))))))
890 ;; a checked-out version exists, but the user may not own the lock
891 ((and (not (eq vc-type 'CVS))
892 (not (string-equal owner (vc-user-login-name))))
894 (error "Sorry, you can't steal the lock on %s this way" file))
895 (and (eq vc-type 'RCS)
896 (not (vc-backend-release-p 'RCS "5.6.2"))
897 (error "File is locked by %s" owner))
900 (if verbose (read-string "Version to steal: ")
901 (vc-workfile-version file))
904 ;; OK, user owns the lock on the file
907 (find-file-other-window file)
910 ;; If the file on disk is newer, then the user just
911 ;; said no to rereading it. So the user probably wishes to
912 ;; overwrite the file with the buffer's contents, and check
914 (if (not (verify-visited-file-modtime (current-buffer)))
915 (if (yes-or-no-p "Replace file on disk with buffer contents? ")
916 (write-file (buffer-file-name))
918 ;; if buffer is not saved, give user a chance to do it
921 ;; Revert if file is unchanged and buffer is too.
922 ;; If buffer is modified, that means the user just said no
923 ;; to saving it; in that case, don't revert,
924 ;; because the user might intend to save
925 ;; after finishing the log entry.
926 (if (and (vc-workfile-unchanged-p file)
927 (not (buffer-modified-p)))
928 ;; DO NOT revert the file without asking the user!
930 ((yes-or-no-p "Revert to master version? ")
931 (vc-backend-revert file)
932 (vc-resynch-window file t t)))
934 ;; user may want to set nonstandard parameters
936 (setq version (read-string "New version level: ")))
938 ;; OK, let's do the checkin
939 (vc-checkin file version comment)
942 (defvar vc-dired-window-configuration)
944 (defun vc-next-action-dired (file rev comment)
945 ;; Do a vc-next-action-on-file on all the marked files, possibly
946 ;; passing on the log comment we've just entered.
947 (let ((dired-buffer (current-buffer))
948 (dired-dir default-directory))
949 (dired-map-over-marks
950 (let ((file (dired-get-filename)))
951 (message "Processing %s..." file)
952 ;; Adjust the default directory so that checkouts
953 ;; go to the right place.
954 (let ((default-directory (file-name-directory file)))
955 (vc-next-action-on-file file nil comment)
956 (set-buffer dired-buffer))
957 ;; Make sure that files don't vanish
958 ;; after they are checked in.
959 (let ((vc-dired-terse-mode nil))
960 (dired-do-redisplay file))
961 (set-window-configuration vc-dired-window-configuration)
962 (message "Processing %s...done" file))
964 (dired-move-to-filename))
966 ;; Here's the major entry point.
969 (defun vc-next-action (verbose)
970 "Do the next logical checkin or checkout operation on the current file.
971 If you call this from within a VC dired buffer with no files marked,
972 it will operate on the file in the current line.
973 If you call this from within a VC dired buffer, and one or more
974 files are marked, it will accept a log message and then operate on
975 each one. The log message will be used as a comment for any register
976 or checkin operations, but ignored when doing checkouts. Attempted
977 lock steals will raise an error.
978 A prefix argument lets you specify the version number to use.
980 For RCS and SCCS files:
981 If the file is not already registered, this registers it for version
983 If the file is registered and not locked by anyone, this checks out
984 a writable and locked file ready for editing.
985 If the file is checked out and locked by the calling user, this
986 first checks to see if the file has changed since checkout. If not,
987 it performs a revert.
988 If the file has been changed, this pops up a buffer for entry
989 of a log message; when the message has been entered, it checks in the
990 resulting changes along with the log message as change commentary. If
991 the variable `vc-keep-workfiles' is non-nil (which is its default), a
992 read-only copy of the changed file is left in place afterwards.
993 If the file is registered and locked by someone else, you are given
994 the option to steal the lock.
997 If the file is not already registered, this registers it for version
998 control. This does a \"cvs add\", but no \"cvs commit\".
999 If the file is added but not committed, it is committed.
1000 If your working file is changed, but the repository file is
1001 unchanged, this pops up a buffer for entry of a log message; when the
1002 message has been entered, it checks in the resulting changes along
1003 with the logmessage as change commentary. A writable file is retained.
1004 If the repository file is changed, you are asked if you want to
1005 merge in the changes into your working copy."
1010 (let ((files (dired-get-marked-files)))
1011 (set (make-local-variable 'vc-dired-window-configuration)
1012 (current-window-configuration))
1015 (function (lambda (f)
1016 (if (eq (vc-backend f) 'CVS)
1017 (if (or (eq (vc-cvs-status f) 'locally-modified)
1018 (eq (vc-cvs-status f) 'locally-added))
1020 (if (vc-locking-user f) "@" ""))))
1022 (vc-next-action-dired nil nil "dummy")
1023 (vc-start-entry nil nil nil
1024 "Enter a change comment for the marked files."
1025 'vc-next-action-dired))
1027 (while vc-parent-buffer
1028 (pop-to-buffer vc-parent-buffer))
1029 (if buffer-file-name
1030 (vc-next-action-on-file buffer-file-name verbose)
1031 (error "Buffer %s is not associated with a file" (buffer-name)))))
1033 ;;; These functions help the vc-next-action entry point
1035 (defun vc-checkout-writable-buffer (&optional file rev)
1036 "Retrieve a writable copy of the latest version of the current buffer's file."
1037 (vc-checkout (or file (buffer-file-name)) t rev)
1041 (defun vc-register (&optional override comment)
1042 "Register the current file into your version-control system."
1044 (or buffer-file-name
1045 (error "No visited file"))
1046 (let ((master (vc-name buffer-file-name)))
1047 (and master (file-exists-p master)
1048 (error "This file is already registered"))
1050 (not (y-or-n-p "Previous master file has vanished. Make a new one? "))
1051 (error "This file is already registered")))
1052 ;; Watch out for new buffers of size 0: the corresponding file
1053 ;; does not exist yet, even though buffer-modified-p is nil.
1054 (if (and (not (buffer-modified-p))
1055 (zerop (buffer-size))
1056 (not (file-exists-p buffer-file-name)))
1057 (set-buffer-modified-p t))
1059 (cond ((not vc-make-backup-files)
1060 ;; inhibit backup for this buffer
1061 (make-local-variable 'backup-inhibited)
1062 (setq backup-inhibited t)))
1067 (format "Initial version level for %s: " buffer-file-name)))
1068 vc-default-init-version)
1070 ;; Recompute backend property (it may have been set to nil before).
1071 (setq vc-buffer-backend (vc-backend (buffer-file-name)))
1074 (defun vc-resynch-window (file &optional keep noquery)
1075 ;; If the given file is in the current buffer,
1076 ;; either revert on it so we see expanded keywords,
1077 ;; or unvisit it (depending on vc-keep-workfiles)
1078 ;; NOQUERY if non-nil inhibits confirmation for reverting.
1079 ;; NOQUERY should be t *only* if it is known the only difference
1080 ;; between the buffer and the file is due to RCS rather than user editing!
1081 (and (string= buffer-file-name file)
1084 (vc-revert-buffer1 t noquery)
1086 (if (file-writable-p file)
1088 (let ((view-old-buffer-read-only nil))
1090 (and (not view-mode)
1091 (not (eq (get major-mode 'mode-class) 'special))
1092 (view-mode-enter))))
1093 (vc-mode-line buffer-file-name))
1094 (kill-buffer (current-buffer)))))
1096 (defun vc-resynch-buffer (file &optional keep noquery)
1097 ;; if FILE is currently visited, resynch its buffer
1098 (if (string= buffer-file-name file)
1099 (vc-resynch-window file keep noquery)
1100 (let ((buffer (get-file-buffer file)))
1104 (vc-resynch-window file keep noquery))))))
1106 (defun vc-start-entry (file rev comment msg action &optional after-hook)
1107 ;; Accept a comment for an operation on FILE revision REV. If COMMENT
1108 ;; is nil, pop up a VC-log buffer, emit MSG, and set the
1109 ;; action on close to ACTION; otherwise, do action immediately.
1110 ;; Remember the file's buffer in vc-parent-buffer (current one if no file).
1111 ;; AFTER-HOOK specifies the local value for vc-log-operation-hook.
1112 (let ((parent (if file (find-file-noselect file) (current-buffer))))
1113 (if vc-before-checkin-hook
1117 (run-hooks 'vc-before-checkin-hook))
1118 (run-hooks 'vc-before-checkin-hook)))
1120 (set-buffer (get-buffer-create "*VC-log*"))
1121 (pop-to-buffer (get-buffer-create "*VC-log*")))
1122 (set (make-local-variable 'vc-parent-buffer) parent)
1123 (set (make-local-variable 'vc-parent-buffer-name)
1124 (concat " from " (buffer-name vc-parent-buffer)))
1125 (if file (vc-mode-line file))
1127 (make-local-variable 'vc-log-after-operation-hook)
1129 (setq vc-log-after-operation-hook after-hook))
1130 (setq vc-log-operation action)
1131 (setq vc-log-version rev)
1136 (vc-finish-logentry t)
1138 (vc-finish-logentry nil)))
1139 (message "%s Type C-c C-c when done." msg))))
1141 (defun vc-admin (file rev &optional comment)
1142 "Check a file into your version-control system.
1143 FILE is the unmodified name of the file. REV should be the base version
1144 level to check it in under. COMMENT, if specified, is the checkin comment."
1145 (vc-start-entry file rev
1146 (or comment (not vc-initial-comment))
1147 "Enter initial comment." 'vc-backend-admin
1150 (defun vc-checkout (file &optional writable rev)
1151 "Retrieve a copy of the latest version of the given file."
1152 ;; If ftp is on this system and the name matches the ange-ftp format
1153 ;; for a remote file, the user is trying something that won't work.
1154 (if (and (string-match "^/[^/:]+:" file) (vc-find-binary "ftp"))
1155 (error "Sorry, you can't check out files over FTP"))
1156 (vc-backend-checkout file writable rev)
1157 (vc-resynch-buffer file t t))
1159 (defun vc-steal-lock (file rev &optional owner)
1160 "Steal the lock on the current workfile."
1161 (let (file-description)
1163 (setq owner (vc-locking-user file)))
1165 (setq file-description (format "%s:%s" file rev))
1166 (setq file-description file))
1167 (if (not (yes-or-no-p (format "Steal the lock on %s from %s? "
1168 file-description owner)))
1169 (error "Steal cancelled"))
1170 (pop-to-buffer (get-buffer-create "*VC-mail*"))
1171 (setq default-directory (expand-file-name "~/"))
1172 (auto-save-mode auto-save-default)
1175 (mail-setup owner (format "Stolen lock on %s" file-description) nil nil nil
1176 (list (list 'vc-finish-steal file rev)))
1177 (goto-char (point-max))
1179 (format "I stole the lock on %s, " file-description)
1180 (current-time-string)
1182 (message "Please explain why you stole the lock. Type C-c C-c when done.")))
1184 ;; This is called when the notification has been sent.
1185 (defun vc-finish-steal (file version)
1186 (vc-backend-steal file version)
1187 (if (get-file-buffer file)
1189 (set-buffer (get-file-buffer file))
1190 (vc-resynch-window file t t))))
1192 (defun vc-checkin (file &optional rev comment)
1193 "Check in the file specified by FILE.
1194 The optional argument REV may be a string specifying the new version level
1195 \(if nil increment the current level). The file is either retained with write
1196 permissions zeroed, or deleted (according to the value of `vc-keep-workfiles').
1197 If the back-end is CVS, a writable workfile is always kept.
1198 COMMENT is a comment string; if omitted, a buffer is popped up to accept a
1201 Runs the normal hook `vc-checkin-hook'."
1202 (vc-start-entry file rev comment
1203 "Enter a change comment." 'vc-backend-checkin
1206 (defun vc-comment-to-change-log (&optional whoami file-name)
1207 "Enter last VC comment into change log file for current buffer's file.
1208 Optional arg (interactive prefix) non-nil means prompt for user name and site.
1209 Second arg is file name of change log. \
1210 If nil, uses `change-log-default-name'.
1212 May be useful as a `vc-checkin-hook' to update change logs automatically."
1213 (interactive (if current-prefix-arg
1214 (list current-prefix-arg
1215 (prompt-for-change-log-name))))
1216 ;; Make sure the defvar for add-log-current-defun-function has been executed
1217 ;; before binding it.
1219 (let (;; Extract the comment first so we get any error before doing anything.
1220 (comment (ring-ref vc-comment-ring 0))
1221 ;; Don't let add-change-log-entry insert a defun name.
1222 (add-log-current-defun-function 'ignore)
1224 ;; Call add-log to do half the work.
1225 (add-change-log-entry whoami file-name t t)
1226 ;; Insert the VC comment, leaving point before it.
1227 (setq end (save-excursion (insert comment) (point-marker)))
1228 (if (looking-at "\\s *\\s(")
1229 ;; It starts with an open-paren, as in "(foo): Frobbed."
1230 ;; So remove the ": " add-log inserted.
1232 ;; Canonicalize the white space between the file name and comment.
1234 ;; Indent rest of the text the same way add-log indented the first line.
1235 (let ((indentation (current-indentation)))
1237 (while (< (point) end)
1239 (indent-to indentation))
1240 (setq end (point))))
1241 ;; Fill the inserted text, preserving open-parens at bol.
1242 (let ((paragraph-separate (concat paragraph-separate "\\|\\s *\\s("))
1243 (paragraph-start (concat paragraph-start "\\|\\s *\\s(")))
1245 (fill-region (point) end))
1246 ;; Canonicalize the white space at the end of the entry so it is
1247 ;; separated from the next entry by a single blank line.
1248 (skip-syntax-forward " " end)
1249 (delete-char (- (skip-syntax-backward " ")))
1250 (or (eobp) (looking-at "\n\n")
1253 (defun vc-finish-logentry (&optional nocomment)
1254 "Complete the operation implied by the current log entry."
1256 ;; Check and record the comment, if any.
1259 ;; Comment too long?
1260 (vc-backend-logentry-check vc-log-file)
1261 ;; Record the comment in the comment ring
1262 (ring-insert vc-comment-ring (buffer-string))
1264 ;; Sync parent buffer in case the user modified it while editing the comment.
1265 ;; But not if it is a vc-dired buffer.
1267 (set-buffer vc-parent-buffer)
1270 (if (not vc-log-operation) (error "No log operation is pending"))
1271 ;; save the parameters held in buffer-local variables
1272 (let ((log-operation vc-log-operation)
1273 (log-file vc-log-file)
1274 (log-version vc-log-version)
1275 (log-entry (buffer-string))
1276 (after-hook vc-log-after-operation-hook)
1277 (tmp-vc-parent-buffer vc-parent-buffer))
1278 (pop-to-buffer vc-parent-buffer)
1281 (funcall log-operation
1285 ;; Remove checkin window (after the checkin so that if that fails
1286 ;; we don't zap the *VC-log* buffer and the typing therein).
1287 (let ((logbuf (get-buffer "*VC-log*")))
1288 (cond ((and logbuf vc-delete-logbuf-window)
1289 (delete-windows-on logbuf (selected-frame))
1290 ;; Kill buffer and delete any other dedicated windows/frames.
1291 (kill-buffer logbuf))
1292 (t (pop-to-buffer "*VC-log*")
1294 (pop-to-buffer tmp-vc-parent-buffer))))
1295 ;; Now make sure we see the expanded headers
1296 (if buffer-file-name
1297 (vc-resynch-window buffer-file-name vc-keep-workfiles t))
1299 (dired-move-to-filename))
1300 (run-hooks after-hook 'vc-finish-logentry-hook)))
1302 ;; Code for access to the comment ring
1304 (defun vc-previous-comment (arg)
1305 "Cycle backwards through comment history."
1307 (let ((len (ring-length vc-comment-ring)))
1309 (message "Empty comment ring")
1313 ;; Initialize the index on the first use of this command
1314 ;; so that the first M-p gets index 0, and the first M-n gets
1316 (if (null vc-comment-ring-index)
1317 (setq vc-comment-ring-index
1319 (if (< arg 0) 1 0))))
1320 (setq vc-comment-ring-index
1321 (mod (+ vc-comment-ring-index arg) len))
1322 (message "%d" (1+ vc-comment-ring-index))
1323 (insert (ring-ref vc-comment-ring vc-comment-ring-index))))))
1325 (defun vc-next-comment (arg)
1326 "Cycle forwards through comment history."
1328 (vc-previous-comment (- arg)))
1330 (defun vc-comment-search-reverse (str)
1331 "Searches backwards through comment history for substring match."
1332 (interactive "sComment substring: ")
1333 (if (string= str "")
1334 (setq str vc-last-comment-match)
1335 (setq vc-last-comment-match str))
1336 (if (null vc-comment-ring-index)
1337 (setq vc-comment-ring-index -1))
1338 (let ((str (regexp-quote str))
1339 (len (ring-length vc-comment-ring))
1340 (n (1+ vc-comment-ring-index)))
1341 (while (and (< n len) (not (string-match str (ring-ref vc-comment-ring n))))
1344 (vc-previous-comment (- n vc-comment-ring-index)))
1345 (t (error "Not found")))))
1347 (defun vc-comment-search-forward (str)
1348 "Searches forwards through comment history for substring match."
1349 (interactive "sComment substring: ")
1350 (if (string= str "")
1351 (setq str vc-last-comment-match)
1352 (setq vc-last-comment-match str))
1353 (if (null vc-comment-ring-index)
1354 (setq vc-comment-ring-index 0))
1355 (let ((str (regexp-quote str))
1356 (len (ring-length vc-comment-ring))
1357 (n vc-comment-ring-index))
1358 (while (and (>= n 0) (not (string-match str (ring-ref vc-comment-ring n))))
1361 (vc-next-comment (- n vc-comment-ring-index)))
1362 (t (error "Not found")))))
1364 ;; Additional entry points for examining version histories
1367 (defun vc-diff (historic &optional not-urgent)
1368 "Display diffs between file versions.
1369 Normally this compares the current file and buffer with the most recent
1370 checked in version of that file. This uses no arguments.
1371 With a prefix argument, it reads the file name to use
1372 and two version designators specifying which versions to compare."
1373 (interactive (list current-prefix-arg t))
1374 (vc-ensure-vc-buffer)
1376 (call-interactively 'vc-version-diff)
1377 (let ((file buffer-file-name)
1379 (vc-buffer-sync not-urgent)
1380 (setq unchanged (vc-workfile-unchanged-p buffer-file-name))
1382 (message "No changes to %s since latest version" file)
1383 (vc-backend-diff file)
1384 ;; Ideally, we'd like at this point to parse the diff so that
1385 ;; the buffer effectively goes into compilation mode and we
1386 ;; can visit the old and new change locations via next-error.
1387 ;; Unfortunately, this is just too painful to do. The basic
1388 ;; problem is that the `old' file doesn't exist to be
1389 ;; visited. This plays hell with numerous assumptions in
1390 ;; the diff.el and compile.el machinery.
1391 (set-buffer "*vc-diff*")
1392 (setq default-directory (file-name-directory file))
1393 (if (= 0 (buffer-size))
1396 (message "No changes to %s since latest version" file))
1397 (pop-to-buffer "*vc-diff*")
1398 (goto-char (point-min))
1399 (shrink-window-if-larger-than-buffer)))
1402 (defun vc-version-diff (file rel1 rel2)
1403 "For FILE, report diffs between two stored versions REL1 and REL2 of it.
1404 If FILE is a directory, generate diffs between versions for all registered
1405 files in or below it."
1407 (let ((file (read-file-name (if buffer-file-name
1408 "File or dir to diff: (default visited file) "
1409 "File or dir to diff: ")
1410 default-directory buffer-file-name t))
1411 (rel1-default nil) (rel2-default nil))
1412 ;; compute default versions based on the file state
1414 ;; if it's a directory, don't supply any version defauolt
1415 ((file-directory-p file)
1417 ;; if the file is locked, use current version as older version
1418 ((vc-locking-user file)
1419 (setq rel1-default (vc-workfile-version file)))
1420 ;; if the file is not locked, use last and previous version as default
1422 (setq rel1-default (vc-previous-version (vc-workfile-version file)))
1423 (setq rel2-default (vc-workfile-version file))))
1424 ;; construct argument list
1426 (read-string (if rel1-default
1427 (concat "Older version: (default "
1430 nil nil rel1-default)
1431 (read-string (if rel2-default
1432 (concat "Newer version: (default "
1434 "Newer version (default: current source): ")
1435 nil nil rel2-default))))
1436 (if (string-equal rel1 "") (setq rel1 nil))
1437 (if (string-equal rel2 "") (setq rel2 nil))
1438 (if (file-directory-p file)
1439 (let ((camefrom (current-buffer)))
1440 (set-buffer (get-buffer-create "*vc-status*"))
1441 (set (make-local-variable 'vc-parent-buffer) camefrom)
1442 (set (make-local-variable 'vc-parent-buffer-name)
1443 (concat " from " (buffer-name camefrom)))
1445 (insert "Diffs between "
1446 (or rel1 "last version checked in")
1448 (or rel2 "current workfile(s)")
1450 (set-buffer (get-buffer-create "*vc-diff*"))
1454 (function (lambda (f)
1455 (message "Looking at %s" f)
1457 (not (file-directory-p f))
1459 (vc-backend-diff f rel1 rel2)
1460 (append-to-buffer "*vc-status*" (point-min) (point-max)))
1462 (pop-to-buffer "*vc-status*")
1463 (insert "\nEnd of diffs.\n")
1464 (goto-char (point-min))
1465 (set-buffer-modified-p nil)
1467 (if (zerop (vc-backend-diff file rel1 rel2))
1468 (message "No changes to %s between %s and %s." file rel1 rel2)
1469 (pop-to-buffer "*vc-diff*"))))
1472 (defun vc-version-other-window (rev)
1473 "Visit version REV of the current buffer in another window.
1474 If the current buffer is named `F', the version is named `F.~REV~'.
1475 If `F.~REV~' already exists, it is used instead of being re-created."
1476 (interactive "sVersion to visit (default is latest version): ")
1477 (vc-ensure-vc-buffer)
1478 (let* ((version (if (string-equal rev "")
1479 (vc-latest-version buffer-file-name)
1481 (filename (concat buffer-file-name ".~" version "~")))
1482 (or (file-exists-p filename)
1483 (vc-backend-checkout buffer-file-name nil version filename))
1484 (find-file-other-window filename)))
1486 ;; Header-insertion code
1489 (defun vc-insert-headers ()
1490 "Insert headers in a file for use with your version-control system.
1491 Headers desired are inserted at point, and are pulled from
1492 the variable `vc-header-alist'."
1494 (vc-ensure-vc-buffer)
1498 (if (or (not (vc-check-headers))
1499 (y-or-n-p "Version headers already exist. Insert another set? "))
1501 (let* ((delims (cdr (assq major-mode vc-comment-alist)))
1502 (comment-start-vc (or (car delims) comment-start "#"))
1503 (comment-end-vc (or (car (cdr delims)) comment-end ""))
1504 (hdstrings (cdr (assoc (vc-backend (buffer-file-name)) vc-header-alist))))
1505 (mapcar (function (lambda (s)
1506 (insert comment-start-vc "\t" s "\t"
1507 comment-end-vc "\n")))
1509 (if vc-static-header-alist
1510 (mapcar (function (lambda (f)
1511 (if (string-match (car f) buffer-file-name)
1512 (insert (format (cdr f) (car hdstrings))))))
1513 vc-static-header-alist))
1517 (defun vc-clear-headers ()
1518 ;; Clear all version headers in the current buffer, i.e. reset them
1519 ;; to the nonexpanded form. Only implemented for RCS, yet.
1520 ;; Don't lose point and mark during this.
1521 (let ((context (vc-buffer-context))
1522 (case-fold-search nil))
1523 ;; save-excursion may be able to relocate point and mark properly.
1524 ;; If it fails, vc-restore-buffer-context will give it a second try.
1526 (goto-char (point-min))
1527 (while (re-search-forward
1528 (concat "\\$\\(Author\\|Date\\|Header\\|Id\\|Locker\\|Name\\|"
1529 "RCSfile\\|Revision\\|Source\\|State\\): [^$\n]+\\$")
1531 (replace-match "$\\1$")))
1532 (vc-restore-buffer-context context)))
1537 (vc-ensure-vc-buffer)
1539 (let* ((file buffer-file-name)
1540 (backend (vc-backend file))
1541 first-version second-version locking-user)
1542 (if (eq backend 'SCCS)
1543 (error "Sorry, merging is not implemented for SCCS")
1544 (setq locking-user (vc-locking-user file))
1545 (if (eq (vc-checkout-model file) 'manual)
1546 (if (not locking-user)
1548 (format "File must be %s for merging. %s now? "
1549 (if (eq backend 'RCS) "locked" "writable")
1550 (if (eq backend 'RCS) "Lock" "Check out"))))
1551 (error "Merge aborted")
1552 (vc-checkout file t))
1553 (if (not (string= locking-user (vc-user-login-name)))
1554 (error "File is locked by %s" locking-user))))
1555 (setq first-version (read-string "Branch or version to merge from: "))
1556 (if (and (>= (elt first-version 0) ?0)
1557 (<= (elt first-version 0) ?9))
1558 (if (not (vc-branch-p first-version))
1559 (setq second-version
1560 (read-string "Second version: "
1561 (concat (vc-branch-part first-version) ".")))
1562 ;; We want to merge an entire branch. Set versions
1563 ;; accordingly, so that vc-backend-merge understands us.
1564 (setq second-version first-version)
1565 ;; first-version must be the starting point of the branch
1566 (setq first-version (vc-branch-part first-version))))
1567 (let ((status (vc-backend-merge file first-version second-version)))
1568 (if (and (eq (vc-checkout-model file) 'implicit)
1569 (not (vc-locking-user file)))
1570 (vc-file-setprop file 'vc-locking-user nil))
1571 (vc-resynch-buffer file t t)
1572 (if (not (zerop status))
1573 (if (y-or-n-p "Conflicts detected. Resolve them now? ")
1574 (vc-resolve-conflicts "WORKFILE" "MERGE SOURCE")
1575 (message "File contains conflict markers"))
1576 (message "Merge successful"))))))
1578 (defvar vc-ediff-windows)
1579 (defvar vc-ediff-result)
1582 (defun vc-resolve-conflicts (&optional name-A name-B)
1583 "Invoke ediff to resolve conflicts in the current buffer.
1584 The conflicts must be marked with rcsmerge conflict markers."
1586 (vc-ensure-vc-buffer)
1588 (file-name (file-name-nondirectory buffer-file-name))
1589 (your-buffer (generate-new-buffer
1590 (concat "*" file-name
1591 " " (or name-A "WORKFILE") "*")))
1592 (other-buffer (generate-new-buffer
1593 (concat "*" file-name
1594 " " (or name-B "CHECKED-IN") "*")))
1595 (result-buffer (current-buffer)))
1597 (set-buffer your-buffer)
1599 (insert-buffer result-buffer)
1600 (goto-char (point-min))
1601 (while (re-search-forward (concat "^<<<<<<< "
1602 (regexp-quote file-name) "\n") nil t)
1605 (if (not (re-search-forward "^=======\n" nil t))
1606 (error "Malformed conflict marker"))
1608 (let ((start (point)))
1609 (if (not (re-search-forward "^>>>>>>> [0-9.]+\n" nil t))
1610 (error "Malformed conflict marker"))
1611 (delete-region start (point))))
1614 (kill-buffer your-buffer)
1615 (kill-buffer other-buffer)
1616 (error "No conflict markers found")))
1617 (set-buffer other-buffer)
1619 (insert-buffer result-buffer)
1620 (goto-char (point-min))
1621 (while (re-search-forward (concat "^<<<<<<< "
1622 (regexp-quote file-name) "\n") nil t)
1623 (let ((start (match-beginning 0)))
1624 (if (not (re-search-forward "^=======\n" nil t))
1625 (error "Malformed conflict marker"))
1626 (delete-region start (point))
1627 (if (not (re-search-forward "^>>>>>>> [0-9.]+\n" nil t))
1628 (error "Malformed conflict marker"))
1629 (replace-match "")))
1630 (let ((config (current-window-configuration))
1631 (ediff-default-variant 'default-B))
1635 (set-buffer (ediff-merge-buffers your-buffer other-buffer))
1637 ;; Ediff is now set up, and we are in the control buffer.
1638 ;; Do a few further adjustments and take precautions for exit.
1640 (make-local-variable 'vc-ediff-windows)
1641 (setq vc-ediff-windows config)
1642 (make-local-variable 'vc-ediff-result)
1643 (setq vc-ediff-result result-buffer)
1644 (make-local-variable 'ediff-quit-hook)
1645 (setq ediff-quit-hook
1648 (let ((buffer-A ediff-buffer-A)
1649 (buffer-B ediff-buffer-B)
1650 (buffer-C ediff-buffer-C)
1651 (result vc-ediff-result)
1652 (windows vc-ediff-windows))
1653 (ediff-cleanup-mess)
1656 (insert-buffer buffer-C)
1657 (kill-buffer buffer-A)
1658 (kill-buffer buffer-B)
1659 (kill-buffer buffer-C)
1660 (set-window-configuration windows)
1661 (message "Conflict resolution finished; you may save the buffer")))))
1662 (message "Please resolve conflicts now; exit ediff when done")
1665 ;; The VC directory major mode. Coopt Dired for this.
1666 ;; All VC commands get mapped into logical equivalents.
1668 (defvar vc-dired-switches)
1669 (defvar vc-dired-terse-mode)
1671 (define-derived-mode vc-dired-mode dired-mode "Dired under VC"
1672 "The major mode used in VC directory buffers. It works like Dired,
1673 but lists only files under version control, with the current VC state of
1674 each file being indicated in the place of the file's link count, owner,
1675 group and size. Subdirectories are also listed, and you may insert them
1676 into the buffer as desired, like in Dired.
1677 All Dired commands operate normally, with the exception of `v', which
1678 is redefined as the version control prefix, so that you can type
1679 `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on
1680 the file named in the current Dired buffer line. `vv' invokes
1681 `vc-next-action' on this file, or on all files currently marked.
1682 There is a special command, `*l', to mark all files currently locked."
1683 (make-local-hook 'dired-after-readin-hook)
1684 (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t)
1685 ;; The following is slightly modified from dired.el,
1686 ;; because file lines look a bit different in vc-dired-mode.
1687 (set (make-local-variable 'dired-move-to-filename-regexp)
1689 ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
1690 ;; In some locales, month abbreviations are as short as 2 letters,
1691 ;; and they can be padded on the right with spaces.
1692 (month (concat l l "+ *"))
1693 ;; Recognize any non-ASCII character.
1694 ;; The purpose is to match a Kanji character.
1696 ;; (k "[^\x00-\x7f\x80-\xff]")
1698 (yyyy "[0-9][0-9][0-9][0-9]")
1701 (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
1702 (western (concat "\\(" month s dd "\\|" dd s month "\\)"
1703 s "\\(" HH:MM "\\|" s yyyy"\\|" yyyy s "\\)"))
1704 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)")))
1705 (concat s "\\(" western "\\|" japanese "\\)" s)))
1706 (and (boundp 'vc-dired-switches)
1708 (set (make-local-variable 'dired-actual-switches)
1710 (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display)
1711 (setq vc-dired-mode t))
1713 (define-key vc-dired-mode-map "\C-xv" vc-prefix-map)
1714 (define-key vc-dired-mode-map "v" vc-prefix-map)
1716 (defun vc-dired-toggle-terse-mode ()
1717 "Toggle terse display in VC Dired."
1719 (if (not vc-dired-mode)
1721 (setq vc-dired-terse-mode (not vc-dired-terse-mode))
1722 (if vc-dired-terse-mode
1726 (define-key vc-dired-mode-map "vt" 'vc-dired-toggle-terse-mode)
1728 (defun vc-dired-mark-locked ()
1729 "Mark all files currently locked."
1731 (dired-mark-if (let ((f (dired-get-filename nil t)))
1733 (not (file-directory-p f))
1734 (vc-locking-user f)))
1737 (define-key vc-dired-mode-map "*l" 'vc-dired-mark-locked)
1739 (defun vc-fetch-cvs-status (dir)
1740 (let ((default-directory dir))
1741 ;; Don't specify DIR in this command, the default-directory is
1742 ;; enough. Otherwise it might fail with remote repositories.
1743 (vc-do-command "*vc-info*" 0 "cvs" nil nil "status" "-l")
1745 (set-buffer (get-buffer "*vc-info*"))
1746 (goto-char (point-min))
1747 (while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t)
1748 (narrow-to-region (match-beginning 0) (match-end 0))
1749 (vc-parse-cvs-status)
1750 (goto-char (point-max))
1753 (defun vc-dired-state-info (file)
1754 ;; Return the string that indicates the version control status
1755 ;; on a VC dired line.
1756 (let* ((cvs-state (and (eq (vc-backend file) 'CVS)
1757 (vc-cvs-status file)))
1760 (cond ((eq cvs-state 'up-to-date) nil)
1761 ((eq cvs-state 'needs-checkout) "patch")
1762 ((eq cvs-state 'locally-modified) "modified")
1763 ((eq cvs-state 'needs-merge) "merge")
1764 ((eq cvs-state 'unresolved-conflict) "conflict")
1765 ((eq cvs-state 'locally-added) "added"))
1766 (vc-locking-user file))))
1767 (if state (concat "(" state ")"))))
1769 (defun vc-dired-reformat-line (x)
1770 ;; Reformat a directory-listing line, replacing various columns with
1771 ;; version control information.
1772 ;; This code, like dired, assumes UNIX -l format.
1774 (let ((pos (point)) limit perm date-and-file)
1776 (setq limit (point))
1780 (re-search-forward ;; owner and group
1781 "^\\(..[drwxlts-]+ \\) *[0-9]+ [^ ]+ +[^ ]+ +[0-9]+\\( .*\\)"
1783 (re-search-forward ;; only owner displayed
1784 "^\\(..[drwxlts-]+ \\) *[0-9]+ [^ ]+ +[0-9]+\\( .*\\)"
1786 (re-search-forward ;; OS/2 -l format, no links, owner, group
1787 "^\\(..[drwxlts-]+ \\) *[0-9]+\\( .*\\)"
1789 (setq perm (match-string 1)
1790 date-and-file (match-string 2))
1791 (setq x (substring (concat x " ") 0 10))
1792 (replace-match (concat perm x date-and-file)))))
1794 (defun vc-dired-hook ()
1795 ;; Called by dired after any portion of a vc-dired buffer has been read in.
1796 ;; Reformat the listing according to version control.
1797 (message "Getting version information... ")
1798 (let (subdir filename (buffer-read-only nil) cvs-dir)
1799 (goto-char (point-min))
1800 (while (not (eq (point) (point-max)))
1802 ;; subdir header line
1803 ((setq subdir (dired-get-subdir))
1804 (if (file-directory-p (concat subdir "/CVS"))
1806 (vc-fetch-cvs-status (file-name-as-directory subdir))
1810 ;; erase (but don't remove) the "total" line
1811 (let ((start (point)))
1813 (delete-region start (point))
1817 ((setq filename (dired-get-filename nil t))
1820 ((file-directory-p filename)
1822 ((member (file-name-nondirectory filename)
1823 vc-directory-exclusion-list)
1824 (let ((pos (point)))
1825 (dired-kill-tree filename)
1828 (vc-dired-terse-mode
1829 ;; Don't show directories in terse mode. Don't use
1830 ;; dired-kill-line to remove it, because in recursive listings,
1831 ;; that would remove the directory contents as well.
1832 (delete-region (progn (beginning-of-line) (point))
1833 (progn (forward-line 1) (point))))
1834 ((string-match "\\`\\.\\.?\\'" (file-name-nondirectory filename))
1837 (vc-dired-reformat-line nil)
1841 (and (eq (vc-file-getprop filename 'vc-backend) 'CVS)
1842 (or (not vc-dired-terse-mode)
1843 (not (eq (vc-cvs-status filename) 'up-to-date))))
1844 (and (vc-backend filename)
1845 (or (not vc-dired-terse-mode)
1846 (vc-locking-user filename))))
1847 (vc-dired-reformat-line (vc-dired-state-info filename))
1850 (dired-kill-line))))
1852 (t (forward-line 1))))
1854 (message "Getting version information... done")
1857 (cond ((eq (count-lines (point-min) (point-max)) 1)
1858 (goto-char (point-min))
1859 (message "No files locked under %s" default-directory)))))
1861 (defun vc-dired-purge ()
1862 ;; Remove empty subdirs
1864 (goto-char (point-min))
1865 (while (setq subdir (dired-get-subdir))
1867 (if (dired-get-filename nil t)
1868 (if (not (dired-next-subdir 1 t))
1869 (goto-char (point-max)))
1871 (if (not (string= (dired-current-directory) default-directory))
1872 (dired-do-kill-lines t "")
1873 ;; We cannot remove the top level directory.
1874 ;; Just make it look a little nicer.
1877 (if (not (dired-next-subdir 1 t))
1878 (goto-char (point-max))))))
1879 (goto-char (point-min))))
1882 (defun vc-directory (dirname read-switches)
1883 (interactive "DDired under VC (directory): \nP")
1884 (let ((vc-dired-switches (concat dired-listing-switches
1885 (if vc-dired-recurse "R" ""))))
1887 (setq vc-dired-switches
1888 (read-string "Dired listing switches: "
1889 vc-dired-switches)))
1891 (require 'dired-aux)
1892 ;; force a trailing slash
1893 (if (not (eq (elt dirname (1- (length dirname))) ?/))
1894 (setq dirname (concat dirname "/")))
1896 (dired-internal-noselect (expand-file-name dirname)
1897 (or vc-dired-switches dired-listing-switches)
1900 ;; Named-configuration support for SCCS
1902 (defun vc-add-triple (name file rev)
1904 (find-file (expand-file-name
1906 (file-name-directory (vc-name file))))
1907 (goto-char (point-max))
1908 (insert name "\t:\t" file "\t" rev "\n")
1910 (kill-buffer (current-buffer))
1913 (defun vc-record-rename (file newname)
1918 (file-name-directory (vc-name file))))
1919 (goto-char (point-min))
1920 ;; (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname))
1921 (while (re-search-forward (concat ":" (regexp-quote file) "$") nil t)
1922 (replace-match (concat ":" newname) nil nil))
1924 (kill-buffer (current-buffer))
1927 (defun vc-lookup-triple (file name)
1928 ;; Return the numeric version corresponding to a named snapshot of file
1929 ;; If name is nil or a version number string it's just passed through
1930 (cond ((null name) name)
1931 ((let ((firstchar (aref name 0)))
1932 (and (>= firstchar ?0) (<= firstchar ?9)))
1936 (set-buffer (get-buffer-create "*vc-info*"))
1940 (file-name-directory (vc-name file))))
1942 (car (vc-parse-buffer
1943 (list (list (concat name "\t:\t" file "\t\\(.+\\)") 1))))
1944 (kill-buffer "*vc-info*"))))
1947 ;; Named-configuration entry points
1949 (defun vc-snapshot-precondition ()
1950 ;; Scan the tree below the current directory.
1951 ;; If any files are locked, return the name of the first such file.
1952 ;; (This means, neither snapshot creation nor retrieval is allowed.)
1953 ;; If one or more of the files are currently visited, return `visited'.
1954 ;; Otherwise, return nil.
1956 (catch 'vc-locked-example
1959 (function (lambda (f)
1960 (and (vc-registered f)
1961 (if (vc-locking-user f) (throw 'vc-locked-example f)
1962 (if (get-file-buffer f) (setq status 'visited)))))))
1966 (defun vc-create-snapshot (name)
1967 "Make a snapshot called NAME.
1968 The snapshot is made from all registered files at or below the current
1969 directory. For each file, the version level of its latest
1970 version becomes part of the named configuration."
1971 (interactive "sNew snapshot name: ")
1972 (let ((result (vc-snapshot-precondition)))
1973 (if (stringp result)
1974 (error "File %s is locked" result)
1977 (function (lambda (f) (and
1979 (vc-backend-assign-name f name)))))
1983 (defun vc-retrieve-snapshot (name)
1984 "Retrieve the snapshot called NAME, or latest versions if NAME is empty.
1985 When retrieving a snapshot, there must not be any locked files at or below
1986 the current directory. If none are locked, all registered files are
1987 checked out (unlocked) at their version levels in the snapshot NAME.
1988 If NAME is the empty string, all registered files that are not currently
1989 locked are updated to the latest versions."
1990 (interactive "sSnapshot name to retrieve (default latest versions): ")
1991 (let ((update (yes-or-no-p "Update any affected buffers? ")))
1992 (if (string= name "")
1996 (function (lambda (f) (and
1998 (not (vc-locking-user f))
2000 (vc-backend-checkout f nil "")
2001 (if update (vc-resynch-buffer f t t))))))))
2002 (let ((result (vc-snapshot-precondition)))
2003 (if (stringp result)
2004 (error "File %s is locked" result)
2005 (setq update (and (eq result 'visited) update))
2008 (function (lambda (f) (and
2011 (vc-backend-checkout f nil name)
2012 (if update (vc-resynch-buffer f t t)))))))
2015 ;; Miscellaneous other entry points
2018 (defun vc-print-log ()
2019 "List the change log of the current buffer in a window."
2021 (vc-ensure-vc-buffer)
2022 (let ((file buffer-file-name))
2023 (vc-backend-print-log file)
2024 (pop-to-buffer (get-buffer-create "*vc*"))
2025 (setq default-directory (file-name-directory file))
2026 (goto-char (point-max)) (forward-line -1)
2027 (while (looking-at "=*\n")
2028 (delete-char (- (match-end 0) (match-beginning 0)))
2030 (goto-char (point-min))
2031 (if (looking-at "[\b\t\n\v\f\r ]+")
2032 (delete-char (- (match-end 0) (match-beginning 0))))
2033 (shrink-window-if-larger-than-buffer)
2034 ;; move point to the log entry for the current version
2035 (and (not (eq (vc-backend file) 'SCCS))
2037 ;; also match some context, for safety
2038 (concat "----\nrevision " (vc-workfile-version file)
2039 "\\(\tlocked by:.*\n\\|\n\\)date: ") nil t)
2040 ;; set the display window so that
2041 ;; the whole log entry is displayed
2042 (let (start end lines)
2043 (beginning-of-line) (forward-line -1) (setq start (point))
2044 (if (not (re-search-forward "^----*\nrevision" nil t))
2045 (setq end (point-max))
2046 (beginning-of-line) (forward-line -1) (setq end (point)))
2047 (setq lines (count-lines start end))
2049 ;; if the global information and this log entry fit
2050 ;; into the window, display from the beginning
2051 ((< (count-lines (point-min) end) (window-height))
2052 (goto-char (point-min))
2055 ;; if the whole entry fits into the window,
2056 ;; display it centered
2057 ((< (1+ lines) (window-height))
2059 (recenter (1- (- (/ (window-height) 2) (/ lines 2)))))
2060 ;; otherwise (the entry is too large for the window),
2061 ;; display from the start
2067 (defun vc-revert-buffer ()
2068 "Revert the current buffer's file back to the version it was based on.
2069 This asks for confirmation if the buffer contents are not identical
2070 to that version. Note that for RCS and CVS, this function does not
2071 automatically pick up newer changes found in the master file;
2072 use C-u \\[vc-next-action] RET to do so."
2074 (vc-ensure-vc-buffer)
2075 (let ((file buffer-file-name)
2076 ;; This operation should always ask for confirmation.
2077 (vc-suppress-confirm nil)
2078 (obuf (current-buffer)) (changed (vc-diff nil t)))
2081 (if (not (yes-or-no-p "Discard changes? "))
2082 (error "Revert cancelled"))
2083 (if (and (window-dedicated-p (selected-window))
2084 (one-window-p t 'selected-frame))
2085 (make-frame-invisible (selected-frame))
2088 (vc-backend-revert file)
2089 (vc-resynch-window file t t)))
2092 (defun vc-cancel-version (norevert)
2093 "Get rid of most recently checked in version of this file.
2094 A prefix argument means do not revert the buffer afterwards."
2096 (vc-ensure-vc-buffer)
2098 ((eq (vc-backend (buffer-file-name)) 'CVS)
2099 (error "Unchecking files under CVS is dangerous and not supported in VC"))
2100 ((vc-locking-user (buffer-file-name))
2101 (error "This version is locked; use vc-revert-buffer to discard changes"))
2102 ((not (vc-latest-on-branch-p (buffer-file-name)))
2103 (error "This is not the latest version--VC cannot cancel it")))
2104 (let* ((target (vc-workfile-version (buffer-file-name)))
2105 (recent (if (vc-trunk-p target) "" (vc-branch-part target)))
2106 (config (current-window-configuration)) done)
2107 (if (null (yes-or-no-p (format "Remove version %s from master? " target)))
2109 (setq norevert (or norevert (not
2110 (yes-or-no-p "Revert buffer to most recent remaining version? "))))
2111 (vc-backend-uncheck (buffer-file-name) target)
2112 ;; Check out the most recent remaining version. If it fails, because
2113 ;; the whole branch got deleted, do a double-take and check out the
2114 ;; version where the branch started.
2119 ;; Check out locked, but only to disc, and keep
2120 ;; modifications in the buffer.
2121 (vc-backend-checkout (buffer-file-name) t recent)
2122 ;; Check out unlocked, and revert buffer.
2123 (vc-checkout (buffer-file-name) nil recent))
2125 ;; If the checkout fails, vc-do-command signals an error.
2126 ;; We catch this error, check the reason, correct the
2127 ;; version number, and try a second time.
2128 (error (set-buffer "*vc*")
2129 (goto-char (point-min))
2130 (if (search-forward "no side branches present for" nil t)
2131 (progn (setq recent (vc-branch-part recent))
2132 ;; vc-do-command popped up a window with
2133 ;; the error message. Get rid of it, by
2134 ;; restoring the old window configuration.
2135 (set-window-configuration config))
2136 ;; No, it was some other error: re-signal it.
2137 (signal (car err) (cdr err))))))
2138 ;; If norevert, clear version headers and mark the buffer modified.
2141 (set-visited-file-name (buffer-file-name))
2142 (if (not vc-make-backup-files)
2143 ;; inhibit backup for this buffer
2144 (progn (make-local-variable 'backup-inhibited)
2145 (setq backup-inhibited t)))
2146 (if (eq (vc-backend (buffer-file-name)) 'RCS)
2147 (progn (setq buffer-read-only nil)
2148 (vc-clear-headers)))
2149 (vc-mode-line (buffer-file-name))))
2150 (message "Version %s has been removed from the master" target)
2154 (defun vc-rename-file (old new)
2155 "Rename file OLD to NEW, and rename its master file likewise."
2156 (interactive "fVC rename file: \nFRename to: ")
2157 ;; There are several ways of renaming files under CVS 1.3, but they all
2158 ;; have serious disadvantages. See the FAQ (available from think.com in
2159 ;; pub/cvs/). I'd rather send the user an error, than do something he might
2160 ;; consider to be wrong. When the famous, long-awaited rename database is
2161 ;; implemented things might change for the better. This is unlikely to occur
2162 ;; until CVS 2.0 is released. --ceder 1994-01-23 21:27:51
2163 (if (eq (vc-backend old) 'CVS)
2164 (error "Renaming files under CVS is dangerous and not supported in VC"))
2165 (let ((oldbuf (get-file-buffer old)))
2166 (if (and oldbuf (buffer-modified-p oldbuf))
2167 (error "Please save files before moving them"))
2168 (if (get-file-buffer new)
2169 (error "Already editing new file name"))
2170 (if (file-exists-p new)
2171 (error "New file already exists"))
2172 (let ((oldmaster (vc-name old)) newmaster)
2175 (if (vc-locking-user old)
2176 (error "Please check in files before moving them"))
2177 (if (or (file-symlink-p oldmaster)
2178 ;; This had FILE, I changed it to OLD. -- rms.
2179 (file-symlink-p (vc-backend-subdirectory-name old)))
2180 (error "This is not a safe thing to do in the presence of symbolic links"))
2182 (let ((backend (vc-backend old))
2183 (newdir (or (file-name-directory new) ""))
2184 (newbase (file-name-nondirectory new)))
2189 (if (eq backend (cdr s))
2190 (let* ((newmaster (format (car s) newdir newbase))
2191 (newmasterdir (file-name-directory newmaster)))
2192 (if (or (not newmasterdir)
2193 (file-directory-p newmasterdir))
2194 (throw 'found newmaster))))))
2195 vc-master-templates)
2196 (error "New file lacks a version control directory"))))
2197 ;; Handle the SCCS PROJECTDIR feature. It is odd that this
2198 ;; is a special case, but a more elegant solution would require
2199 ;; significant changes in other parts of VC.
2200 (if (eq (vc-backend old) 'SCCS)
2201 (let ((project-dir (vc-sccs-project-dir)))
2205 (file-name-nondirectory newmaster))))))
2206 (rename-file oldmaster newmaster)))
2207 (if (or (not oldmaster) (file-exists-p old))
2208 (rename-file old new)))
2209 ; ?? Renaming a file might change its contents due to keyword expansion.
2210 ; We should really check out a new copy if the old copy was precisely equal
2211 ; to some checked in version. However, testing for this is tricky....
2215 (let ((buffer-read-only buffer-read-only))
2216 (set-visited-file-name new))
2219 (set-buffer-modified-p nil))))
2220 ;; This had FILE, I changed it to OLD. -- rms.
2221 (vc-backend-dispatch old
2222 (vc-record-rename old new) ;SCCS
2229 (defun vc-update-change-log (&rest args)
2230 "Find change log file and add entries from recent RCS/CVS logs.
2231 Normally, find log entries for all registered files in the default
2232 directory using `rcs2log', which finds CVS logs preferentially.
2233 The mark is left at the end of the text prepended to the change log.
2235 With prefix arg of C-u, only find log entries for the current buffer's file.
2237 With any numeric prefix arg, find log entries for all currently visited
2238 files that are under version control. This puts all the entries in the
2239 log for the default directory, which may not be appropriate.
2241 From a program, any arguments are assumed to be filenames and are
2242 passed to the `rcs2log' script after massaging to be relative to the
2245 (cond ((consp current-prefix-arg) ;C-u
2246 (list buffer-file-name))
2247 (current-prefix-arg ;Numeric argument.
2249 (buffers (buffer-list))
2252 (setq file (buffer-file-name (car buffers)))
2253 (and file (vc-backend file)
2254 (setq files (cons file files)))
2255 (setq buffers (cdr buffers)))
2258 ;; `rcs2log' will find the relevant RCS or CVS files
2259 ;; relative to the curent directory if none supplied.
2261 (let ((odefault default-directory)
2262 (changelog (find-change-log))
2263 ;; Presumably not portable to non-Unixy systems, along with rcs2log:
2264 (tempfile (make-temp-name
2265 (expand-file-name "vc" temporary-file-directory)))
2266 (full-name (or add-log-full-name
2269 (format "uid%d" (number-to-string (user-uid)))))
2270 (mailing-address (or add-log-mailing-address
2271 user-mail-address)))
2272 (find-file-other-window changelog)
2273 (barf-if-buffer-read-only)
2276 (goto-char (point-min))
2278 (message "Computing change log entries...")
2279 (message "Computing change log entries... %s"
2283 (if (eq 0 (apply 'call-process "rcs2log" nil
2284 (list t tempfile) nil
2286 "-u" (concat (vc-user-login-name)
2288 "\t" mailing-address)
2293 (if (file-name-absolute-p f)
2295 (concat odefault f)))))
2299 (set-buffer (get-buffer-create "*vc*")))
2301 (insert-file tempfile)
2303 (cd (file-name-directory changelog))
2304 (delete-file tempfile)))))
2306 ;; vc-annotate functionality (CVS only).
2307 (defvar vc-annotate-mode-map nil
2308 "Local keymap used for VC-Annotate mode.")
2310 (defvar vc-annotate-mode-menu nil
2311 "Local keymap used for VC-Annotate mode's menu bar menu.")
2314 (defvar vc-annotate-mode-syntax-table nil
2315 "Syntax table used in VC-Annotate mode buffers.")
2317 ;; Declare globally instead of additional parameter to
2318 ;; temp-buffer-show-function (not possible to pass more than one
2320 (defvar vc-annotate-ratio nil)
2322 (defun vc-annotate-mode-variables ()
2323 (if (not vc-annotate-mode-syntax-table)
2324 (progn (setq vc-annotate-mode-syntax-table (make-syntax-table))
2325 (set-syntax-table vc-annotate-mode-syntax-table)))
2326 (if (not vc-annotate-mode-map)
2327 (setq vc-annotate-mode-map (make-sparse-keymap)))
2328 (setq vc-annotate-mode-menu (make-sparse-keymap "Annotate"))
2329 (define-key vc-annotate-mode-map [menu-bar]
2330 (make-sparse-keymap "VC-Annotate"))
2331 (define-key vc-annotate-mode-map [menu-bar vc-annotate-mode]
2332 (cons "VC-Annotate" vc-annotate-mode-menu)))
2334 (defun vc-annotate-mode ()
2335 "Major mode for buffers displaying output from the CVS `annotate' command.
2337 You can use the mode-specific menu to alter the time-span of the used
2338 colors. See variable `vc-annotate-menu-elements' for customizing the
2341 (kill-all-local-variables) ; Recommended by RMS.
2342 (vc-annotate-mode-variables) ; This defines various variables.
2343 (use-local-map vc-annotate-mode-map) ; This provides the local keymap.
2344 (set-syntax-table vc-annotate-mode-syntax-table)
2345 (setq major-mode 'vc-annotate-mode) ; This is how `describe-mode'
2346 ; finds out what to describe.
2347 (setq mode-name "Annotate") ; This goes into the mode line.
2348 (run-hooks 'vc-annotate-mode-hook)
2349 (vc-annotate-add-menu))
2351 (defun vc-annotate-display-default (&optional event)
2352 "Use the default color spectrum for VC Annotate mode."
2354 (message "Redisplaying annotation...")
2355 (vc-annotate-display (get-buffer (buffer-name)))
2356 (message "Redisplaying annotation...done"))
2358 (defun vc-annotate-add-menu ()
2359 "Adds the menu 'Annotate' to the menu bar in VC-Annotate mode."
2360 (define-key vc-annotate-mode-menu [default]
2361 '("Default" . vc-annotate-display-default))
2362 (let ((menu-elements vc-annotate-menu-elements))
2363 (while menu-elements
2364 (let* ((element (car menu-elements))
2365 (days (round (* element
2366 (vc-annotate-car-last-cons vc-annotate-color-map)
2368 (setq menu-elements (cdr menu-elements))
2369 (define-key vc-annotate-mode-menu
2371 (cons (format "Span %d days"
2374 ,(format "Use colors spanning %d days" days)
2376 (message "Redisplaying annotation...")
2377 (vc-annotate-display
2378 (get-buffer (buffer-name))
2379 (vc-annotate-time-span vc-annotate-color-map ,element))
2380 (message "Redisplaying annotation...done"))))))))
2383 (defun vc-annotate (ratio)
2384 "Display the result of the CVS `annotate' command using colors.
2385 New lines are displayed in red, old in blue.
2386 A prefix argument specifies a factor for stretching the time scale.
2388 `vc-annotate-menu-elements' customizes the menu elements of the
2389 mode-specific menu. `vc-annotate-color-map' and
2390 `vc-annotate-very-old-color' defines the mapping of time to
2391 colors. `vc-annotate-background' specifies the background color."
2393 (vc-ensure-vc-buffer)
2394 (if (not (eq (vc-backend (buffer-file-name)) 'CVS))
2395 (error "Sorry, vc-annotate is only implemented for CVS"))
2396 (message "Annotating...")
2397 (let ((temp-buffer-name (concat "*cvs annotate " (buffer-name) "*"))
2398 (temp-buffer-show-function 'vc-annotate-display)
2399 (vc-annotate-ratio ratio))
2400 (with-output-to-temp-buffer temp-buffer-name
2401 (call-process "cvs" nil (get-buffer temp-buffer-name) nil
2402 "annotate" (file-name-nondirectory (buffer-file-name)))))
2403 (message "Annotating... done"))
2405 (defun vc-annotate-car-last-cons (a-list)
2406 "Return car of last cons in association list A-LIST."
2407 (if (not (eq nil (cdr a-list)))
2408 (vc-annotate-car-last-cons (cdr a-list))
2409 (car (car a-list))))
2411 (defun vc-annotate-time-span (a-list span &optional quantize)
2412 "Return an association list with factor SPAN applied to the time-span
2413 of association list A-LIST. Optionaly quantize to the factor of
2415 ;; Apply span to each car of every cons
2416 (if (not (eq nil a-list))
2417 (append (list (cons (* (car (car a-list)) span)
2418 (cdr (car a-list))))
2419 (vc-annotate-time-span (nthcdr (cond (quantize) ; optional
2420 (1)) ; Default to cdr
2421 a-list) span quantize))))
2423 (defun vc-annotate-compcar (threshold a-list)
2424 "Test successive cons cells of association list A-LIST against
2425 THRESHOLD. Return the first cons cell which car is not less than
2426 THRESHOLD, nil otherwise"
2428 (tmp-cons (car a-list)))
2429 (while (and tmp-cons (< (car tmp-cons) threshold))
2430 (setq tmp-cons (car (nthcdr i a-list)))
2432 tmp-cons)) ; Return the appropriate value
2435 (defun vc-annotate-display (buffer &optional color-map)
2436 "Do the VC-Annotate display in BUFFER using COLOR-MAP."
2438 ;; Handle the case of the global variable vc-annotate-ratio being
2439 ;; set. This variable is used to pass information from function
2440 ;; vc-annotate since it is not possible to use another parameter
2441 ;; (see temp-buffer-show-function).
2442 (if (and (not color-map) vc-annotate-ratio)
2443 ;; This will only be true if called from vc-annotate with ratio
2445 (setq color-map (vc-annotate-time-span vc-annotate-color-map
2446 vc-annotate-ratio)))
2448 ;; We need a list of months and their corresponding numbers.
2449 (let* ((local-month-numbers
2450 '(("Jan" . 1) ("Feb" . 2) ("Mar" . 3) ("Apr" . 4)
2451 ("May" . 5) ("Jun" . 6) ("Jul" . 7) ("Aug" . 8)
2452 ("Sep" . 9) ("Oct" . 10) ("Nov" . 11) ("Dec" . 12))))
2454 (display-buffer buffer)
2455 (or (eq major-mode 'vc-annotate-mode) ; Turn on vc-annotate-mode if not done
2457 ;; Delete old overlays
2460 (if (overlay-get overlay 'vc-annotation)
2461 (delete-overlay overlay)))
2462 (overlays-in (point-min) (point-max)))
2463 (goto-char (point-min)) ; Position at the top of the buffer.
2464 (while (re-search-forward
2465 "^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): "
2466 ;; "^[0-9]+\\(\.[0-9]+\\)*\\s-+(\\sw+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): "
2469 (let* (;; Unfortunately, order is important. match-string will
2470 ;; be corrupted by extent functions in XEmacs. Access
2471 ;; string-matches first.
2472 (day (string-to-number (match-string 1)))
2473 (month (cdr (assoc (match-string 2) local-month-numbers)))
2474 (year-tmp (string-to-number (match-string 3)))
2475 (year (+ (if (> 100 year-tmp) 1900 0) year-tmp)) ; Possible millenium problem
2476 (high (- (car (current-time))
2477 (car (encode-time 0 0 0 day month year))))
2478 (color (cond ((vc-annotate-compcar high (cond (color-map)
2479 (vc-annotate-color-map))))
2480 ((cons nil vc-annotate-very-old-color))))
2481 ;; substring from index 1 to remove any leading `#' in the name
2482 (face-name (concat "vc-annotate-face-" (substring (cdr color) 1)))
2483 ;; Make the face if not done.
2484 (face (cond ((intern-soft face-name))
2485 ((let ((tmp-face (make-face (intern face-name))))
2486 (set-face-foreground tmp-face (cdr color))
2487 (if vc-annotate-background
2488 (set-face-background tmp-face vc-annotate-background))
2489 tmp-face)))) ; Return the face
2494 (setq overlay (make-overlay point (point)))
2495 (overlay-put overlay 'face face)
2496 (overlay-put overlay 'vc-annotation t)))))
2499 ;; Collect back-end-dependent stuff here
2501 (defun vc-backend-admin (file &optional rev comment)
2502 ;; Register a file into the version-control system
2503 ;; Automatically retrieves a read-only version of the file with
2504 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
2505 ;; it deletes the workfile.
2506 (vc-file-clearprops file)
2507 (or vc-default-back-end
2508 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS)))
2509 (message "Registering %s..." file)
2511 (if (stringp vc-register-switches)
2512 (list vc-register-switches)
2513 vc-register-switches))
2517 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end)
2518 ((file-exists-p "RCS") 'RCS)
2519 ((file-exists-p "CVS") 'CVS)
2520 ((file-exists-p "SCCS") 'SCCS)
2521 ((setq project-dir (vc-sccs-project-dir)) 'SCCS)
2522 (t vc-default-back-end))))
2523 (cond ((eq backend 'SCCS)
2525 (if project-dir (concat project-dir
2526 "s." (file-name-nondirectory file))
2528 (car (rassq 'SCCS vc-master-templates))
2529 (or (file-name-directory file) "")
2530 (file-name-nondirectory file)))))
2531 (apply 'vc-do-command nil 0 "admin" nil nil ;; SCCS
2532 (and rev (concat "-r" rev))
2535 (and comment (concat "-y" comment))
2539 (if vc-keep-workfiles
2540 (vc-do-command nil 0 "get" file 'MASTER)))
2542 (apply 'vc-do-command nil 0 "ci" file 'WORKFILE ;; RCS
2543 ;; if available, use the secure registering option
2544 (and (vc-backend-release-p 'RCS "5.6.4") "-i")
2545 (concat (if vc-keep-workfiles "-u" "-r") rev)
2546 (and comment (concat "-t-" comment))
2549 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE ;; CVS
2551 (and comment (string-match "[^\t\n ]" comment)
2552 (concat "-m" comment))
2555 (message "Registering %s...done" file)
2558 (defun vc-backend-checkout (file &optional writable rev workfile)
2559 ;; Retrieve a copy of a saved version into a workfile
2560 (let ((filename (or workfile file))
2561 (file-buffer (get-file-buffer file))
2563 (message "Checking out %s..." filename)
2565 ;; Change buffers to get local value of vc-checkout-switches.
2566 (if file-buffer (set-buffer file-buffer))
2567 (setq switches (if (stringp vc-checkout-switches)
2568 (list vc-checkout-switches)
2569 vc-checkout-switches))
2570 ;; Save this buffer's default-directory
2571 ;; and use save-excursion to make sure it is restored
2572 ;; in the same buffer it was saved in.
2573 (let ((default-directory default-directory))
2575 ;; Adjust the default-directory so that the check-out creates
2576 ;; the file in the right place.
2577 (setq default-directory (file-name-directory filename))
2578 (vc-backend-dispatch file
2580 (and rev (string= rev "") (setq rev nil))
2582 ;; Some SCCS implementations allow checking out directly to a
2583 ;; file using the -G option, but then some don't so use the
2584 ;; least common denominator approach and use the -p option
2586 (let ((vc-modes (logior (file-modes (vc-name file))
2587 (if writable 128 0)))
2591 (apply 'vc-do-command
2592 nil 0 "/bin/sh" file 'MASTER "-c"
2593 ;; Some shells make the "" dummy argument into $0
2594 ;; while others use the shell's name as $0 and
2595 ;; use the "" as $1. The if-statement
2596 ;; converts the latter case to the former.
2597 (format "if [ x\"$1\" = x ]; then shift; fi; \
2598 umask %o; exec >\"$1\" || exit; \
2599 shift; umask %o; exec get \"$@\""
2600 (logand 511 (lognot vc-modes))
2601 (logand 511 (lognot (default-file-modes))))
2602 "" ; dummy argument for shell's $0
2607 (concat "-r" (vc-lookup-triple file rev)))
2610 (and failed (file-exists-p filename)
2611 (delete-file filename))))
2612 (apply 'vc-do-command nil 0 "get" file 'MASTER ;; SCCS
2614 (and rev (concat "-r" (vc-lookup-triple file rev)))
2616 (vc-file-setprop file 'vc-workfile-version nil)))
2618 ;; RCS doesn't let us check out into arbitrary file names directly.
2619 ;; Use `co -p' and make stdout point to the correct file.
2620 (let ((vc-modes (logior (file-modes (vc-name file))
2621 (if writable 128 0)))
2625 (apply 'vc-do-command
2626 nil 0 "/bin/sh" file 'MASTER "-c"
2627 ;; See the SCCS case, above, regarding the
2629 (format "if [ x\"$1\" = x ]; then shift; fi; \
2630 umask %o; exec >\"$1\" || exit; \
2631 shift; umask %o; exec co \"$@\""
2632 (logand 511 (lognot vc-modes))
2633 (logand 511 (lognot (default-file-modes))))
2634 "" ; dummy argument for shell's $0
2640 (and failed (file-exists-p filename) (delete-file filename))))
2642 ;; if we should go to the head of the trunk,
2643 ;; clear the default branch first
2644 (and rev (string= rev "")
2645 (vc-do-command nil 0 "rcs" file 'MASTER "-b"))
2646 ;; now do the checkout
2647 (apply 'vc-do-command
2648 nil 0 "co" file 'MASTER
2649 ;; If locking is not strict, force to overwrite
2650 ;; the writable workfile.
2651 (if (eq (vc-checkout-model file) 'implicit) "-f")
2653 (if rev (concat "-r" rev)
2654 ;; if no explicit revision was specified,
2655 ;; check out that of the working file
2656 (let ((workrev (vc-workfile-version file)))
2657 (if workrev (concat "-r" workrev)
2660 ;; determine the new workfile version
2663 (goto-char (point-min))
2665 (if (re-search-forward "^revision \\([0-9.]+\\).*\n" nil t)
2666 (buffer-substring (match-beginning 1) (match-end 1)))))
2667 (vc-file-setprop file 'vc-workfile-version new-version)
2668 ;; if necessary, adjust the default branch
2669 (and rev (not (string= rev ""))
2670 (vc-do-command nil 0 "rcs" file 'MASTER
2671 (concat "-b" (if (vc-latest-on-branch-p file)
2672 (if (vc-trunk-p new-version) nil
2673 (vc-branch-part new-version))
2676 ;; CVS is much like RCS
2680 (apply 'vc-do-command
2681 nil 0 "/bin/sh" file 'WORKFILE "-c"
2682 "exec >\"$1\" || exit; shift; exec cvs update \"$@\""
2683 "" ; dummy argument for shell's $0
2689 (and failed (file-exists-p filename) (delete-file filename))))
2690 ;; default for verbose checkout: clear the sticky tag
2691 ;; so that the actual update will get the head of the trunk
2692 (and rev (string= rev "")
2693 (vc-do-command nil 0 "cvs" file 'WORKFILE "update" "-A"))
2694 ;; If a revision was specified, check that out.
2696 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE
2697 (and writable (eq (vc-checkout-model file) 'manual) "-w")
2699 (and rev (not (string= rev ""))
2702 ;; If no revision was specified, call "cvs edit" to make
2703 ;; the file writeable.
2704 (and writable (eq (vc-checkout-model file) 'manual)
2705 (vc-do-command nil 0 "cvs" file 'WORKFILE "edit")))
2706 (if rev (vc-file-setprop file 'vc-workfile-version nil))))
2709 (vc-file-clear-masterprops file)
2711 (vc-file-setprop file 'vc-locking-user (vc-user-login-name)))
2712 (vc-file-setprop file
2713 'vc-checkout-time (nth 5 (file-attributes file)))))
2714 (message "Checking out %s...done" filename))))))
2716 (defun vc-backend-logentry-check (file)
2717 (vc-backend-dispatch file
2718 (if (>= (buffer-size) 512) ;; SCCS
2722 "Log must be less than 512 characters; point is now at pos 512")))
2727 (defun vc-backend-checkin (file rev comment)
2728 ;; Register changes to FILE as level REV with explanatory COMMENT.
2729 ;; Automatically retrieves a read-only version of the file with
2730 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
2731 ;; it deletes the workfile.
2732 ;; Adaptation for RCS branch support: if this is an explicit checkin,
2733 ;; or if the checkin creates a new branch, set the master file branch
2735 (message "Checking in %s..." file)
2736 ;; "This log message intentionally left almost blank".
2737 ;; RCS 5.7 gripes about white-space-only comments too.
2738 (or (and comment (string-match "[^\t\n ]" comment))
2739 (setq comment "*** empty log message ***"))
2741 ;; Change buffers to get local value of vc-checkin-switches.
2742 (set-buffer (or (get-file-buffer file) (current-buffer)))
2744 (if (stringp vc-checkin-switches)
2745 (list vc-checkin-switches)
2746 vc-checkin-switches)))
2747 ;; Clear the master-properties. Do that here, not at the
2748 ;; end, because if the check-in fails we want them to get
2749 ;; re-computed before the next try.
2750 (vc-file-clear-masterprops file)
2751 (vc-backend-dispatch file
2754 (apply 'vc-do-command nil 0 "delta" file 'MASTER
2755 (if rev (concat "-r" rev))
2756 (concat "-y" comment)
2758 (vc-file-setprop file 'vc-locking-user 'none)
2759 (vc-file-setprop file 'vc-workfile-version nil)
2760 (if vc-keep-workfiles
2761 (vc-do-command nil 0 "get" file 'MASTER))
2764 (let ((old-version (vc-workfile-version file)) new-version)
2765 (apply 'vc-do-command nil 0 "ci" file 'MASTER
2766 ;; if available, use the secure check-in option
2767 (and (vc-backend-release-p 'RCS "5.6.4") "-j")
2768 (concat (if vc-keep-workfiles "-u" "-r") rev)
2769 (concat "-m" comment)
2771 (vc-file-setprop file 'vc-locking-user 'none)
2772 (vc-file-setprop file 'vc-workfile-version nil)
2774 ;; determine the new workfile version
2776 (goto-char (point-min))
2777 (if (or (re-search-forward
2778 "new revision: \\([0-9.]+\\);" nil t)
2780 "reverting to previous revision \\([0-9.]+\\)" nil t))
2781 (progn (setq new-version (buffer-substring (match-beginning 1)
2783 (vc-file-setprop file 'vc-workfile-version new-version)))
2785 ;; if we got to a different branch, adjust the default
2786 ;; branch accordingly
2788 ((and old-version new-version
2789 (not (string= (vc-branch-part old-version)
2790 (vc-branch-part new-version))))
2791 (vc-do-command nil 0 "rcs" file 'MASTER
2792 (if (vc-trunk-p new-version) "-b"
2793 (concat "-b" (vc-branch-part new-version))))
2794 ;; If this is an old RCS release, we might have
2795 ;; to remove a remaining lock.
2796 (if (not (vc-backend-release-p 'RCS "5.6.2"))
2797 ;; exit status of 1 is also accepted.
2798 ;; It means that the lock was removed before.
2799 (vc-do-command nil 1 "rcs" file 'MASTER
2800 (concat "-u" old-version))))))
2803 ;; explicit check-in to the trunk requires a
2804 ;; double check-in (first unexplicit) (CVS-1.3)
2807 (if (and rev (vc-trunk-p rev))
2808 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE
2809 "ci" "-m" "intermediate"
2811 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE
2812 "ci" (if rev (concat "-r" rev))
2813 (concat "-m" comment)
2815 (error (if (eq (vc-cvs-status file) 'needs-merge)
2816 ;; The CVS output will be on top of this message.
2817 (error "Type C-x 0 C-x C-q to merge in changes")
2818 (error "Check-in failed"))))
2819 ;; determine and store the new workfile version
2821 (goto-char (point-min))
2822 (if (re-search-forward
2823 "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" nil t)
2824 (vc-file-setprop file 'vc-workfile-version
2825 (buffer-substring (match-beginning 2)
2827 (vc-file-setprop file 'vc-workfile-version nil))
2828 ;; if this was an explicit check-in, remove the sticky tag
2830 (vc-do-command nil 0 "cvs" file 'WORKFILE "update" "-A"))
2831 ;; Forget the checkout model, because we might have assumed
2832 ;; a wrong one when we found the file. After commit, we can
2833 ;; tell it from the permissions of the file
2834 ;; (see vc-checkout-model).
2835 (vc-file-setprop file 'vc-checkout-model nil)
2836 (vc-file-setprop file 'vc-locking-user 'none)
2837 (vc-file-setprop file 'vc-checkout-time
2838 (nth 5 (file-attributes file)))))))
2839 (message "Checking in %s...done" file))
2841 (defun vc-backend-revert (file)
2842 ;; Revert file to the version it was based on.
2843 (message "Reverting %s..." file)
2844 (vc-file-clear-masterprops file)
2845 (vc-backend-dispatch
2849 (vc-do-command nil 0 "unget" file 'MASTER nil)
2850 (vc-do-command nil 0 "get" file 'MASTER nil)
2851 ;; Checking out explicit versions is not supported under SCCS, yet.
2852 ;; We always "revert" to the latest version; therefore
2853 ;; vc-workfile-version is cleared here so that it gets recomputed.
2854 (vc-file-setprop file 'vc-workfile-version nil))
2856 (vc-do-command nil 0 "co" file 'MASTER
2857 "-f" (concat "-u" (vc-workfile-version file)))
2860 ;; Check out via standard output (caused by the final argument
2861 ;; FILE below), so that no sticky tag is set.
2862 (vc-backend-checkout file nil (vc-workfile-version file) file)
2863 ;; If "cvs edit" was used to make the file writeable,
2864 ;; call "cvs unedit" now to undo that.
2865 (if (eq (vc-checkout-model file) 'manual)
2866 (vc-do-command nil 0 "cvs" file 'WORKFILE "unedit"))))
2867 (vc-file-setprop file 'vc-locking-user 'none)
2868 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file)))
2869 (message "Reverting %s...done" file)
2872 (defun vc-backend-steal (file &optional rev)
2873 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M.
2874 (message "Stealing lock on %s..." file)
2875 (vc-backend-dispatch file
2877 (vc-do-command nil 0 "unget" file 'MASTER "-n" (if rev (concat "-r" rev)))
2878 (vc-do-command nil 0 "get" file 'MASTER "-g" (if rev (concat "-r" rev)))
2880 (vc-do-command nil 0 "rcs" file 'MASTER ;RCS
2881 "-M" (concat "-u" rev) (concat "-l" rev))
2882 (error "You cannot steal a CVS lock; there are no CVS locks to steal") ;CVS
2884 (vc-file-setprop file 'vc-locking-user (vc-user-login-name))
2885 (message "Stealing lock on %s...done" file)
2888 (defun vc-backend-uncheck (file target)
2889 ;; Undo the latest checkin.
2890 (message "Removing last change from %s..." file)
2891 (vc-backend-dispatch file
2892 (vc-do-command nil 0 "rmdel" file 'MASTER (concat "-r" target))
2893 (vc-do-command nil 0 "rcs" file 'MASTER (concat "-o" target))
2894 nil ;; this is never reached under CVS
2896 (message "Removing last change from %s...done" file)
2899 (defun vc-backend-print-log (file)
2900 ;; Get change log associated with FILE.
2901 (vc-backend-dispatch
2903 (vc-do-command nil 0 "prs" file 'MASTER)
2904 (vc-do-command nil 0 "rlog" file 'MASTER)
2905 (vc-do-command nil 0 "cvs" file 'WORKFILE "log")))
2907 (defun vc-backend-assign-name (file name)
2908 ;; Assign to a FILE's latest version a given NAME.
2909 (vc-backend-dispatch file
2910 (vc-add-triple name file (vc-latest-version file)) ;; SCCS
2911 (vc-do-command nil 0 "rcs" file 'MASTER (concat "-n" name ":")) ;; RCS
2912 (vc-do-command nil 0 "cvs" file 'WORKFILE "tag" name) ;; CVS
2916 (defun vc-backend-diff (file &optional oldvers newvers cmp)
2917 ;; Get a difference report between two versions of FILE.
2918 ;; Get only a brief comparison report if CMP, a difference report otherwise.
2919 (let ((backend (vc-backend file)) options status
2920 (diff-switches-list (if (listp diff-switches)
2922 (list diff-switches))))
2925 (setq oldvers (vc-lookup-triple file oldvers))
2926 (setq newvers (vc-lookup-triple file newvers))
2927 (setq options (append (list (and cmp "--brief") "-q"
2928 (and oldvers (concat "-r" oldvers))
2929 (and newvers (concat "-r" newvers)))
2930 (and (not cmp) diff-switches-list)))
2931 (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" file 'MASTER options))
2933 (if (not oldvers) (setq oldvers (vc-workfile-version file)))
2934 ;; If we know that --brief is not supported, don't try it.
2935 (setq cmp (and cmp (not (eq vc-rcsdiff-knows-brief 'no))))
2936 (setq options (append (list (and cmp "--brief") "-q"
2937 (concat "-r" oldvers)
2938 (and newvers (concat "-r" newvers)))
2939 (and (not cmp) diff-switches-list)))
2940 (setq status (apply 'vc-do-command "*vc-diff*" 2
2941 "rcsdiff" file 'WORKFILE options))
2942 ;; If --brief didn't work, do a double-take and remember it
2946 (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE
2947 (if cmp (cdr options) options))
2948 (if cmp (setq vc-rcsdiff-knows-brief 'no)))
2949 ;; If --brief DID work, remember that, too.
2950 (and cmp (not vc-rcsdiff-knows-brief)
2951 (setq vc-rcsdiff-knows-brief 'yes))
2953 ;; CVS is different.
2955 (if (string= (vc-workfile-version file) "0")
2956 ;; This file is added but not yet committed; there is no master file.
2957 (if (or oldvers newvers)
2958 (error "No revisions of %s exist" file)
2959 (if cmp 1 ;; file is added but not committed,
2960 ;; we regard this as "changed".
2961 ;; diff it against /dev/null.
2962 (apply 'vc-do-command
2963 "*vc-diff*" 1 "diff" file 'WORKFILE
2964 (append diff-switches-list '("/dev/null")))))
2965 ;; cmp is not yet implemented -- we always do a full diff.
2966 (apply 'vc-do-command
2967 "*vc-diff*" 1 "cvs" file 'WORKFILE "diff"
2968 (and oldvers (concat "-r" oldvers))
2969 (and newvers (concat "-r" newvers))
2970 diff-switches-list))))))
2972 (defun vc-backend-merge-news (file)
2973 ;; Merge in any new changes made to FILE.
2974 (message "Merging changes into %s..." file)
2976 (vc-backend-dispatch
2978 (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS
2979 (error "vc-backend-merge-news not meaningful for RCS files") ;RCS
2980 (save-excursion ; CVS
2981 (vc-file-clear-masterprops file)
2982 (vc-file-setprop file 'vc-workfile-version nil)
2983 (vc-file-setprop file 'vc-locking-user nil)
2984 (vc-file-setprop file 'vc-checkout-time nil)
2985 (vc-do-command nil 0 "cvs" file 'WORKFILE "update")
2986 ;; Analyze the merge result reported by CVS, and set
2987 ;; file properties accordingly.
2988 (set-buffer (get-buffer "*vc*"))
2989 (goto-char (point-min))
2990 ;; get new workfile version
2991 (if (re-search-forward (concat "^Merging differences between "
2992 "[01234567890.]* and "
2993 "\\([01234567890.]*\\) into")
2995 (vc-file-setprop file 'vc-workfile-version (match-string 1)))
2997 (if (re-search-forward
2998 (concat "^\\(\\([CMU]\\) \\)?"
2999 (regexp-quote (file-name-nondirectory file))
3000 "\\( already contains the differences between \\)?")
3003 ;; Merge successful, we are in sync with repository now
3004 ((or (string= (match-string 2) "U")
3005 (string= (match-string 2) "P")
3006 ;; Special case: file contents in sync with
3007 ;; repository anyhow:
3009 (vc-file-setprop file 'vc-locking-user 'none)
3010 (vc-file-setprop file 'vc-checkout-time
3011 (nth 5 (file-attributes file)))
3012 0) ;; indicate success to the caller
3013 ;; Merge successful, but our own changes are still in the file
3014 ((string= (match-string 2) "M")
3015 (vc-file-setprop file 'vc-locking-user (vc-file-owner file))
3016 (vc-file-setprop file 'vc-checkout-time 0)
3017 0) ;; indicate success to the caller
3018 ;; Conflicts detected!
3019 ((string= (match-string 2) "C")
3020 (vc-file-setprop file 'vc-locking-user (vc-file-owner file))
3021 (vc-file-setprop file 'vc-checkout-time 0)
3022 1) ;; signal the error to the caller
3024 (pop-to-buffer "*vc*")
3025 (error "Couldn't analyze cvs update result"))))
3026 (message "Merging changes into %s...done" file)))
3028 (defun vc-backend-merge (file first-version &optional second-version)
3029 ;; Merge the changes between FIRST-VERSION and SECOND-VERSION into
3030 ;; the current working copy of FILE. It is assumed that FILE is
3031 ;; locked and writable (vc-merge ensures this).
3032 (vc-backend-dispatch file
3034 (error "Sorry, merging is not implemented for SCCS")
3036 (vc-do-command nil 1 "rcsmerge" file 'MASTER
3037 "-kk" ;; ignore keyword conflicts
3038 (concat "-r" first-version)
3039 (if second-version (concat "-r" second-version)))
3042 (vc-do-command nil 0 "cvs" file 'WORKFILE
3044 (concat "-j" first-version)
3045 (concat "-j" second-version))
3047 (set-buffer (get-buffer "*vc*"))
3048 (goto-char (point-min))
3049 (if (re-search-forward "conflicts during merge" nil t)
3054 (defun vc-check-headers ()
3055 "Check if the current file has any headers in it."
3058 (goto-char (point-min))
3059 (vc-backend-dispatch buffer-file-name
3060 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS
3061 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t) ;; RCS
3062 'RCS ;; CVS works like RCS in this regard.
3066 ;; Back-end-dependent stuff ends here.
3068 ;; Set up key bindings for use while editing log messages
3070 (defun vc-log-mode (&optional file)
3071 "Minor mode for driving version-control tools.
3072 These bindings are added to the global keymap when you enter this mode:
3073 \\[vc-next-action] perform next logical version-control operation on current file
3074 \\[vc-register] register current file
3075 \\[vc-toggle-read-only] like next-action, but won't register files
3076 \\[vc-insert-headers] insert version-control headers in current file
3077 \\[vc-print-log] display change history of current file
3078 \\[vc-revert-buffer] revert buffer to latest version
3079 \\[vc-cancel-version] undo latest checkin
3080 \\[vc-diff] show diffs between file versions
3081 \\[vc-version-other-window] visit old version in another window
3082 \\[vc-directory] show all files locked by any user in or below .
3083 \\[vc-annotate] colorful display of the cvs annotate command
3084 \\[vc-update-change-log] add change log entry from recent checkins
3086 While you are entering a change log message for a version, the following
3087 additional bindings will be in effect.
3089 \\[vc-finish-logentry] proceed with check in, ending log message entry
3091 Whenever you do a checkin, your log comment is added to a ring of
3092 saved comments. These can be recalled as follows:
3094 \\[vc-next-comment] replace region with next message in comment ring
3095 \\[vc-previous-comment] replace region with previous message in comment ring
3096 \\[vc-comment-search-reverse] search backward for regexp in the comment ring
3097 \\[vc-comment-search-forward] search backward for regexp in the comment ring
3099 Entry to the change-log submode calls the value of text-mode-hook, then
3100 the value of vc-log-mode-hook.
3102 Global user options:
3103 vc-initial-comment If non-nil, require user to enter a change
3104 comment upon first checkin of the file.
3106 vc-keep-workfiles Non-nil value prevents workfiles from being
3107 deleted when changes are checked in
3109 vc-suppress-confirm Suppresses some confirmation prompts,
3110 notably for reversions.
3112 vc-header-alist Which keywords to insert when adding headers
3113 with \\[vc-insert-headers]. Defaults to
3114 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under
3117 vc-static-header-alist By default, version headers inserted in C files
3118 get stuffed in a static string area so that
3119 ident(RCS/CVS) or what(SCCS) can see them in
3120 the compiled object code. You can override
3121 this by setting this variable to nil, or change
3122 the header template by changing it.
3124 vc-command-messages if non-nil, display run messages from the
3125 actual version-control utilities (this is
3126 intended primarily for people hacking vc
3130 (set-syntax-table text-mode-syntax-table)
3131 (use-local-map vc-log-entry-mode)
3132 (setq local-abbrev-table text-mode-abbrev-table)
3133 (setq major-mode 'vc-log-mode)
3134 (setq mode-name "VC-Log")
3135 (make-local-variable 'vc-log-file)
3136 (setq vc-log-file file)
3137 (make-local-variable 'vc-log-version)
3138 (make-local-variable 'vc-comment-ring-index)
3139 (set-buffer-modified-p nil)
3140 (setq buffer-file-name nil)
3141 (run-hooks 'text-mode-hook 'vc-log-mode-hook)
3144 ;; Initialization code, to be done just once at load-time
3145 (if vc-log-entry-mode
3147 (setq vc-log-entry-mode (make-sparse-keymap))
3148 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment)
3149 (define-key vc-log-entry-mode "\M-p" 'vc-previous-comment)
3150 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse)
3151 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward)
3152 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry)
3155 ;;; These things should probably be generally available
3157 (defun vc-file-tree-walk (dirname func &rest args)
3158 "Walk recursively through DIRNAME.
3159 Invoke FUNC f ARGS on each non-directory file f underneath it."
3160 (vc-file-tree-walk-internal (expand-file-name dirname) func args)
3161 (message "Traversing directory %s...done" dirname))
3163 (defun vc-file-tree-walk-internal (file func args)
3164 (if (not (file-directory-p file))
3165 (apply func file args)
3166 (message "Traversing directory %s..." (abbreviate-file-name file))
3167 (let ((dir (file-name-as-directory file)))
3171 (string-equal f ".")
3172 (string-equal f "..")
3173 (member f vc-directory-exclusion-list)
3174 (let ((dirf (concat dir f)))
3176 (file-symlink-p dirf) ;; Avoid possible loops
3177 (vc-file-tree-walk-internal dirf func args))))))
3178 (directory-files dir)))))
3182 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE
3184 ;;; These may be useful to anyone who has to debug or extend the package.
3185 ;;; (Note that this information corresponds to versions 5.x. Some of it
3186 ;;; might have been invalidated by the additions to support branching
3187 ;;; and RCS keyword lookup. AS, 1995/03/24)
3189 ;;; A fundamental problem in VC is that there are time windows between
3190 ;;; vc-next-action's computations of the file's version-control state and
3191 ;;; the actions that change it. This is a window open to lossage in a
3192 ;;; multi-user environment; someone else could nip in and change the state
3193 ;;; of the master during it.
3195 ;;; The performance problem is that rlog/prs calls are very expensive; we want
3196 ;;; to avoid them as much as possible.
3200 ;;; The performance problem, it turns out, simplifies in practice to the
3201 ;;; problem of making vc-locking-user fast. The two other functions that call
3202 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one
3203 ;;; makes snapshots, the other deletes the calling user's last change in the
3206 ;;; The race condition implies that we have to either (a) lock the master
3207 ;;; during the entire execution of vc-next-action, or (b) detect and
3208 ;;; recover from errors resulting from dispatch on an out-of-date state.
3210 ;;; Alternative (a) appears to be infeasible. The problem is that we can't
3211 ;;; guarantee that the lock will ever be removed. Suppose a user starts a
3212 ;;; checkin, the change message buffer pops up, and the user, having wandered
3213 ;;; off to do something else, simply forgets about it?
3215 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up
3216 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/
3217 ;;; unlocked state and its current owner from its permissions.
3219 ;;; This shortcut will fail if someone has manually changed the workfile's
3220 ;;; permissions; also if developers are munging the workfile in several
3221 ;;; directories, with symlinks to a master (in this latter case, the
3222 ;;; permissions shortcut will fail to detect a lock asserted from another
3225 ;;; Note that these cases correspond exactly to the errors which could happen
3226 ;;; because of a competing checkin/checkout race in between two instances of
3229 ;;; For VC's purposes, a workfile/master pair may have the following states:
3231 ;;; A. Unregistered. There is a workfile, there is no master.
3233 ;;; B. Registered and not locked by anyone.
3235 ;;; C. Locked by calling user and unchanged.
3237 ;;; D. Locked by the calling user and changed.
3239 ;;; E. Locked by someone other than the calling user.
3241 ;;; This makes for 25 states and 20 error conditions. Here's the matrix:
3243 ;;; VC's idea of state
3245 ;;; V Actual state RCS action SCCS action Effect
3247 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin
3248 ;;; B 5 . 6 7 8 co -l get -e checkout
3249 ;;; C 9 10 . 11 12 co -u unget; get revert
3250 ;;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin
3251 ;;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock
3253 ;;; All commands take the master file name as a last argument (not shown).
3255 ;;; In the discussion below, a "self-race" is a pathological situation in
3256 ;;; which VC operations are being attempted simultaneously by two or more
3257 ;;; Emacsen running under the same username.
3259 ;;; The vc-next-action code has the following windows:
3262 ;;; Between the check for existence of a master file and the call to
3263 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may
3264 ;;; never close if the initial-comment feature is on.
3267 ;;; Between the call to vc-workfile-unchanged-p in and the immediately
3268 ;;; following revert (apparent state C).
3271 ;;; Between the call to vc-workfile-unchanged-p in and the following
3272 ;;; checkin (apparent state D). This window may never close.
3275 ;;; Between the unlock and the immediately following checkout during a
3276 ;;; revert operation (apparent state C). Included in window Q.
3279 ;;; Between vc-locking-user and the following checkout (apparent state B).
3282 ;;; Between vc-locking-user and the following revert (apparent state C).
3283 ;;; Includes windows Q and S.
3286 ;;; Between vc-locking-user and the following checkin (apparent state
3287 ;;; D). This window may never be closed if the user fails to complete the
3288 ;;; checkin message. Includes window R.
3291 ;;; Between vc-locking-user and the following steal-lock (apparent
3292 ;;; state E). This window may never close if the user fails to complete
3293 ;;; the steal-lock message. Includes window X.
3296 ;;; Between the unlock and the immediately following re-lock during a
3297 ;;; steal-lock operation (apparent state E). This window may never cloce
3298 ;;; if the user fails to complete the steal-lock message.
3302 ;;; Apparent state A ---
3304 ;;; 1. File looked unregistered but is actually registered and not locked.
3306 ;;; Potential cause: someone else's admin during window P, with
3307 ;;; caller's admin happening before their checkout.
3309 ;;; RCS: Prior to version 5.6.4, ci fails with message
3310 ;;; "no lock set by <user>". From 5.6.4 onwards, VC uses the new
3311 ;;; ci -i option and the message is "<file>,v: already exists".
3312 ;;; SCCS: admin will fail with error (ad19).
3314 ;;; We can let these errors be passed up to the user.
3316 ;;; 2. File looked unregistered but is actually locked by caller, unchanged.
3318 ;;; Potential cause: self-race during window P.
3320 ;;; RCS: Prior to version 5.6.4, reverts the file to the last saved
3321 ;;; version and unlocks it. From 5.6.4 onwards, VC uses the new
3322 ;;; ci -i option, failing with message "<file>,v: already exists".
3323 ;;; SCCS: will fail with error (ad19).
3325 ;;; Either of these consequences is acceptable.
3327 ;;; 3. File looked unregistered but is actually locked by caller, changed.
3329 ;;; Potential cause: self-race during window P.
3331 ;;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as
3332 ;;; a delta with a null change comment (the -t- switch will be
3333 ;;; ignored). From 5.6.4 onwards, VC uses the new ci -i option,
3334 ;;; failing with message "<file>,v: already exists".
3335 ;;; SCCS: will fail with error (ad19).
3337 ;;; 4. File looked unregistered but is locked by someone else.
3339 ;;; Potential cause: someone else's admin during window P, with
3340 ;;; caller's admin happening *after* their checkout.
3342 ;;; RCS: Prior to version 5.6.4, ci fails with a
3343 ;;; "no lock set by <user>" message. From 5.6.4 onwards,
3344 ;;; VC uses the new ci -i option, failing with message
3345 ;;; "<file>,v: already exists".
3346 ;;; SCCS: will fail with error (ad19).
3348 ;;; We can let these errors be passed up to the user.
3350 ;;; Apparent state B ---
3352 ;;; 5. File looked registered and not locked, but is actually unregistered.
3354 ;;; Potential cause: master file got nuked during window P.
3356 ;;; RCS: will fail with "RCS/<file>: No such file or directory"
3357 ;;; SCCS: will fail with error ut4.
3359 ;;; We can let these errors be passed up to the user.
3361 ;;; 6. File looked registered and not locked, but is actually locked by the
3362 ;;; calling user and unchanged.
3364 ;;; Potential cause: self-race during window T.
3366 ;;; RCS: in the same directory as the previous workfile, co -l will fail
3367 ;;; with "co error: writable foo exists; checkout aborted". In any other
3368 ;;; directory, checkout will succeed.
3369 ;;; SCCS: will fail with ge17.
3371 ;;; Either of these consequences is acceptable.
3373 ;;; 7. File looked registered and not locked, but is actually locked by the
3374 ;;; calling user and changed.
3378 ;;; 8. File looked registered and not locked, but is actually locked by another
3381 ;;; Potential cause: someone else checks it out during window T.
3383 ;;; RCS: co error: revision 1.3 already locked by <user>
3384 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it).
3386 ;;; We can let these errors be passed up to the user.
3388 ;;; Apparent state C ---
3390 ;;; 9. File looks locked by calling user and unchanged, but is unregistered.
3394 ;;; 10. File looks locked by calling user and unchanged, but is actually not
3397 ;;; Potential cause: a self-race in window U, or by the revert's
3398 ;;; landing during window X of some other user's steal-lock or window S
3399 ;;; of another user's revert.
3401 ;;; RCS: succeeds, refreshing the file from the identical version in
3403 ;;; SCCS: fails with error ut4 (p file nonexistent).
3405 ;;; Either of these consequences is acceptable.
3407 ;;; 11. File is locked by calling user. It looks unchanged, but is actually
3410 ;;; Potential cause: the file would have to be touched by a self-race
3411 ;;; during window Q.
3413 ;;; The revert will succeed, removing whatever changes came with
3414 ;;; the touch. It is theoretically possible that work could be lost.
3416 ;;; 12. File looks like it's locked by the calling user and unchanged, but
3417 ;;; it's actually locked by someone else.
3419 ;;; Potential cause: a steal-lock in window V.
3421 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u
3422 ;;; SCCS: fails with error un2
3424 ;;; We can pass these errors up to the user.
3426 ;;; Apparent state D ---
3428 ;;; 13. File looks like it's locked by the calling user and changed, but it's
3429 ;;; actually unregistered.
3431 ;;; Potential cause: master file got nuked during window P.
3433 ;;; RCS: Prior to version 5.6.4, checks in the user's version as an
3434 ;;; initial delta. From 5.6.4 onwards, VC uses the new ci -j
3435 ;;; option, failing with message "no such file or directory".
3436 ;;; SCCS: will fail with error ut4.
3438 ;;; This case is kind of nasty. Under RCS prior to version 5.6.4,
3439 ;;; VC may fail to detect the loss of previous version information.
3441 ;;; 14. File looks like it's locked by the calling user and changed, but it's
3442 ;;; actually unlocked.
3444 ;;; Potential cause: self-race in window V, or the checkin happening
3445 ;;; during the window X of someone else's steal-lock or window S of
3446 ;;; someone else's revert.
3448 ;;; RCS: ci will fail with "no lock set by <user>".
3449 ;;; SCCS: delta will fail with error ut4.
3451 ;;; 15. File looks like it's locked by the calling user and changed, but it's
3452 ;;; actually locked by the calling user and unchanged.
3454 ;;; Potential cause: another self-race --- a whole checkin/checkout
3455 ;;; sequence by the calling user would have to land in window R.
3457 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual.
3458 ;;; RCS: reverts to the file state as of the second user's checkin, leaving
3459 ;;; the file unlocked.
3461 ;;; It is theoretically possible that work could be lost under RCS.
3463 ;;; 16. File looks like it's locked by the calling user and changed, but it's
3464 ;;; actually locked by a different user.
3466 ;;; RCS: ci error: no lock set by <user>
3467 ;;; SCCS: unget will fail with error un2
3469 ;;; We can pass these errors up to the user.
3471 ;;; Apparent state E ---
3473 ;;; 17. File looks like it's locked by some other user, but it's actually
3478 ;;; 18. File looks like it's locked by some other user, but it's actually
3481 ;;; Potential cause: someone released a lock during window W.
3483 ;;; RCS: The calling user will get the lock on the file.
3484 ;;; SCCS: unget -n will fail with cm4.
3486 ;;; Either of these consequences will be OK.
3488 ;;; 19. File looks like it's locked by some other user, but it's actually
3489 ;;; locked by the calling user and unchanged.
3491 ;;; Potential cause: the other user relinquishing a lock followed by
3492 ;;; a self-race, both in window W.
3494 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making
3495 ;;; the sequence a no-op.
3497 ;;; 20. File looks like it's locked by some other user, but it's actually
3498 ;;; locked by the calling user and changed.
3504 ;;; In order of decreasing severity:
3506 ;;; Cases 11 and 15 are the only ones that potentially lose work.
3507 ;;; They would require a self-race for this to happen.
3509 ;;; Case 13 in RCS loses information about previous deltas, retaining
3510 ;;; only the information in the current workfile. This can only happen
3511 ;;; if the master file gets nuked in window P.
3513 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with
3514 ;;; no change comment in the master. This would require a self-race in
3515 ;;; window P or R respectively.
3517 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes.
3519 ;;; Unfortunately, it appears to me that no recovery is possible in these
3520 ;;; cases. They don't yield error messages, so there's no way to tell that
3521 ;;; a race condition has occurred.
3523 ;;; All other cases don't change either the workfile or the master, and
3524 ;;; trigger command errors which the user will see.
3526 ;;; Thus, there is no explicit recovery code.