(comint-input-ring-size): Increase to 150.
[emacs.git] / lisp / vc.el
blob14209b3afed248af447dccae5d6d5362924b6c05
1 ;;; vc.el --- drive a version-control system from within Emacs
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
4 ;; 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
6 ;; Author: FSF (see below for full credits)
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
8 ;; Keywords: tools
10 ;; $Id$
12 ;; This file is part of GNU Emacs.
14 ;; GNU Emacs is free software; you can redistribute it and/or modify
15 ;; it under the terms of the GNU General Public License as published by
16 ;; the Free Software Foundation; either version 2, or (at your option)
17 ;; any later version.
19 ;; GNU Emacs is distributed in the hope that it will be useful,
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 ;; GNU General Public License for more details.
24 ;; You should have received a copy of the GNU General Public License
25 ;; along with GNU Emacs; see the file COPYING. If not, write to the
26 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
27 ;; Boston, MA 02111-1307, USA.
29 ;;; Credits:
31 ;; VC was initially designed and implemented by Eric S. Raymond
32 ;; <esr@snark.thyrsus.com>. Over the years, many people have
33 ;; contributed substantial amounts of work to VC. These include:
34 ;; Per Cederqvist <ceder@lysator.liu.se>
35 ;; Paul Eggert <eggert@twinsun.com>
36 ;; Sebastian Kremer <sk@thp.uni-koeln.de>
37 ;; Martin Lorentzson <martinl@gnu.org>
38 ;; Dave Love <fx@gnu.org>
39 ;; Stefan Monnier <monnier@cs.yale.edu>
40 ;; J.D. Smith <jdsmith@alum.mit.edu>
41 ;; Andre Spiegel <spiegel@gnu.org>
42 ;; Richard Stallman <rms@gnu.org>
43 ;; Thien-Thi Nguyen <ttn@gnu.org>
45 ;;; Commentary:
47 ;; This mode is fully documented in the Emacs user's manual.
49 ;; Supported version-control systems presently include SCCS, RCS, and CVS.
51 ;; Some features will not work with old RCS versions. Where
52 ;; appropriate, VC finds out which version you have, and allows or
53 ;; disallows those features (stealing locks, for example, works only
54 ;; from 5.6.2 onwards).
55 ;; Even initial checkins will fail if your RCS version is so old that ci
56 ;; doesn't understand -t-; this has been known to happen to people running
57 ;; NExTSTEP 3.0.
59 ;; You can support the RCS -x option by customizing vc-rcs-master-templates.
61 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff
62 ;; to be installed somewhere on Emacs's path for executables.
64 ;; If your site uses the ChangeLog convention supported by Emacs, the
65 ;; function log-edit-comment-to-change-log could prove a useful checkin hook,
66 ;; although you might prefer to use C-c C-a (i.e. log-edit-insert-changelog)
67 ;; from the commit buffer instead or to set `log-edit-setup-invert'.
69 ;; The vc code maintains some internal state in order to reduce expensive
70 ;; version-control operations to a minimum. Some names are only computed
71 ;; once. If you perform version control operations with RCS/SCCS/CVS while
72 ;; vc's back is turned, or move/rename master files while vc is running,
73 ;; vc may get seriously confused. Don't do these things!
75 ;; Developer's notes on some concurrency issues are included at the end of
76 ;; the file.
78 ;; ADDING SUPPORT FOR OTHER BACKENDS
80 ;; VC can use arbitrary version control systems as a backend. To add
81 ;; support for a new backend named SYS, write a library vc-sys.el that
82 ;; contains functions of the form `vc-sys-...' (note that SYS is in lower
83 ;; case for the function and library names). VC will use that library if
84 ;; you put the symbol SYS somewhere into the list of
85 ;; `vc-handled-backends'. Then, for example, if `vc-sys-registered'
86 ;; returns non-nil for a file, all SYS-specific versions of VC commands
87 ;; will be available for that file.
89 ;; VC keeps some per-file information in the form of properties (see
90 ;; vc-file-set/getprop in vc-hooks.el). The backend-specific functions
91 ;; do not generally need to be aware of these properties. For example,
92 ;; `vc-sys-workfile-version' should compute the workfile version and
93 ;; return it; it should not look it up in the property, and it needn't
94 ;; store it there either. However, if a backend-specific function does
95 ;; store a value in a property, that value takes precedence over any
96 ;; value that the generic code might want to set (check for uses of
97 ;; the macro `with-vc-properties' in vc.el).
99 ;; In the list of functions below, each identifier needs to be prepended
100 ;; with `vc-sys-'. Some of the functions are mandatory (marked with a
101 ;; `*'), others are optional (`-').
103 ;; STATE-QUERYING FUNCTIONS
105 ;; * registered (file)
107 ;; Return non-nil if FILE is registered in this backend.
109 ;; * state (file)
111 ;; Return the current version control state of FILE. For a list of
112 ;; possible values, see `vc-state'. This function should do a full and
113 ;; reliable state computation; it is usually called immediately after
114 ;; C-x v v. If you want to use a faster heuristic when visiting a
115 ;; file, put that into `state-heuristic' below.
117 ;; - state-heuristic (file)
119 ;; If provided, this function is used to estimate the version control
120 ;; state of FILE at visiting time. It should be considerably faster
121 ;; than the implementation of `state'. For a list of possible values,
122 ;; see the doc string of `vc-state'.
124 ;; - dir-state (dir)
126 ;; If provided, this function is used to find the version control state
127 ;; of all files in DIR in a fast way. The function should not return
128 ;; anything, but rather store the files' states into the corresponding
129 ;; `vc-state' properties.
131 ;; * workfile-version (file)
133 ;; Return the current workfile version of FILE.
135 ;; - latest-on-branch-p (file)
137 ;; Return non-nil if the current workfile version of FILE is the latest
138 ;; on its branch. The default implementation always returns t, which
139 ;; means that working with non-current versions is not supported by
140 ;; default.
142 ;; * checkout-model (file)
144 ;; Indicate whether FILE needs to be "checked out" before it can be
145 ;; edited. See `vc-checkout-model' for a list of possible values.
147 ;; - workfile-unchanged-p (file)
149 ;; Return non-nil if FILE is unchanged from its current workfile
150 ;; version. This function should do a brief comparison of FILE's
151 ;; contents with those of the master version. If the backend does not
152 ;; have such a brief-comparison feature, the default implementation of
153 ;; this function can be used, which delegates to a full
154 ;; vc-BACKEND-diff. (Note that vc-BACKEND-diff must not run
155 ;; asynchronously in this case.)
157 ;; - mode-line-string (file)
159 ;; If provided, this function should return the VC-specific mode line
160 ;; string for FILE. The default implementation deals well with all
161 ;; states that `vc-state' can return.
163 ;; - dired-state-info (file)
165 ;; Translate the `vc-state' property of FILE into a string that can be
166 ;; used in a vc-dired buffer. The default implementation deals well
167 ;; with all states that `vc-state' can return.
169 ;; STATE-CHANGING FUNCTIONS
171 ;; * register (file &optional rev comment)
173 ;; Register FILE in this backend. Optionally, an initial revision REV
174 ;; and an initial description of the file, COMMENT, may be specified.
175 ;; The implementation should pass the value of vc-register-switches
176 ;; to the backend command.
178 ;; - init-version (file)
180 ;; The initial version to use when registering FILE if one is not
181 ;; specified by the user. If not provided, the variable
182 ;; vc-default-init-version is used instead.
184 ;; - responsible-p (file)
186 ;; Return non-nil if this backend considers itself "responsible" for
187 ;; FILE, which can also be a directory. This function is used to find
188 ;; out what backend to use for registration of new files and for things
189 ;; like change log generation. The default implementation always
190 ;; returns nil.
192 ;; - could-register (file)
194 ;; Return non-nil if FILE could be registered under this backend. The
195 ;; default implementation always returns t.
197 ;; - receive-file (file rev)
199 ;; Let this backend "receive" a file that is already registered under
200 ;; another backend. The default implementation simply calls `register'
201 ;; for FILE, but it can be overridden to do something more specific,
202 ;; e.g. keep revision numbers consistent or choose editing modes for
203 ;; FILE that resemble those of the other backend.
205 ;; - unregister (file)
207 ;; Unregister FILE from this backend. This is only needed if this
208 ;; backend may be used as a "more local" backend for temporary editing.
210 ;; * checkin (file rev comment)
212 ;; Commit changes in FILE to this backend. If REV is non-nil, that
213 ;; should become the new revision number. COMMENT is used as a
214 ;; check-in comment. The implementation should pass the value of
215 ;; vc-checkin-switches to the backend command.
217 ;; * find-version (file rev buffer)
219 ;; Fetch revision REV of file FILE and put it into BUFFER.
220 ;; If REV is the empty string, fetch the head of the trunk.
221 ;; The implementation should pass the value of vc-checkout-switches
222 ;; to the backend command.
224 ;; * checkout (file &optional editable rev)
226 ;; Check out revision REV of FILE into the working area. If EDITABLE
227 ;; is non-nil, FILE should be writable by the user and if locking is
228 ;; used for FILE, a lock should also be set. If REV is non-nil, that
229 ;; is the revision to check out (default is current workfile version).
230 ;; If REV is t, that means to check out the head of the current branch;
231 ;; if it is the empty string, check out the head of the trunk.
232 ;; The implementation should pass the value of vc-checkout-switches
233 ;; to the backend command.
235 ;; * revert (file &optional contents-done)
237 ;; Revert FILE back to the current workfile version. If optional
238 ;; arg CONTENTS-DONE is non-nil, then the contents of FILE have
239 ;; already been reverted from a version backup, and this function
240 ;; only needs to update the status of FILE within the backend.
242 ;; - cancel-version (file editable)
244 ;; Cancel the current workfile version of FILE, i.e. remove it from the
245 ;; master. EDITABLE non-nil means that FILE should be writable
246 ;; afterwards, and if locking is used for FILE, then a lock should also
247 ;; be set. If this function is not provided, trying to cancel a
248 ;; version is caught as an error.
250 ;; - merge (file rev1 rev2)
252 ;; Merge the changes between REV1 and REV2 into the current working file.
254 ;; - merge-news (file)
256 ;; Merge recent changes from the current branch into FILE.
258 ;; - steal-lock (file &optional version)
260 ;; Steal any lock on the current workfile version of FILE, or on
261 ;; VERSION if that is provided. This function is only needed if
262 ;; locking is used for files under this backend, and if files can
263 ;; indeed be locked by other users.
265 ;; HISTORY FUNCTIONS
267 ;; * print-log (file &optional buffer)
269 ;; Insert the revision log of FILE into BUFFER, or the *vc* buffer
270 ;; if BUFFER is nil.
272 ;; - show-log-entry (version)
274 ;; If provided, search the log entry for VERSION in the current buffer,
275 ;; and make sure it is displayed in the buffer's window. The default
276 ;; implementation of this function works for RCS-style logs.
278 ;; - wash-log (file)
280 ;; Remove all non-comment information from the output of print-log. The
281 ;; default implementation of this function works for RCS-style logs.
283 ;; - logentry-check ()
285 ;; If defined, this function is run to find out whether the user
286 ;; entered a valid log entry for check-in. The log entry is in the
287 ;; current buffer, and if it is not a valid one, the function should
288 ;; throw an error.
290 ;; - comment-history (file)
292 ;; Return a string containing all log entries that were made for FILE.
293 ;; This is used for transferring a file from one backend to another,
294 ;; retaining comment information. The default implementation of this
295 ;; function does this by calling print-log and then wash-log, and
296 ;; returning the resulting buffer contents as a string.
298 ;; - update-changelog (files)
300 ;; Using recent log entries, create ChangeLog entries for FILES, or for
301 ;; all files at or below the default-directory if FILES is nil. The
302 ;; default implementation runs rcs2log, which handles RCS- and
303 ;; CVS-style logs.
305 ;; * diff (file &optional rev1 rev2 buffer)
307 ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if
308 ;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences
309 ;; from REV1 to REV2. If REV1 is nil, use the current workfile
310 ;; version (as found in the repository) as the older version; if
311 ;; REV2 is nil, use the current workfile contents as the newer
312 ;; version. This function should pass the value of (vc-switches
313 ;; BACKEND 'diff) to the backend command. It should return a status
314 ;; of either 0 (no differences found), or 1 (either non-empty diff
315 ;; or the diff is run asynchronously).
317 ;; - diff-tree (dir &optional rev1 rev2)
319 ;; Insert the diff for all files at and below DIR into the *vc-diff*
320 ;; buffer. The meaning of REV1 and REV2 is the same as for
321 ;; vc-BACKEND-diff. The default implementation does an explicit tree
322 ;; walk, calling vc-BACKEND-diff for each individual file.
324 ;; - annotate-command (file buf &optional rev)
326 ;; If this function is provided, it should produce an annotated display
327 ;; of FILE in BUF, relative to version REV. Annotation means each line
328 ;; of FILE displayed is prefixed with version information associated with
329 ;; its addition (deleted lines leave no history) and that the text of the
330 ;; file is fontified according to age.
332 ;; - annotate-time ()
334 ;; Only required if `annotate-command' is defined for the backend.
335 ;; Return the time of the next line of annotation at or after point,
336 ;; as a floating point fractional number of days. The helper
337 ;; function `vc-annotate-convert-time' may be useful for converting
338 ;; multi-part times as returned by `current-time' and `encode-time'
339 ;; to this format. Return nil if no more lines of annotation appear
340 ;; in the buffer. You can safely assume that point is placed at the
341 ;; beginning of each line, starting at `point-min'. The buffer that
342 ;; point is placed in is the Annotate output, as defined by the
343 ;; relevant backend. This function also affects how much of the line
344 ;; is fontified; where it leaves point is where fontification begins.
346 ;; - annotate-current-time ()
348 ;; Only required if `annotate-command' is defined for the backend,
349 ;; AND you'd like the current time considered to be anything besides
350 ;; (vs-annotate-convert-time (current-time)) -- i.e. the current
351 ;; time with hours, minutes, and seconds included. Probably safe to
352 ;; ignore. Return the current-time, in units of fractional days.
354 ;; - annotate-extract-revision-at-line ()
356 ;; Only required if `annotate-command' is defined for the backend.
357 ;; Invoked from a buffer in vc-annotate-mode, return the revision
358 ;; corresponding to the current line, or nil if there is no revision
359 ;; corresponding to the current line.
361 ;; SNAPSHOT SYSTEM
363 ;; - create-snapshot (dir name branchp)
365 ;; Take a snapshot of the current state of files under DIR and name it
366 ;; NAME. This should make sure that files are up-to-date before
367 ;; proceeding with the action. DIR can also be a file and if BRANCHP
368 ;; is specified, NAME should be created as a branch and DIR should be
369 ;; checked out under this new branch. The default implementation does
370 ;; not support branches but does a sanity check, a tree traversal and
371 ;; for each file calls `assign-name'.
373 ;; - assign-name (file name)
375 ;; Give name NAME to the current version of FILE, assuming it is
376 ;; up-to-date. Only used by the default version of `create-snapshot'.
378 ;; - retrieve-snapshot (dir name update)
380 ;; Retrieve a named snapshot of all registered files at or below DIR.
381 ;; If UPDATE is non-nil, then update buffers of any files in the
382 ;; snapshot that are currently visited. The default implementation
383 ;; does a sanity check whether there aren't any uncommitted changes at
384 ;; or below DIR, and then performs a tree walk, using the `checkout'
385 ;; function to retrieve the corresponding versions.
387 ;; MISCELLANEOUS
389 ;; - make-version-backups-p (file)
391 ;; Return non-nil if unmodified repository versions of FILE should be
392 ;; backed up locally. If this is done, VC can perform `diff' and
393 ;; `revert' operations itself, without calling the backend system. The
394 ;; default implementation always returns nil.
396 ;; - repository-hostname (dirname)
398 ;; Return the hostname that the backend will have to contact
399 ;; in order to operate on a file in DIRNAME. If the return value
400 ;; is nil, it means that the repository is local.
401 ;; This function is used in `vc-stay-local-p' which backends can use
402 ;; for their convenience.
404 ;; - previous-version (file rev)
406 ;; Return the version number that precedes REV for FILE, or nil if no such
407 ;; version exists.
409 ;; - next-version (file rev)
411 ;; Return the version number that follows REV for FILE, or nil if no such
412 ;; version exists.
414 ;; - check-headers ()
416 ;; Return non-nil if the current buffer contains any version headers.
418 ;; - clear-headers ()
420 ;; In the current buffer, reset all version headers to their unexpanded
421 ;; form. This function should be provided if the state-querying code
422 ;; for this backend uses the version headers to determine the state of
423 ;; a file. This function will then be called whenever VC changes the
424 ;; version control state in such a way that the headers would give
425 ;; wrong information.
427 ;; - delete-file (file)
429 ;; Delete FILE and mark it as deleted in the repository. If this
430 ;; function is not provided, the command `vc-delete-file' will
431 ;; signal an error.
433 ;; - rename-file (old new)
435 ;; Rename file OLD to NEW, both in the working area and in the
436 ;; repository. If this function is not provided, the renaming
437 ;; will be done by (vc-delete-file old) and (vc-register new).
439 ;; - find-file-hook ()
441 ;; Operation called in current buffer when opening a file. This can
442 ;; be used by the backend to setup some local variables it might need.
444 ;; - find-file-not-found-hook ()
446 ;; Operation called in current buffer when opening a non-existing file.
447 ;; By default, this asks the user if she wants to check out the file.
449 ;;; Code:
451 (require 'vc-hooks)
452 (require 'ring)
453 (eval-when-compile
454 (require 'cl)
455 (require 'compile)
456 (require 'dired) ; for dired-map-over-marks macro
457 (require 'dired-aux)) ; for dired-kill-{line,tree}
459 (if (not (assoc 'vc-parent-buffer minor-mode-alist))
460 (setq minor-mode-alist
461 (cons '(vc-parent-buffer vc-parent-buffer-name)
462 minor-mode-alist)))
464 ;; General customization
466 (defgroup vc nil
467 "Version-control system in Emacs."
468 :group 'tools)
470 (defcustom vc-suppress-confirm nil
471 "*If non-nil, treat user as expert; suppress yes-no prompts on some things."
472 :type 'boolean
473 :group 'vc)
475 (defcustom vc-delete-logbuf-window t
476 "*If non-nil, delete the *VC-log* buffer and window after each logical action.
477 If nil, bury that buffer instead.
478 This is most useful if you have multiple windows on a frame and would like to
479 preserve the setting."
480 :type 'boolean
481 :group 'vc)
483 (defcustom vc-initial-comment nil
484 "*If non-nil, prompt for initial comment when a file is registered."
485 :type 'boolean
486 :group 'vc)
488 (defcustom vc-default-init-version "1.1"
489 "*A string used as the default version number when a new file is registered.
490 This can be overridden by giving a prefix argument to \\[vc-register]. This
491 can also be overridden by a particular VC backend."
492 :type 'string
493 :group 'vc
494 :version "20.3")
496 (defcustom vc-command-messages nil
497 "*If non-nil, display run messages from back-end commands."
498 :type 'boolean
499 :group 'vc)
501 (defcustom vc-checkin-switches nil
502 "*A string or list of strings specifying extra switches for checkin.
503 These are passed to the checkin program by \\[vc-checkin]."
504 :type '(choice (const :tag "None" nil)
505 (string :tag "Argument String")
506 (repeat :tag "Argument List"
507 :value ("")
508 string))
509 :group 'vc)
511 (defcustom vc-checkout-switches nil
512 "*A string or list of strings specifying extra switches for checkout.
513 These are passed to the checkout program by \\[vc-checkout]."
514 :type '(choice (const :tag "None" nil)
515 (string :tag "Argument String")
516 (repeat :tag "Argument List"
517 :value ("")
518 string))
519 :group 'vc)
521 (defcustom vc-register-switches nil
522 "*A string or list of strings; extra switches for registering a file.
523 These are passed to the checkin program by \\[vc-register]."
524 :type '(choice (const :tag "None" nil)
525 (string :tag "Argument String")
526 (repeat :tag "Argument List"
527 :value ("")
528 string))
529 :group 'vc)
531 (defcustom vc-dired-listing-switches "-al"
532 "*Switches passed to `ls' for vc-dired. MUST contain the `l' option."
533 :type 'string
534 :group 'vc
535 :version "21.1")
537 (defcustom vc-dired-recurse t
538 "*If non-nil, show directory trees recursively in VC Dired."
539 :type 'boolean
540 :group 'vc
541 :version "20.3")
543 (defcustom vc-dired-terse-display t
544 "*If non-nil, show only locked files in VC Dired."
545 :type 'boolean
546 :group 'vc
547 :version "20.3")
549 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn")
550 "*List of directory names to be ignored when walking directory trees."
551 :type '(repeat string)
552 :group 'vc)
554 (defcustom vc-diff-switches nil
555 "*A string or list of strings specifying switches for diff under VC.
556 When running diff under a given BACKEND, VC concatenates the values of
557 `diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to
558 get the switches for that command. Thus, `vc-diff-switches' should
559 contain switches that are specific to version control, but not
560 specific to any particular backend."
561 :type '(choice (const :tag "None" nil)
562 (string :tag "Argument String")
563 (repeat :tag "Argument List"
564 :value ("")
565 string))
566 :group 'vc
567 :version "21.1")
569 ;;;###autoload
570 (defcustom vc-checkout-hook nil
571 "*Normal hook (list of functions) run after checking out a file.
572 See `run-hooks'."
573 :type 'hook
574 :group 'vc
575 :version "21.1")
577 (defcustom vc-annotate-display-mode nil
578 "Which mode to color the output of \\[vc-annotate] with by default."
579 :type '(choice (const :tag "Default" nil)
580 (const :tag "Scale to Oldest" scale)
581 (const :tag "Scale Oldest->Newest" fullscale)
582 (number :tag "Specify Fractional Number of Days"
583 :value "20.5"))
584 :group 'vc)
586 ;;;###autoload
587 (defcustom vc-checkin-hook nil
588 "*Normal hook (list of functions) run after a checkin is done.
589 See also `log-edit-done-hook'."
590 :type 'hook
591 :options '(log-edit-comment-to-change-log)
592 :group 'vc)
594 ;;;###autoload
595 (defcustom vc-before-checkin-hook nil
596 "*Normal hook (list of functions) run before a file is checked in.
597 See `run-hooks'."
598 :type 'hook
599 :group 'vc)
601 (defcustom vc-logentry-check-hook nil
602 "*Normal hook run by `vc-backend-logentry-check'.
603 Use this to impose your own rules on the entry in addition to any the
604 version control backend imposes itself."
605 :type 'hook
606 :group 'vc)
608 ;; Annotate customization
609 (defcustom vc-annotate-color-map
610 '(( 20. . "#FF0000")
611 ( 40. . "#FF3800")
612 ( 60. . "#FF7000")
613 ( 80. . "#FFA800")
614 (100. . "#FFE000")
615 (120. . "#E7FF00")
616 (140. . "#AFFF00")
617 (160. . "#77FF00")
618 (180. . "#3FFF00")
619 (200. . "#07FF00")
620 (220. . "#00FF31")
621 (240. . "#00FF69")
622 (260. . "#00FFA1")
623 (280. . "#00FFD9")
624 (300. . "#00EEFF")
625 (320. . "#00B6FF")
626 (340. . "#007EFF"))
627 "*Association list of age versus color, for \\[vc-annotate].
628 Ages are given in units of fractional days. Default is eighteen steps
629 using a twenty day increment."
630 :type 'alist
631 :group 'vc)
633 (defcustom vc-annotate-very-old-color "#0046FF"
634 "*Color for lines older than the current color range in \\[vc-annotate]]."
635 :type 'string
636 :group 'vc)
638 (defcustom vc-annotate-background "black"
639 "*Background color for \\[vc-annotate].
640 Default color is used if nil."
641 :type 'string
642 :group 'vc)
644 (defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01)
645 "*Menu elements for the mode-specific menu of VC-Annotate mode.
646 List of factors, used to expand/compress the time scale. See `vc-annotate'."
647 :type '(repeat number)
648 :group 'vc)
650 (defvar vc-annotate-mode-map
651 (let ((m (make-sparse-keymap)))
652 (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate"))
654 "Local keymap used for VC-Annotate mode.")
656 (define-key vc-annotate-mode-map "A" 'vc-annotate-revision-previous-to-line)
657 (define-key vc-annotate-mode-map "D" 'vc-annotate-show-diff-revision-at-line)
658 (define-key vc-annotate-mode-map "J" 'vc-annotate-revision-at-line)
659 (define-key vc-annotate-mode-map "L" 'vc-annotate-show-log-revision-at-line)
660 (define-key vc-annotate-mode-map "N" 'vc-annotate-next-version)
661 (define-key vc-annotate-mode-map "P" 'vc-annotate-prev-version)
662 (define-key vc-annotate-mode-map "W" 'vc-annotate-workfile-version)
664 (defvar vc-annotate-mode-menu nil
665 "Local keymap used for VC-Annotate mode's menu bar menu.")
667 ;; Header-insertion hair
669 (defcustom vc-static-header-alist
670 '(("\\.c$" .
671 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
672 "*Associate static header string templates with file types.
673 A \%s in the template is replaced with the first string associated with
674 the file's version control type in `vc-header-alist'."
675 :type '(repeat (cons :format "%v"
676 (regexp :tag "File Type")
677 (string :tag "Header String")))
678 :group 'vc)
680 (defcustom vc-comment-alist
681 '((nroff-mode ".\\\"" ""))
682 "*Special comment delimiters for generating VC headers.
683 Add an entry in this list if you need to override the normal `comment-start'
684 and `comment-end' variables. This will only be necessary if the mode language
685 is sensitive to blank lines."
686 :type '(repeat (list :format "%v"
687 (symbol :tag "Mode")
688 (string :tag "Comment Start")
689 (string :tag "Comment End")))
690 :group 'vc)
692 (defcustom vc-checkout-carefully (= (user-uid) 0)
693 "*Non-nil means be extra-careful in checkout.
694 Verify that the file really is not locked
695 and that its contents match what the master file says."
696 :type 'boolean
697 :group 'vc)
698 (make-obsolete-variable 'vc-checkout-carefully
699 "the corresponding checks are always done now."
700 "21.1")
703 ;; Variables the user doesn't need to know about.
704 (defvar vc-log-operation nil)
705 (defvar vc-log-after-operation-hook nil)
706 (defvar vc-annotate-buffers nil
707 "Alist of current \"Annotate\" buffers and their corresponding backends.
708 The keys are \(BUFFER . BACKEND\). See also `vc-annotate-get-backend'.")
709 ;; In a log entry buffer, this is a local variable
710 ;; that points to the buffer for which it was made
711 ;; (either a file, or a VC dired buffer).
712 (defvar vc-parent-buffer nil)
713 (put 'vc-parent-buffer 'permanent-local t)
714 (defvar vc-parent-buffer-name nil)
715 (put 'vc-parent-buffer-name 'permanent-local t)
717 (defvar vc-log-file)
718 (defvar vc-log-version)
720 (defvar vc-dired-mode nil)
721 (make-variable-buffer-local 'vc-dired-mode)
723 ;; functions that operate on RCS revision numbers. This code should
724 ;; also be moved into the backends. It stays for now, however, since
725 ;; it is used in code below.
726 (defun vc-trunk-p (rev)
727 "Return t if REV is a revision on the trunk."
728 (not (eq nil (string-match "\\`[0-9]+\\.[0-9]+\\'" rev))))
730 (defun vc-branch-p (rev)
731 "Return t if REV is a branch revision."
732 (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev))))
734 ;;;###autoload
735 (defun vc-branch-part (rev)
736 "Return the branch part of a revision number REV."
737 (let ((index (string-match "\\.[0-9]+\\'" rev)))
738 (if index
739 (substring rev 0 index))))
741 (defun vc-minor-part (rev)
742 "Return the minor version number of a revision number REV."
743 (string-match "[0-9]+\\'" rev)
744 (substring rev (match-beginning 0) (match-end 0)))
746 (defun vc-default-previous-version (backend file rev)
747 "Return the version number immediately preceding REV for FILE,
748 or nil if there is no previous version. This default
749 implementation works for <major>.<minor>-style version numbers as
750 used by RCS and CVS."
751 (let ((branch (vc-branch-part rev))
752 (minor-num (string-to-number (vc-minor-part rev))))
753 (when branch
754 (if (> minor-num 1)
755 ;; version does probably not start a branch or release
756 (concat branch "." (number-to-string (1- minor-num)))
757 (if (vc-trunk-p rev)
758 ;; we are at the beginning of the trunk --
759 ;; don't know anything to return here
761 ;; we are at the beginning of a branch --
762 ;; return version of starting point
763 (vc-branch-part branch))))))
765 (defun vc-default-next-version (backend file rev)
766 "Return the version number immediately following REV for FILE,
767 or nil if there is no next version. This default implementation
768 works for <major>.<minor>-style version numbers as used by RCS
769 and CVS."
770 (when (not (string= rev (vc-workfile-version file)))
771 (let ((branch (vc-branch-part rev))
772 (minor-num (string-to-number (vc-minor-part rev))))
773 (concat branch "." (number-to-string (1+ minor-num))))))
775 ;; File property caching
777 (defun vc-clear-context ()
778 "Clear all cached file properties."
779 (interactive)
780 (fillarray vc-file-prop-obarray 0))
782 (defmacro with-vc-properties (file form settings)
783 "Execute FORM, then maybe set per-file properties for FILE.
784 SETTINGS is an association list of property/value pairs. After
785 executing FORM, set those properties from SETTINGS that have not yet
786 been updated to their corresponding values."
787 (declare (debug t))
788 `(let ((vc-touched-properties (list t)))
789 ,form
790 (mapcar (lambda (setting)
791 (let ((property (car setting)))
792 (unless (memq property vc-touched-properties)
793 (put (intern ,file vc-file-prop-obarray)
794 property (cdr setting)))))
795 ,settings)))
797 ;; Random helper functions
799 (defsubst vc-editable-p (file)
800 "Return non-nil if FILE can be edited."
801 (or (eq (vc-checkout-model file) 'implicit)
802 (memq (vc-state file) '(edited needs-merge))))
804 ;; Two macros for elisp programming
805 ;;;###autoload
806 (defmacro with-vc-file (file comment &rest body)
807 "Check out a writable copy of FILE if necessary, then execute BODY.
808 Check in FILE with COMMENT (a string) after BODY has been executed.
809 FILE is passed through `expand-file-name'; BODY executed within
810 `save-excursion'. If FILE is not under version control, or locked by
811 somebody else, signal error."
812 (declare (debug t) (indent 2))
813 (let ((filevar (make-symbol "file")))
814 `(let ((,filevar (expand-file-name ,file)))
815 (or (vc-backend ,filevar)
816 (error "File not under version control: `%s'" file))
817 (unless (vc-editable-p ,filevar)
818 (let ((state (vc-state ,filevar)))
819 (if (stringp state)
820 (error "`%s' is locking `%s'" state ,filevar)
821 (vc-checkout ,filevar t))))
822 (save-excursion
823 ,@body)
824 (vc-checkin ,filevar nil ,comment))))
826 ;;;###autoload
827 (defmacro edit-vc-file (file comment &rest body)
828 "Edit FILE under version control, executing body.
829 Checkin with COMMENT after executing BODY.
830 This macro uses `with-vc-file', passing args to it.
831 However, before executing BODY, find FILE, and after BODY, save buffer."
832 (declare (debug t) (indent 2))
833 (let ((filevar (make-symbol "file")))
834 `(let ((,filevar (expand-file-name ,file)))
835 (with-vc-file
836 ,filevar ,comment
837 (set-buffer (find-file-noselect ,filevar))
838 ,@body
839 (save-buffer)))))
841 (defun vc-ensure-vc-buffer ()
842 "Make sure that the current buffer visits a version-controlled file."
843 (if vc-dired-mode
844 (set-buffer (find-file-noselect (dired-get-filename)))
845 (while vc-parent-buffer
846 (pop-to-buffer vc-parent-buffer))
847 (if (not buffer-file-name)
848 (error "Buffer %s is not associated with a file" (buffer-name))
849 (if (not (vc-backend buffer-file-name))
850 (error "File %s is not under version control" buffer-file-name)))))
852 (defun vc-process-filter (p s)
853 "An alternative output filter for async process P.
854 The only difference with the default filter is to insert S after markers."
855 (with-current-buffer (process-buffer p)
856 (save-excursion
857 (let ((inhibit-read-only t))
858 (goto-char (process-mark p))
859 (insert s)
860 (set-marker (process-mark p) (point))))))
862 (defun vc-setup-buffer (&optional buf)
863 "Prepare BUF for executing a VC command and make it current.
864 BUF defaults to \"*vc*\", can be a string and will be created if necessary."
865 (unless buf (setq buf "*vc*"))
866 (let ((camefrom (current-buffer))
867 (olddir default-directory))
868 (set-buffer (get-buffer-create buf))
869 (kill-all-local-variables)
870 (set (make-local-variable 'vc-parent-buffer) camefrom)
871 (set (make-local-variable 'vc-parent-buffer-name)
872 (concat " from " (buffer-name camefrom)))
873 (setq default-directory olddir)
874 (let ((inhibit-read-only t))
875 (erase-buffer))))
877 (defun vc-exec-after (code)
878 "Eval CODE when the current buffer's process is done.
879 If the current buffer has no process, just evaluate CODE.
880 Else, add CODE to the process' sentinel."
881 (let ((proc (get-buffer-process (current-buffer))))
882 (cond
883 ;; If there's no background process, just execute the code.
884 ((null proc) (eval code))
885 ;; If the background process has exited, reap it and try again
886 ((eq (process-status proc) 'exit)
887 (delete-process proc)
888 (vc-exec-after code))
889 ;; If a process is running, add CODE to the sentinel
890 ((eq (process-status proc) 'run)
891 (let ((sentinel (process-sentinel proc)))
892 (set-process-sentinel proc
893 `(lambda (p s)
894 (with-current-buffer ',(current-buffer)
895 (goto-char (process-mark p))
896 ,@(append (cdr (cdr (cdr ;strip off `with-current-buffer buf
897 ; (goto-char...)'
898 (car (cdr (cdr ;strip off `lambda (p s)'
899 sentinel))))))
900 (list `(vc-exec-after ',code))))))))
901 (t (error "Unexpected process state"))))
902 nil)
904 (defvar vc-post-command-functions nil
905 "Hook run at the end of `vc-do-command'.
906 Each function is called inside the buffer in which the command was run
907 and is passed 3 arguments: the COMMAND, the FILE and the FLAGS.")
909 (defvar w32-quote-process-args)
910 ;;;###autoload
911 (defun vc-do-command (buffer okstatus command file &rest flags)
912 "Execute a VC command, notifying user and checking for errors.
913 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the
914 current buffer if BUFFER is t. If the destination buffer is not
915 already current, set it up properly and erase it. The command is
916 considered successful if its exit status does not exceed OKSTATUS (if
917 OKSTATUS is nil, that means to ignore errors, if it is 'async, that
918 means not to wait for termination of the subprocess). FILE is the
919 name of the working file (may also be nil, to execute commands that
920 don't expect a file name). If an optional list of FLAGS is present,
921 that is inserted into the command line before the filename."
922 (and file (setq file (expand-file-name file)))
923 (if vc-command-messages
924 (message "Running %s on %s..." command file))
925 (save-current-buffer
926 (unless (or (eq buffer t)
927 (and (stringp buffer)
928 (string= (buffer-name) buffer))
929 (eq buffer (current-buffer)))
930 (vc-setup-buffer buffer))
931 (let ((squeezed (remq nil flags))
932 (inhibit-read-only t)
933 (status 0))
934 (when file
935 ;; FIXME: file-relative-name can return a bogus result because
936 ;; it doesn't look at the actual file-system to see if symlinks
937 ;; come into play.
938 (setq squeezed (append squeezed (list (file-relative-name file)))))
939 (let ((exec-path (append vc-path exec-path))
940 ;; Add vc-path to PATH for the execution of this command.
941 (process-environment
942 (cons (concat "PATH=" (getenv "PATH")
943 path-separator
944 (mapconcat 'identity vc-path path-separator))
945 process-environment))
946 (w32-quote-process-args t))
947 (if (eq okstatus 'async)
948 (let ((proc (apply 'start-process command (current-buffer) command
949 squeezed)))
950 (unless (active-minibuffer-window)
951 (message "Running %s in the background..." command))
952 ;;(set-process-sentinel proc (lambda (p msg) (delete-process p)))
953 (set-process-filter proc 'vc-process-filter)
954 (vc-exec-after
955 `(unless (active-minibuffer-window)
956 (message "Running %s in the background... done" ',command))))
957 (setq status (apply 'process-file command nil t nil squeezed))
958 (when (or (not (integerp status)) (and okstatus (< okstatus status)))
959 (pop-to-buffer (current-buffer))
960 (goto-char (point-min))
961 (shrink-window-if-larger-than-buffer)
962 (error "Running %s...FAILED (%s)" command
963 (if (integerp status) (format "status %d" status) status))))
964 (if vc-command-messages
965 (message "Running %s...OK" command)))
966 (vc-exec-after
967 `(run-hook-with-args 'vc-post-command-functions ',command ',file ',flags))
968 status)))
970 (defun vc-position-context (posn)
971 "Save a bit of the text around POSN in the current buffer.
972 Used to help us find the corresponding position again later
973 if markers are destroyed or corrupted."
974 ;; A lot of this was shamelessly lifted from Sebastian Kremer's
975 ;; rcs.el mode.
976 (list posn
977 (buffer-size)
978 (buffer-substring posn
979 (min (point-max) (+ posn 100)))))
981 (defun vc-find-position-by-context (context)
982 "Return the position of CONTEXT in the current buffer.
983 If CONTEXT cannot be found, return nil."
984 (let ((context-string (nth 2 context)))
985 (if (equal "" context-string)
986 (point-max)
987 (save-excursion
988 (let ((diff (- (nth 1 context) (buffer-size))))
989 (if (< diff 0) (setq diff (- diff)))
990 (goto-char (nth 0 context))
991 (if (or (search-forward context-string nil t)
992 ;; Can't use search-backward since the match may continue
993 ;; after point.
994 (progn (goto-char (- (point) diff (length context-string)))
995 ;; goto-char doesn't signal an error at
996 ;; beginning of buffer like backward-char would
997 (search-forward context-string nil t)))
998 ;; to beginning of OSTRING
999 (- (point) (length context-string))))))))
1001 (defun vc-context-matches-p (posn context)
1002 "Return t if POSN matches CONTEXT, nil otherwise."
1003 (let* ((context-string (nth 2 context))
1004 (len (length context-string))
1005 (end (+ posn len)))
1006 (if (> end (1+ (buffer-size)))
1008 (string= context-string (buffer-substring posn end)))))
1010 (defun vc-buffer-context ()
1011 "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE).
1012 Used by `vc-restore-buffer-context' to later restore the context."
1013 (let ((point-context (vc-position-context (point)))
1014 ;; Use mark-marker to avoid confusion in transient-mark-mode.
1015 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer))
1016 (vc-position-context (mark-marker))))
1017 ;; Make the right thing happen in transient-mark-mode.
1018 (mark-active nil)
1019 ;; The new compilation code does not use compilation-error-list any
1020 ;; more, so the code below is now ineffective and might as well
1021 ;; be disabled. -- Stef
1022 ;; ;; We may want to reparse the compilation buffer after revert
1023 ;; (reparse (and (boundp 'compilation-error-list) ;compile loaded
1024 ;; ;; Construct a list; each elt is nil or a buffer
1025 ;; ;; iff that buffer is a compilation output buffer
1026 ;; ;; that contains markers into the current buffer.
1027 ;; (save-current-buffer
1028 ;; (mapcar (lambda (buffer)
1029 ;; (set-buffer buffer)
1030 ;; (let ((errors (or
1031 ;; compilation-old-error-list
1032 ;; compilation-error-list))
1033 ;; (buffer-error-marked-p nil))
1034 ;; (while (and (consp errors)
1035 ;; (not buffer-error-marked-p))
1036 ;; (and (markerp (cdr (car errors)))
1037 ;; (eq buffer
1038 ;; (marker-buffer
1039 ;; (cdr (car errors))))
1040 ;; (setq buffer-error-marked-p t))
1041 ;; (setq errors (cdr errors)))
1042 ;; (if buffer-error-marked-p buffer)))
1043 ;; (buffer-list)))))
1044 (reparse nil))
1045 (list point-context mark-context reparse)))
1047 (defun vc-restore-buffer-context (context)
1048 "Restore point/mark, and reparse any affected compilation buffers.
1049 CONTEXT is that which `vc-buffer-context' returns."
1050 (let ((point-context (nth 0 context))
1051 (mark-context (nth 1 context))
1052 (reparse (nth 2 context)))
1053 ;; The new compilation code does not use compilation-error-list any
1054 ;; more, so the code below is now ineffective and might as well
1055 ;; be disabled. -- Stef
1056 ;; ;; Reparse affected compilation buffers.
1057 ;; (while reparse
1058 ;; (if (car reparse)
1059 ;; (with-current-buffer (car reparse)
1060 ;; (let ((compilation-last-buffer (current-buffer)) ;select buffer
1061 ;; ;; Record the position in the compilation buffer of
1062 ;; ;; the last error next-error went to.
1063 ;; (error-pos (marker-position
1064 ;; (car (car-safe compilation-error-list)))))
1065 ;; ;; Reparse the error messages as far as they were parsed before.
1066 ;; (compile-reinitialize-errors '(4) compilation-parsing-end)
1067 ;; ;; Move the pointer up to find the error we were at before
1068 ;; ;; reparsing. Now next-error should properly go to the next one.
1069 ;; (while (and compilation-error-list
1070 ;; (/= error-pos (car (car compilation-error-list))))
1071 ;; (setq compilation-error-list (cdr compilation-error-list))))))
1072 ;; (setq reparse (cdr reparse)))
1074 ;; if necessary, restore point and mark
1075 (if (not (vc-context-matches-p (point) point-context))
1076 (let ((new-point (vc-find-position-by-context point-context)))
1077 (if new-point (goto-char new-point))))
1078 (and mark-active
1079 mark-context
1080 (not (vc-context-matches-p (mark) mark-context))
1081 (let ((new-mark (vc-find-position-by-context mark-context)))
1082 (if new-mark (set-mark new-mark))))))
1084 (defun vc-revert-buffer1 (&optional arg no-confirm)
1085 "Revert buffer, keeping point and mark where user expects them.
1086 Try to be clever in the face of changes due to expanded version control
1087 key words. This is important for typeahead to work as expected.
1088 ARG and NO-CONFIRM are passed on to `revert-buffer'."
1089 (interactive "P")
1090 (widen)
1091 (let ((context (vc-buffer-context)))
1092 ;; Use save-excursion here, because it may be able to restore point
1093 ;; and mark properly even in cases where vc-restore-buffer-context
1094 ;; would fail. However, save-excursion might also get it wrong --
1095 ;; in this case, vc-restore-buffer-context gives it a second try.
1096 (save-excursion
1097 ;; t means don't call normal-mode;
1098 ;; that's to preserve various minor modes.
1099 (revert-buffer arg no-confirm t))
1100 (vc-restore-buffer-context context)))
1103 (defun vc-buffer-sync (&optional not-urgent)
1104 "Make sure the current buffer and its working file are in sync.
1105 NOT-URGENT means it is ok to continue if the user says not to save."
1106 (if (buffer-modified-p)
1107 (if (or vc-suppress-confirm
1108 (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name))))
1109 (save-buffer)
1110 (unless not-urgent
1111 (error "Aborted")))))
1113 (defun vc-default-latest-on-branch-p (backend file)
1114 "Return non-nil if FILE is the latest on its branch.
1115 This default implementation always returns non-nil, which means that
1116 editing non-current versions is not supported by default."
1119 (defun vc-recompute-state (file)
1120 "Force a recomputation of the version control state of FILE.
1121 The state is computed using the exact, and possibly expensive
1122 function `vc-BACKEND-state', not the heuristic."
1123 (vc-file-setprop file 'vc-state (vc-call state file)))
1125 (defun vc-next-action-on-file (file verbose &optional comment)
1126 "Do The Right Thing for a given FILE under version control.
1127 If COMMENT is specified, it will be used as an admin or checkin comment.
1128 If VERBOSE is non-nil, query the user rather than using default parameters."
1129 (let ((visited (get-file-buffer file))
1130 state version)
1131 (when visited
1132 (if vc-dired-mode
1133 (switch-to-buffer-other-window visited)
1134 (set-buffer visited))
1135 ;; Check relation of buffer and file, and make sure
1136 ;; user knows what he's doing. First, finding the file
1137 ;; will check whether the file on disk is newer.
1138 ;; Ignore buffer-read-only during this test, and
1139 ;; preserve find-file-literally.
1140 (let ((buffer-read-only (not (file-writable-p file))))
1141 (find-file-noselect file nil find-file-literally))
1142 (if (not (verify-visited-file-modtime (current-buffer)))
1143 (if (yes-or-no-p "Replace file on disk with buffer contents? ")
1144 (write-file buffer-file-name)
1145 (error "Aborted"))
1146 ;; Now, check if we have unsaved changes.
1147 (vc-buffer-sync t)
1148 (if (buffer-modified-p)
1149 (or (y-or-n-p "Operate on disk file, keeping modified buffer? ")
1150 (error "Aborted")))))
1152 ;; Do the right thing
1153 (if (not (vc-registered file))
1154 (vc-register verbose comment)
1155 (vc-recompute-state file)
1156 (if visited (vc-mode-line file))
1157 (setq state (vc-state file))
1158 (cond
1159 ;; up-to-date
1160 ((or (eq state 'up-to-date)
1161 (and verbose (eq state 'needs-patch)))
1162 (cond
1163 (verbose
1164 ;; go to a different version
1165 (setq version
1166 (read-string "Branch, version, or backend to move to: "))
1167 (let ((vsym (intern-soft (upcase version))))
1168 (if (member vsym vc-handled-backends)
1169 (vc-transfer-file file vsym)
1170 (vc-checkout file (eq (vc-checkout-model file) 'implicit)
1171 version))))
1172 ((not (eq (vc-checkout-model file) 'implicit))
1173 ;; check the file out
1174 (vc-checkout file t))
1176 ;; do nothing
1177 (message "%s is up-to-date" file))))
1179 ;; Abnormal: edited but read-only
1180 ((and visited (eq state 'edited)
1181 buffer-read-only (not (file-writable-p file)))
1182 ;; Make the file+buffer read-write. If the user really wanted to
1183 ;; commit, he'll get a chance to do that next time around, anyway.
1184 (message "File is edited but read-only; making it writable")
1185 (set-file-modes buffer-file-name
1186 (logior (file-modes buffer-file-name) 128))
1187 (toggle-read-only -1))
1189 ;; edited
1190 ((eq state 'edited)
1191 (cond
1192 ;; For files with locking, if the file does not contain
1193 ;; any changes, just let go of the lock, i.e. revert.
1194 ((and (not (eq (vc-checkout-model file) 'implicit))
1195 (vc-workfile-unchanged-p file)
1196 ;; If buffer is modified, that means the user just
1197 ;; said no to saving it; in that case, don't revert,
1198 ;; because the user might intend to save after
1199 ;; finishing the log entry.
1200 (not (and visited (buffer-modified-p))))
1201 ;; DO NOT revert the file without asking the user!
1202 (if (not visited) (find-file-other-window file))
1203 (if (yes-or-no-p "Revert to master version? ")
1204 (vc-revert-buffer)))
1205 (t ;; normal action
1206 (if (not verbose)
1207 (vc-checkin file nil comment)
1208 (setq version (read-string "New version or backend: "))
1209 (let ((vsym (intern (upcase version))))
1210 (if (member vsym vc-handled-backends)
1211 (vc-transfer-file file vsym)
1212 (vc-checkin file version comment)))))))
1214 ;; locked by somebody else
1215 ((stringp state)
1216 (if comment
1217 (error "Sorry, you can't steal the lock on %s this way"
1218 (file-name-nondirectory file)))
1219 (vc-steal-lock file
1220 (if verbose (read-string "Version to steal: ")
1221 (vc-workfile-version file))
1222 state))
1224 ;; needs-patch
1225 ((eq state 'needs-patch)
1226 (if (yes-or-no-p (format
1227 "%s is not up-to-date. Get latest version? "
1228 (file-name-nondirectory file)))
1229 (vc-checkout file (eq (vc-checkout-model file) 'implicit) t)
1230 (if (and (not (eq (vc-checkout-model file) 'implicit))
1231 (yes-or-no-p "Lock this version? "))
1232 (vc-checkout file t)
1233 (error "Aborted"))))
1235 ;; needs-merge
1236 ((eq state 'needs-merge)
1237 (if (yes-or-no-p (format
1238 "%s is not up-to-date. Merge in changes now? "
1239 (file-name-nondirectory file)))
1240 (vc-maybe-resolve-conflicts file (vc-call merge-news file))
1241 (error "Aborted")))
1243 ;; unlocked-changes
1244 ((eq state 'unlocked-changes)
1245 (if (not visited) (find-file-other-window file))
1246 (if (save-window-excursion
1247 (vc-version-diff file (vc-workfile-version file) nil)
1248 (goto-char (point-min))
1249 (let ((inhibit-read-only t))
1250 (insert
1251 (format "Changes to %s since last lock:\n\n" file)))
1252 (not (beep))
1253 (yes-or-no-p (concat "File has unlocked changes. "
1254 "Claim lock retaining changes? ")))
1255 (progn (vc-call steal-lock file)
1256 (clear-visited-file-modtime)
1257 ;; Must clear any headers here because they wouldn't
1258 ;; show that the file is locked now.
1259 (vc-clear-headers file)
1260 (write-file buffer-file-name)
1261 (vc-mode-line file))
1262 (if (not (yes-or-no-p
1263 "Revert to checked-in version, instead? "))
1264 (error "Checkout aborted")
1265 (vc-revert-buffer1 t t)
1266 (vc-checkout file t))))))))
1268 (defvar vc-dired-window-configuration)
1270 (defun vc-next-action-dired (file rev comment)
1271 "Call `vc-next-action-on-file' on all the marked files.
1272 Ignores FILE and REV, but passes on COMMENT."
1273 (let ((dired-buffer (current-buffer)))
1274 (dired-map-over-marks
1275 (let ((file (dired-get-filename)))
1276 (message "Processing %s..." file)
1277 (vc-next-action-on-file file nil comment)
1278 (set-buffer dired-buffer)
1279 (set-window-configuration vc-dired-window-configuration)
1280 (message "Processing %s...done" file))
1281 nil t))
1282 (dired-move-to-filename))
1284 ;; Here's the major entry point.
1286 ;;;###autoload
1287 (defun vc-next-action (verbose)
1288 "Do the next logical version control operation on the current file.
1290 If you call this from within a VC dired buffer with no files marked,
1291 it will operate on the file in the current line.
1293 If you call this from within a VC dired buffer, and one or more
1294 files are marked, it will accept a log message and then operate on
1295 each one. The log message will be used as a comment for any register
1296 or checkin operations, but ignored when doing checkouts. Attempted
1297 lock steals will raise an error.
1299 A prefix argument lets you specify the version number to use.
1301 For RCS and SCCS files:
1302 If the file is not already registered, this registers it for version
1303 control.
1304 If the file is registered and not locked by anyone, this checks out
1305 a writable and locked file ready for editing.
1306 If the file is checked out and locked by the calling user, this
1307 first checks to see if the file has changed since checkout. If not,
1308 it performs a revert.
1309 If the file has been changed, this pops up a buffer for entry
1310 of a log message; when the message has been entered, it checks in the
1311 resulting changes along with the log message as change commentary. If
1312 the variable `vc-keep-workfiles' is non-nil (which is its default), a
1313 read-only copy of the changed file is left in place afterwards.
1314 If the file is registered and locked by someone else, you are given
1315 the option to steal the lock.
1317 For CVS files:
1318 If the file is not already registered, this registers it for version
1319 control. This does a \"cvs add\", but no \"cvs commit\".
1320 If the file is added but not committed, it is committed.
1321 If your working file is changed, but the repository file is
1322 unchanged, this pops up a buffer for entry of a log message; when the
1323 message has been entered, it checks in the resulting changes along
1324 with the logmessage as change commentary. A writable file is retained.
1325 If the repository file is changed, you are asked if you want to
1326 merge in the changes into your working copy."
1328 (interactive "P")
1329 (catch 'nogo
1330 (if vc-dired-mode
1331 (let ((files (dired-get-marked-files)))
1332 (set (make-local-variable 'vc-dired-window-configuration)
1333 (current-window-configuration))
1334 (if (string= ""
1335 (mapconcat
1336 (lambda (f)
1337 (if (not (vc-up-to-date-p f)) "@" ""))
1338 files ""))
1339 (vc-next-action-dired nil nil "dummy")
1340 (vc-start-entry nil nil nil nil
1341 "Enter a change comment for the marked files."
1342 'vc-next-action-dired))
1343 (throw 'nogo nil)))
1344 (while vc-parent-buffer
1345 (pop-to-buffer vc-parent-buffer))
1346 (if buffer-file-name
1347 (vc-next-action-on-file buffer-file-name verbose)
1348 (error "Buffer %s is not associated with a file" (buffer-name)))))
1350 ;; These functions help the vc-next-action entry point
1352 ;;;###autoload
1353 (defun vc-register (&optional set-version comment)
1354 "Register the current file into a version control system.
1355 With prefix argument SET-VERSION, allow user to specify initial version
1356 level. If COMMENT is present, use that as an initial comment.
1358 The version control system to use is found by cycling through the list
1359 `vc-handled-backends'. The first backend in that list which declares
1360 itself responsible for the file (usually because other files in that
1361 directory are already registered under that backend) will be used to
1362 register the file. If no backend declares itself responsible, the
1363 first backend that could register the file is used."
1364 (interactive "P")
1365 (unless buffer-file-name (error "No visited file"))
1366 (when (vc-backend buffer-file-name)
1367 (if (vc-registered buffer-file-name)
1368 (error "This file is already registered")
1369 (unless (y-or-n-p "Previous master file has vanished. Make a new one? ")
1370 (error "Aborted"))))
1371 ;; Watch out for new buffers of size 0: the corresponding file
1372 ;; does not exist yet, even though buffer-modified-p is nil.
1373 (if (and (not (buffer-modified-p))
1374 (zerop (buffer-size))
1375 (not (file-exists-p buffer-file-name)))
1376 (set-buffer-modified-p t))
1377 (vc-buffer-sync)
1379 (vc-start-entry buffer-file-name
1380 (if set-version
1381 (read-string (format "Initial version level for %s: "
1382 (buffer-name)))
1383 (let ((backend (vc-responsible-backend buffer-file-name)))
1384 (if (vc-find-backend-function backend 'init-version)
1385 (vc-call-backend backend 'init-version)
1386 vc-default-init-version)))
1387 (or comment (not vc-initial-comment))
1389 "Enter initial comment."
1390 (lambda (file rev comment)
1391 (message "Registering %s... " file)
1392 (let ((backend (vc-responsible-backend file t)))
1393 (vc-file-clearprops file)
1394 (vc-call-backend backend 'register file rev comment)
1395 (vc-file-setprop file 'vc-backend backend)
1396 (unless vc-make-backup-files
1397 (make-local-variable 'backup-inhibited)
1398 (setq backup-inhibited t)))
1399 (message "Registering %s... done" file))))
1402 (defun vc-responsible-backend (file &optional register)
1403 "Return the name of a backend system that is responsible for FILE.
1404 The optional argument REGISTER means that a backend suitable for
1405 registration should be found.
1407 If REGISTER is nil, then if FILE is already registered, return the
1408 backend of FILE. If FILE is not registered, or a directory, then the
1409 first backend in `vc-handled-backends' that declares itself
1410 responsible for FILE is returned. If no backend declares itself
1411 responsible, return the first backend.
1413 If REGISTER is non-nil, return the first responsible backend under
1414 which FILE is not yet registered. If there is no such backend, return
1415 the first backend under which FILE is not yet registered, but could
1416 be registered."
1417 (if (not vc-handled-backends)
1418 (error "No handled backends"))
1419 (or (and (not (file-directory-p file)) (not register) (vc-backend file))
1420 (catch 'found
1421 ;; First try: find a responsible backend. If this is for registration,
1422 ;; it must be a backend under which FILE is not yet registered.
1423 (dolist (backend vc-handled-backends)
1424 (and (or (not register)
1425 (not (vc-call-backend backend 'registered file)))
1426 (vc-call-backend backend 'responsible-p file)
1427 (throw 'found backend)))
1428 ;; no responsible backend
1429 (if (not register)
1430 ;; if this is not for registration, the first backend must do
1431 (car vc-handled-backends)
1432 ;; for registration, we need to find a new backend that
1433 ;; could register FILE
1434 (dolist (backend vc-handled-backends)
1435 (and (not (vc-call-backend backend 'registered file))
1436 (vc-call-backend backend 'could-register file)
1437 (throw 'found backend)))
1438 (error "No backend that could register")))))
1440 (defun vc-default-responsible-p (backend file)
1441 "Indicate whether BACKEND is reponsible for FILE.
1442 The default is to return nil always."
1443 nil)
1445 (defun vc-default-could-register (backend file)
1446 "Return non-nil if BACKEND could be used to register FILE.
1447 The default implementation returns t for all files."
1450 (defun vc-resynch-window (file &optional keep noquery)
1451 "If FILE is in the current buffer, either revert or unvisit it.
1452 The choice between revert (to see expanded keywords) and unvisit depends on
1453 `vc-keep-workfiles'. NOQUERY if non-nil inhibits confirmation for
1454 reverting. NOQUERY should be t *only* if it is known the only
1455 difference between the buffer and the file is due to version control
1456 rather than user editing!"
1457 (and (string= buffer-file-name file)
1458 (if keep
1459 (progn
1460 (vc-revert-buffer1 t noquery)
1461 ;; TODO: Adjusting view mode might no longer be necessary
1462 ;; after RMS change to files.el of 1999-08-08. Investigate
1463 ;; this when we install the new VC.
1464 (and view-read-only
1465 (if (file-writable-p file)
1466 (and view-mode
1467 (let ((view-old-buffer-read-only nil))
1468 (view-mode-exit)))
1469 (and (not view-mode)
1470 (not (eq (get major-mode 'mode-class) 'special))
1471 (view-mode-enter))))
1472 (vc-mode-line buffer-file-name))
1473 (kill-buffer (current-buffer)))))
1475 (defun vc-resynch-buffer (file &optional keep noquery)
1476 "If FILE is currently visited, resynch its buffer."
1477 (if (string= buffer-file-name file)
1478 (vc-resynch-window file keep noquery)
1479 (let ((buffer (get-file-buffer file)))
1480 (if buffer
1481 (with-current-buffer buffer
1482 (vc-resynch-window file keep noquery)))))
1483 (vc-dired-resynch-file file))
1485 (defun vc-start-entry (file rev comment initial-contents msg action &optional after-hook)
1486 "Accept a comment for an operation on FILE revision REV.
1487 If COMMENT is nil, pop up a VC-log buffer, emit MSG, and set the
1488 action on close to ACTION. If COMMENT is a string and
1489 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial
1490 contents of the log entry buffer. If COMMENT is a string and
1491 INITIAL-CONTENTS is nil, do action immediately as if the user had
1492 entered COMMENT. If COMMENT is t, also do action immediately with an
1493 empty comment. Remember the file's buffer in `vc-parent-buffer'
1494 \(current one if no file). AFTER-HOOK specifies the local value
1495 for vc-log-operation-hook."
1496 (let ((parent (or (and file (get-file-buffer file)) (current-buffer))))
1497 (if vc-before-checkin-hook
1498 (if file
1499 (with-current-buffer parent
1500 (run-hooks 'vc-before-checkin-hook))
1501 (run-hooks 'vc-before-checkin-hook)))
1502 (if (and comment (not initial-contents))
1503 (set-buffer (get-buffer-create "*VC-log*"))
1504 (pop-to-buffer (get-buffer-create "*VC-log*")))
1505 (set (make-local-variable 'vc-parent-buffer) parent)
1506 (set (make-local-variable 'vc-parent-buffer-name)
1507 (concat " from " (buffer-name vc-parent-buffer)))
1508 (if file (vc-mode-line file))
1509 (vc-log-edit file)
1510 (make-local-variable 'vc-log-after-operation-hook)
1511 (if after-hook
1512 (setq vc-log-after-operation-hook after-hook))
1513 (setq vc-log-operation action)
1514 (setq vc-log-version rev)
1515 (when comment
1516 (erase-buffer)
1517 (when (stringp comment) (insert comment)))
1518 (if (or (not comment) initial-contents)
1519 (message "%s Type C-c C-c when done" msg)
1520 (vc-finish-logentry (eq comment t)))))
1522 (defun vc-checkout (file &optional writable rev)
1523 "Retrieve a copy of the revision REV of FILE.
1524 If WRITABLE is non-nil, make sure the retrieved file is writable.
1525 REV defaults to the latest revision.
1527 After check-out, runs the normal hook `vc-checkout-hook'."
1528 (and writable
1529 (not rev)
1530 (vc-call make-version-backups-p file)
1531 (vc-up-to-date-p file)
1532 (vc-make-version-backup file))
1533 (with-vc-properties
1534 file
1535 (condition-case err
1536 (vc-call checkout file writable rev)
1537 (file-error
1538 ;; Maybe the backend is not installed ;-(
1539 (when writable
1540 (let ((buf (get-file-buffer file)))
1541 (when buf (with-current-buffer buf (toggle-read-only -1)))))
1542 (signal (car err) (cdr err))))
1543 `((vc-state . ,(if (or (eq (vc-checkout-model file) 'implicit)
1544 (not writable))
1545 (if (vc-call latest-on-branch-p file)
1546 'up-to-date
1547 'needs-patch)
1548 'edited))
1549 (vc-checkout-time . ,(nth 5 (file-attributes file)))))
1550 (vc-resynch-buffer file t t)
1551 (run-hooks 'vc-checkout-hook))
1553 (defun vc-steal-lock (file rev owner)
1554 "Steal the lock on FILE."
1555 (let (file-description)
1556 (if rev
1557 (setq file-description (format "%s:%s" file rev))
1558 (setq file-description file))
1559 (if (not (yes-or-no-p (format "Steal the lock on %s from %s? "
1560 file-description owner)))
1561 (error "Steal canceled"))
1562 (message "Stealing lock on %s..." file)
1563 (with-vc-properties
1564 file
1565 (vc-call steal-lock file rev)
1566 `((vc-state . edited)))
1567 (vc-resynch-buffer file t t)
1568 (message "Stealing lock on %s...done" file)
1569 ;; Write mail after actually stealing, because if the stealing
1570 ;; goes wrong, we don't want to send any mail.
1571 (compose-mail owner (format "Stolen lock on %s" file-description))
1572 (setq default-directory (expand-file-name "~/"))
1573 (goto-char (point-max))
1574 (insert
1575 (format "I stole the lock on %s, " file-description)
1576 (current-time-string)
1577 ".\n")
1578 (message "Please explain why you stole the lock. Type C-c C-c when done.")))
1580 (defun vc-checkin (file &optional rev comment initial-contents)
1581 "Check in FILE.
1582 The optional argument REV may be a string specifying the new version
1583 level (if nil increment the current level). COMMENT is a comment
1584 string; if omitted, a buffer is popped up to accept a comment. If
1585 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial contents
1586 of the log entry buffer.
1588 If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided
1589 that the version control system supports this mode of operation.
1591 Runs the normal hook `vc-checkin-hook'."
1592 (vc-start-entry
1593 file rev comment initial-contents
1594 "Enter a change comment."
1595 (lambda (file rev comment)
1596 (message "Checking in %s..." file)
1597 ;; "This log message intentionally left almost blank".
1598 ;; RCS 5.7 gripes about white-space-only comments too.
1599 (or (and comment (string-match "[^\t\n ]" comment))
1600 (setq comment "*** empty log message ***"))
1601 (with-vc-properties
1602 file
1603 ;; Change buffers to get local value of vc-checkin-switches.
1604 (with-current-buffer (or (get-file-buffer file) (current-buffer))
1605 (progn
1606 (vc-call checkin file rev comment)
1607 (vc-delete-automatic-version-backups file)))
1608 `((vc-state . up-to-date)
1609 (vc-checkout-time . ,(nth 5 (file-attributes file)))
1610 (vc-workfile-version . nil)))
1611 (message "Checking in %s...done" file))
1612 'vc-checkin-hook))
1614 (defun vc-finish-logentry (&optional nocomment)
1615 "Complete the operation implied by the current log entry.
1616 Use the contents of the current buffer as a check-in or registration
1617 comment. If the optional arg NOCOMMENT is non-nil, then don't check
1618 the buffer contents as a comment."
1619 (interactive)
1620 ;; Check and record the comment, if any.
1621 (unless nocomment
1622 ;; Comment too long?
1623 (vc-call-backend (or (and vc-log-file (vc-backend vc-log-file))
1624 (vc-responsible-backend default-directory))
1625 'logentry-check)
1626 (run-hooks 'vc-logentry-check-hook))
1627 ;; Sync parent buffer in case the user modified it while editing the comment.
1628 ;; But not if it is a vc-dired buffer.
1629 (with-current-buffer vc-parent-buffer
1630 (or vc-dired-mode (vc-buffer-sync)))
1631 (if (not vc-log-operation) (error "No log operation is pending"))
1632 ;; save the parameters held in buffer-local variables
1633 (let ((log-operation vc-log-operation)
1634 (log-file vc-log-file)
1635 (log-version vc-log-version)
1636 (log-entry (buffer-string))
1637 (after-hook vc-log-after-operation-hook)
1638 (tmp-vc-parent-buffer vc-parent-buffer))
1639 (pop-to-buffer vc-parent-buffer)
1640 ;; OK, do it to it
1641 (save-excursion
1642 (funcall log-operation
1643 log-file
1644 log-version
1645 log-entry))
1646 ;; Remove checkin window (after the checkin so that if that fails
1647 ;; we don't zap the *VC-log* buffer and the typing therein).
1648 (let ((logbuf (get-buffer "*VC-log*")))
1649 (cond ((and logbuf vc-delete-logbuf-window)
1650 (delete-windows-on logbuf (selected-frame))
1651 ;; Kill buffer and delete any other dedicated windows/frames.
1652 (kill-buffer logbuf))
1653 (logbuf (pop-to-buffer "*VC-log*")
1654 (bury-buffer)
1655 (pop-to-buffer tmp-vc-parent-buffer))))
1656 ;; Now make sure we see the expanded headers
1657 (if log-file
1658 (vc-resynch-buffer log-file vc-keep-workfiles t))
1659 (if vc-dired-mode
1660 (dired-move-to-filename))
1661 (run-hooks after-hook 'vc-finish-logentry-hook)))
1663 ;; Code for access to the comment ring
1665 ;; Additional entry points for examining version histories
1667 ;;;###autoload
1668 (defun vc-diff (historic &optional not-urgent)
1669 "Display diffs between file versions.
1670 Normally this compares the current file and buffer with the most
1671 recent checked in version of that file. This uses no arguments. With
1672 a prefix argument HISTORIC, it reads the file name to use and two
1673 version designators specifying which versions to compare. The
1674 optional argument NOT-URGENT non-nil means it is ok to say no to
1675 saving the buffer."
1676 (interactive (list current-prefix-arg t))
1677 (if historic
1678 (call-interactively 'vc-version-diff)
1679 (vc-ensure-vc-buffer)
1680 (let ((file buffer-file-name))
1681 (vc-buffer-sync not-urgent)
1682 (if (vc-workfile-unchanged-p buffer-file-name)
1683 (message "No changes to %s since latest version" file)
1684 (vc-version-diff file nil nil)))))
1686 (defun vc-version-diff (file rev1 rev2)
1687 "List the differences between FILE's versions REV1 and REV2.
1688 If REV1 is empty or nil it means to use the current workfile version;
1689 REV2 empty or nil means the current file contents. FILE may also be
1690 a directory, in that case, generate diffs between the correponding
1691 versions of all registered files in or below it."
1692 (interactive
1693 (let ((file (expand-file-name
1694 (read-file-name (if buffer-file-name
1695 "File or dir to diff: (default visited file) "
1696 "File or dir to diff: ")
1697 default-directory buffer-file-name t)))
1698 (rev1-default nil) (rev2-default nil))
1699 ;; compute default versions based on the file state
1700 (cond
1701 ;; if it's a directory, don't supply any version default
1702 ((file-directory-p file)
1703 nil)
1704 ;; if the file is not up-to-date, use current version as older version
1705 ((not (vc-up-to-date-p file))
1706 (setq rev1-default (vc-workfile-version file)))
1707 ;; if the file is not locked, use last and previous version as default
1709 (setq rev1-default (vc-call previous-version file
1710 (vc-workfile-version file)))
1711 (if (string= rev1-default "") (setq rev1-default nil))
1712 (setq rev2-default (vc-workfile-version file))))
1713 ;; construct argument list
1714 (list file
1715 (read-string (if rev1-default
1716 (concat "Older version: (default "
1717 rev1-default ") ")
1718 "Older version: ")
1719 nil nil rev1-default)
1720 (read-string (if rev2-default
1721 (concat "Newer version: (default "
1722 rev2-default ") ")
1723 "Newer version (default: current source): ")
1724 nil nil rev2-default))))
1725 (if (file-directory-p file)
1726 ;; recursive directory diff
1727 (progn
1728 (vc-setup-buffer "*vc-diff*")
1729 (if (string-equal rev1 "") (setq rev1 nil))
1730 (if (string-equal rev2 "") (setq rev2 nil))
1731 (let ((inhibit-read-only t))
1732 (insert "Diffs between "
1733 (or rev1 "last version checked in")
1734 " and "
1735 (or rev2 "current workfile(s)")
1736 ":\n\n"))
1737 (let ((dir (file-name-as-directory file)))
1738 (vc-call-backend (vc-responsible-backend dir)
1739 'diff-tree dir rev1 rev2))
1740 (vc-exec-after `(let ((inhibit-read-only t))
1741 (insert "\nEnd of diffs.\n"))))
1742 ;; Single file diff. It is important that the vc-controlled buffer
1743 ;; is still current at this time, because any local settings in that
1744 ;; buffer should affect the diff command.
1745 (vc-diff-internal file rev1 rev2))
1746 (set-buffer "*vc-diff*")
1747 (if (and (zerop (buffer-size))
1748 (not (get-buffer-process (current-buffer))))
1749 (progn
1750 (if rev1
1751 (if rev2
1752 (message "No changes to %s between %s and %s" file rev1 rev2)
1753 (message "No changes to %s since %s" file rev1))
1754 (message "No changes to %s since latest version" file))
1755 nil)
1756 (pop-to-buffer (current-buffer))
1757 ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's
1758 ;; not available. Work around that.
1759 (if (require 'diff-mode nil t) (diff-mode))
1760 (vc-exec-after '(let ((inhibit-read-only t))
1761 (if (eq (buffer-size) 0)
1762 (insert "No differences found.\n"))
1763 (goto-char (point-min))
1764 (shrink-window-if-larger-than-buffer)))
1767 (defun vc-diff-label (file file-rev rev)
1768 (concat (file-relative-name file)
1769 (format-time-string "\t%d %b %Y %T %z\t"
1770 (nth 5 (file-attributes file-rev)))
1771 rev))
1773 (defun vc-diff-internal (file rev1 rev2)
1774 "Run diff to compare FILE's revisions REV1 and REV2.
1775 Diff output goes to the *vc-diff* buffer. The exit status of the diff
1776 command is returned.
1778 This function takes care to set up a proper coding system for diff output.
1779 If both revisions are available as local files, then it also does not
1780 actually call the backend, but performs a local diff."
1781 (if (or (not rev1) (string-equal rev1 ""))
1782 (setq rev1 (vc-workfile-version file)))
1783 (if (string-equal rev2 "")
1784 (setq rev2 nil))
1785 (let ((file-rev1 (vc-version-backup-file file rev1))
1786 (file-rev2 (if (not rev2)
1787 file
1788 (vc-version-backup-file file rev2)))
1789 (coding-system-for-read (vc-coding-system-for-diff file)))
1790 (if (and file-rev1 file-rev2)
1791 (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
1792 (append (vc-switches nil 'diff)
1793 ;; Provide explicit labels like RCS or CVS would do
1794 ;; so diff-mode refers to `file' rather than to
1795 ;; `file-rev1' when trying to find/apply/undo hunks.
1796 (list "-L" (vc-diff-label file file-rev1 rev1)
1797 "-L" (vc-diff-label file file-rev2 rev2)
1798 (file-relative-name file-rev1)
1799 (file-relative-name file-rev2))))
1800 (vc-call diff file rev1 rev2))))
1803 (defun vc-switches (backend op)
1804 (let ((switches
1805 (or (if backend
1806 (let ((sym (vc-make-backend-sym
1807 backend (intern (concat (symbol-name op)
1808 "-switches")))))
1809 (if (boundp sym) (symbol-value sym))))
1810 (let ((sym (intern (format "vc-%s-switches" (symbol-name op)))))
1811 (if (boundp sym) (symbol-value sym)))
1812 (cond
1813 ((eq op 'diff) diff-switches)))))
1814 (if (stringp switches) (list switches)
1815 ;; If not a list, return nil.
1816 ;; This is so we can set vc-diff-switches to t to override
1817 ;; any switches in diff-switches.
1818 (if (listp switches) switches))))
1820 ;; Old def for compatibility with Emacs-21.[123].
1821 (defmacro vc-diff-switches-list (backend) `(vc-switches ',backend 'diff))
1822 (make-obsolete 'vc-diff-switches-list 'vc-switches "21.4")
1824 (defun vc-default-diff-tree (backend dir rev1 rev2)
1825 "List differences for all registered files at and below DIR.
1826 The meaning of REV1 and REV2 is the same as for `vc-version-diff'."
1827 ;; This implementation does an explicit tree walk, and calls
1828 ;; vc-BACKEND-diff directly for each file. An optimization
1829 ;; would be to use `vc-diff-internal', so that diffs can be local,
1830 ;; and to call it only for files that are actually changed.
1831 ;; However, this is expensive for some backends, and so it is left
1832 ;; to backend-specific implementations.
1833 (setq default-directory dir)
1834 (vc-file-tree-walk
1835 default-directory
1836 (lambda (f)
1837 (vc-exec-after
1838 `(let ((coding-system-for-read (vc-coding-system-for-diff ',f)))
1839 (message "Looking at %s" ',f)
1840 (vc-call-backend ',(vc-backend f)
1841 'diff ',f ',rev1 ',rev2))))))
1843 (defun vc-coding-system-for-diff (file)
1844 "Return the coding system for reading diff output for FILE."
1845 (or coding-system-for-read
1846 ;; if we already have this file open,
1847 ;; use the buffer's coding system
1848 (let ((buf (find-buffer-visiting file)))
1849 (if buf (with-current-buffer buf
1850 buffer-file-coding-system)))
1851 ;; otherwise, try to find one based on the file name
1852 (car (find-operation-coding-system 'insert-file-contents file))
1853 ;; and a final fallback
1854 'undecided))
1856 ;;;###autoload
1857 (defun vc-version-other-window (rev)
1858 "Visit version REV of the current file in another window.
1859 If the current file is named `F', the version is named `F.~REV~'.
1860 If `F.~REV~' already exists, use it instead of checking it out again."
1861 (interactive "sVersion to visit (default is workfile version): ")
1862 (vc-ensure-vc-buffer)
1863 (let* ((file buffer-file-name)
1864 (version (if (string-equal rev "")
1865 (vc-workfile-version file)
1866 rev)))
1867 (switch-to-buffer-other-window (vc-find-version file version))))
1869 (defun vc-find-version (file version)
1870 "Read VERSION of FILE into a buffer and return the buffer."
1871 (let ((automatic-backup (vc-version-backup-file-name file version))
1872 (filebuf (or (get-file-buffer file) (current-buffer)))
1873 (filename (vc-version-backup-file-name file version 'manual)))
1874 (unless (file-exists-p filename)
1875 (if (file-exists-p automatic-backup)
1876 (rename-file automatic-backup filename nil)
1877 (message "Checking out %s..." filename)
1878 (with-current-buffer filebuf
1879 (let ((failed t))
1880 (unwind-protect
1881 (let ((coding-system-for-read 'no-conversion)
1882 (coding-system-for-write 'no-conversion))
1883 (with-temp-file filename
1884 (let ((outbuf (current-buffer)))
1885 ;; Change buffer to get local value of
1886 ;; vc-checkout-switches.
1887 (with-current-buffer filebuf
1888 (vc-call find-version file version outbuf))))
1889 (setq failed nil))
1890 (if (and failed (file-exists-p filename))
1891 (delete-file filename))))
1892 (vc-mode-line file))
1893 (message "Checking out %s...done" filename)))
1894 (find-file-noselect filename)))
1896 (defun vc-default-find-version (backend file rev buffer)
1897 "Provide the new `find-version' op based on the old `checkout' op.
1898 This is only for compatibility with old backends. They should be updated
1899 to provide the `find-version' operation instead."
1900 (let ((tmpfile (make-temp-file (expand-file-name file))))
1901 (unwind-protect
1902 (progn
1903 (vc-call-backend backend 'checkout file nil rev tmpfile)
1904 (with-current-buffer buffer
1905 (insert-file-contents-literally tmpfile)))
1906 (delete-file tmpfile))))
1908 ;; Header-insertion code
1910 ;;;###autoload
1911 (defun vc-insert-headers ()
1912 "Insert headers into a file for use with a version control system.
1913 Headers desired are inserted at point, and are pulled from
1914 the variable `vc-BACKEND-header'."
1915 (interactive)
1916 (vc-ensure-vc-buffer)
1917 (save-excursion
1918 (save-restriction
1919 (widen)
1920 (if (or (not (vc-check-headers))
1921 (y-or-n-p "Version headers already exist. Insert another set? "))
1922 (progn
1923 (let* ((delims (cdr (assq major-mode vc-comment-alist)))
1924 (comment-start-vc (or (car delims) comment-start "#"))
1925 (comment-end-vc (or (car (cdr delims)) comment-end ""))
1926 (hdsym (vc-make-backend-sym (vc-backend buffer-file-name)
1927 'header))
1928 (hdstrings (and (boundp hdsym) (symbol-value hdsym))))
1929 (mapcar (lambda (s)
1930 (insert comment-start-vc "\t" s "\t"
1931 comment-end-vc "\n"))
1932 hdstrings)
1933 (if vc-static-header-alist
1934 (mapcar (lambda (f)
1935 (if (string-match (car f) buffer-file-name)
1936 (insert (format (cdr f) (car hdstrings)))))
1937 vc-static-header-alist))
1939 )))))
1941 (defun vc-clear-headers (&optional file)
1942 "Clear all version headers in the current buffer (or FILE).
1943 The headers are reset to their non-expanded form."
1944 (let* ((filename (or file buffer-file-name))
1945 (visited (find-buffer-visiting filename))
1946 (backend (vc-backend filename)))
1947 (when (vc-find-backend-function backend 'clear-headers)
1948 (if visited
1949 (let ((context (vc-buffer-context)))
1950 ;; save-excursion may be able to relocate point and mark
1951 ;; properly. If it fails, vc-restore-buffer-context
1952 ;; will give it a second try.
1953 (save-excursion
1954 (vc-call-backend backend 'clear-headers))
1955 (vc-restore-buffer-context context))
1956 (set-buffer (find-file-noselect filename))
1957 (vc-call-backend backend 'clear-headers)
1958 (kill-buffer filename)))))
1960 ;;;###autoload
1961 (defun vc-merge ()
1962 "Merge changes between two versions into the current buffer's file.
1963 This asks for two versions to merge from in the minibuffer. If the
1964 first version is a branch number, then merge all changes from that
1965 branch. If the first version is empty, merge news, i.e. recent changes
1966 from the current branch.
1968 See Info node `Merging'."
1969 (interactive)
1970 (vc-ensure-vc-buffer)
1971 (vc-buffer-sync)
1972 (let* ((file buffer-file-name)
1973 (backend (vc-backend file))
1974 (state (vc-state file))
1975 first-version second-version status)
1976 (cond
1977 ((stringp state)
1978 (error "File is locked by %s" state))
1979 ((not (vc-editable-p file))
1980 (if (y-or-n-p
1981 "File must be checked out for merging. Check out now? ")
1982 (vc-checkout file t)
1983 (error "Merge aborted"))))
1984 (setq first-version
1985 (read-string (concat "Branch or version to merge from "
1986 "(default: news on current branch): ")))
1987 (if (string= first-version "")
1988 (if (not (vc-find-backend-function backend 'merge-news))
1989 (error "Sorry, merging news is not implemented for %s" backend)
1990 (setq status (vc-call merge-news file)))
1991 (if (not (vc-find-backend-function backend 'merge))
1992 (error "Sorry, merging is not implemented for %s" backend)
1993 (if (not (vc-branch-p first-version))
1994 (setq second-version
1995 (read-string "Second version: "
1996 (concat (vc-branch-part first-version) ".")))
1997 ;; We want to merge an entire branch. Set versions
1998 ;; accordingly, so that vc-BACKEND-merge understands us.
1999 (setq second-version first-version)
2000 ;; first-version must be the starting point of the branch
2001 (setq first-version (vc-branch-part first-version)))
2002 (setq status (vc-call merge file first-version second-version))))
2003 (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE")))
2005 (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
2006 (vc-resynch-buffer file t (not (buffer-modified-p)))
2007 (if (zerop status) (message "Merge successful")
2008 (smerge-mode 1)
2009 (message "File contains conflicts.")))
2011 ;;;###autoload
2012 (defalias 'vc-resolve-conflicts 'smerge-ediff)
2014 ;; The VC directory major mode. Coopt Dired for this.
2015 ;; All VC commands get mapped into logical equivalents.
2017 (defvar vc-dired-switches)
2018 (defvar vc-dired-terse-mode)
2020 (defvar vc-dired-mode-map
2021 (let ((map (make-sparse-keymap))
2022 (vmap (make-sparse-keymap)))
2023 (define-key map "\C-xv" vmap)
2024 (define-key map "v" vmap)
2025 (set-keymap-parent vmap vc-prefix-map)
2026 (define-key vmap "t" 'vc-dired-toggle-terse-mode)
2027 map))
2029 (define-derived-mode vc-dired-mode dired-mode "Dired under VC"
2030 "The major mode used in VC directory buffers.
2032 It works like Dired, but lists only files under version control, with
2033 the current VC state of each file being indicated in the place of the
2034 file's link count, owner, group and size. Subdirectories are also
2035 listed, and you may insert them into the buffer as desired, like in
2036 Dired.
2038 All Dired commands operate normally, with the exception of `v', which
2039 is redefined as the version control prefix, so that you can type
2040 `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on
2041 the file named in the current Dired buffer line. `vv' invokes
2042 `vc-next-action' on this file, or on all files currently marked.
2043 There is a special command, `*l', to mark all files currently locked."
2044 ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20.
2045 ;; We do it here because dired might not be loaded yet
2046 ;; when vc-dired-mode-map is initialized.
2047 (set-keymap-parent vc-dired-mode-map dired-mode-map)
2048 (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t)
2049 ;; The following is slightly modified from dired.el,
2050 ;; because file lines look a bit different in vc-dired-mode
2051 ;; (the column before the date does not end in a digit).
2052 (set (make-local-variable 'dired-move-to-filename-regexp)
2053 (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
2054 ;; In some locales, month abbreviations are as short as 2 letters,
2055 ;; and they can be followed by ".".
2056 (month (concat l l "+\\.?"))
2057 (s " ")
2058 (yyyy "[0-9][0-9][0-9][0-9]")
2059 (dd "[ 0-3][0-9]")
2060 (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
2061 (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
2062 (zone "[-+][0-2][0-9][0-5][0-9]")
2063 (iso-mm-dd "[01][0-9]-[0-3][0-9]")
2064 (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
2065 (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
2066 "\\|" yyyy "-" iso-mm-dd "\\)"))
2067 (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
2068 s "+"
2069 "\\(" HH:MM "\\|" yyyy "\\)"))
2070 (western-comma (concat month s "+" dd "," s "+" yyyy))
2071 ;; Japanese MS-Windows ls-lisp has one-digit months, and
2072 ;; omits the Kanji characters after month and day-of-month.
2073 (mm "[ 0-1]?[0-9]")
2074 (japanese
2075 (concat mm l "?" s dd l "?" s "+"
2076 "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
2077 ;; the .* below ensures that we find the last match on a line
2078 (concat ".*" s
2079 "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)"
2080 s "+")))
2081 (and (boundp 'vc-dired-switches)
2082 vc-dired-switches
2083 (set (make-local-variable 'dired-actual-switches)
2084 vc-dired-switches))
2085 (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display)
2086 (setq vc-dired-mode t))
2088 (defun vc-dired-toggle-terse-mode ()
2089 "Toggle terse display in VC Dired."
2090 (interactive)
2091 (if (not vc-dired-mode)
2093 (setq vc-dired-terse-mode (not vc-dired-terse-mode))
2094 (if vc-dired-terse-mode
2095 (vc-dired-hook)
2096 (revert-buffer))))
2098 (defun vc-dired-mark-locked ()
2099 "Mark all files currently locked."
2100 (interactive)
2101 (dired-mark-if (let ((f (dired-get-filename nil t)))
2102 (and f
2103 (not (file-directory-p f))
2104 (not (vc-up-to-date-p f))))
2105 "locked file"))
2107 (define-key vc-dired-mode-map "*l" 'vc-dired-mark-locked)
2109 (defun vc-default-dired-state-info (backend file)
2110 (let ((state (vc-state file)))
2111 (cond
2112 ((stringp state) (concat "(" state ")"))
2113 ((eq state 'edited) (concat "(" (vc-user-login-name) ")"))
2114 ((eq state 'needs-merge) "(merge)")
2115 ((eq state 'needs-patch) "(patch)")
2116 ((eq state 'unlocked-changes) "(stale)"))))
2118 (defun vc-dired-reformat-line (vc-info)
2119 "Reformat a directory-listing line.
2120 Replace various columns with version control information, VC-INFO.
2121 This code, like dired, assumes UNIX -l format."
2122 (beginning-of-line)
2123 (when (re-search-forward
2124 ;; Match link count, owner, group, size. Group may be missing,
2125 ;; and only the size is present in OS/2 -l format.
2126 "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) "
2127 (line-end-position) t)
2128 (replace-match (substring (concat vc-info " ") 0 10)
2129 t t nil 1)))
2131 (defun vc-dired-hook ()
2132 "Reformat the listing according to version control.
2133 Called by dired after any portion of a vc-dired buffer has been read in."
2134 (message "Getting version information... ")
2135 (let (subdir filename (buffer-read-only nil))
2136 (goto-char (point-min))
2137 (while (not (eobp))
2138 (cond
2139 ;; subdir header line
2140 ((setq subdir (dired-get-subdir))
2141 ;; if the backend supports it, get the state
2142 ;; of all files in this directory at once
2143 (let ((backend (vc-responsible-backend subdir)))
2144 (if (vc-find-backend-function backend 'dir-state)
2145 (vc-call-backend backend 'dir-state subdir)))
2146 (forward-line 1)
2147 ;; erase (but don't remove) the "total" line
2148 (delete-region (point) (line-end-position))
2149 (beginning-of-line)
2150 (forward-line 1))
2151 ;; file line
2152 ((setq filename (dired-get-filename nil t))
2153 (cond
2154 ;; subdir
2155 ((file-directory-p filename)
2156 (cond
2157 ((member (file-name-nondirectory filename)
2158 vc-directory-exclusion-list)
2159 (let ((pos (point)))
2160 (dired-kill-tree filename)
2161 (goto-char pos)
2162 (dired-kill-line)))
2163 (vc-dired-terse-mode
2164 ;; Don't show directories in terse mode. Don't use
2165 ;; dired-kill-line to remove it, because in recursive listings,
2166 ;; that would remove the directory contents as well.
2167 (delete-region (line-beginning-position)
2168 (progn (forward-line 1) (point))))
2169 ((string-match "\\`\\.\\.?\\'" (file-name-nondirectory filename))
2170 (dired-kill-line))
2172 (vc-dired-reformat-line nil)
2173 (forward-line 1))))
2174 ;; ordinary file
2175 ((and (vc-backend filename)
2176 (not (and vc-dired-terse-mode
2177 (vc-up-to-date-p filename))))
2178 (vc-dired-reformat-line (vc-call dired-state-info filename))
2179 (forward-line 1))
2181 (dired-kill-line))))
2182 ;; any other line
2183 (t (forward-line 1))))
2184 (vc-dired-purge))
2185 (message "Getting version information... done")
2186 (save-restriction
2187 (widen)
2188 (cond ((eq (count-lines (point-min) (point-max)) 1)
2189 (goto-char (point-min))
2190 (message "No files locked under %s" default-directory)))))
2192 (defun vc-dired-purge ()
2193 "Remove empty subdirs."
2194 (goto-char (point-min))
2195 (while (dired-get-subdir)
2196 (forward-line 2)
2197 (if (dired-get-filename nil t)
2198 (if (not (dired-next-subdir 1 t))
2199 (goto-char (point-max)))
2200 (forward-line -2)
2201 (if (not (string= (dired-current-directory) default-directory))
2202 (dired-do-kill-lines t "")
2203 ;; We cannot remove the top level directory.
2204 ;; Just make it look a little nicer.
2205 (forward-line 1)
2206 (or (eobp) (kill-line))
2207 (if (not (dired-next-subdir 1 t))
2208 (goto-char (point-max))))))
2209 (goto-char (point-min)))
2211 (defun vc-dired-buffers-for-dir (dir)
2212 "Return a list of all vc-dired buffers that currently display DIR."
2213 (let (result)
2214 ;; Check whether dired is loaded.
2215 (when (fboundp 'dired-buffers-for-dir)
2216 (mapcar (lambda (buffer)
2217 (with-current-buffer buffer
2218 (if vc-dired-mode
2219 (setq result (append result (list buffer))))))
2220 (dired-buffers-for-dir dir)))
2221 result))
2223 (defun vc-dired-resynch-file (file)
2224 "Update the entries for FILE in any VC Dired buffers that list it."
2225 (let ((buffers (vc-dired-buffers-for-dir (file-name-directory file))))
2226 (when buffers
2227 (mapcar (lambda (buffer)
2228 (with-current-buffer buffer
2229 (if (dired-goto-file file)
2230 ;; bind vc-dired-terse-mode to nil so that
2231 ;; files won't vanish when they are checked in
2232 (let ((vc-dired-terse-mode nil))
2233 (dired-do-redisplay 1)))))
2234 buffers))))
2236 ;;;###autoload
2237 (defun vc-directory (dir read-switches)
2238 "Create a buffer in VC Dired Mode for directory DIR.
2240 See Info node `VC Dired Mode'.
2242 With prefix arg READ-SWITCHES, specify a value to override
2243 `dired-listing-switches' when generating the listing."
2244 (interactive "DDired under VC (directory): \nP")
2245 (let ((vc-dired-switches (concat vc-dired-listing-switches
2246 (if vc-dired-recurse "R" ""))))
2247 (if read-switches
2248 (setq vc-dired-switches
2249 (read-string "Dired listing switches: "
2250 vc-dired-switches)))
2251 (require 'dired)
2252 (require 'dired-aux)
2253 (switch-to-buffer
2254 (dired-internal-noselect (expand-file-name (file-name-as-directory dir))
2255 vc-dired-switches
2256 'vc-dired-mode))))
2259 ;; Named-configuration entry points
2261 (defun vc-snapshot-precondition (dir)
2262 "Scan the tree below DIR, looking for files not up-to-date.
2263 If any file is not up-to-date, return the name of the first such file.
2264 \(This means, neither snapshot creation nor retrieval is allowed.\)
2265 If one or more of the files are currently visited, return `visited'.
2266 Otherwise, return nil."
2267 (let ((status nil))
2268 (catch 'vc-locked-example
2269 (vc-file-tree-walk
2271 (lambda (f)
2272 (if (not (vc-up-to-date-p f)) (throw 'vc-locked-example f)
2273 (if (get-file-buffer f) (setq status 'visited)))))
2274 status)))
2276 ;;;###autoload
2277 (defun vc-create-snapshot (dir name branchp)
2278 "Descending recursively from DIR, make a snapshot called NAME.
2279 For each registered file, the version level of its latest version
2280 becomes part of the named configuration. If the prefix argument
2281 BRANCHP is given, the snapshot is made as a new branch and the files
2282 are checked out in that new branch."
2283 (interactive
2284 (list (read-file-name "Directory: " default-directory default-directory t)
2285 (read-string "New snapshot name: ")
2286 current-prefix-arg))
2287 (message "Making %s... " (if branchp "branch" "snapshot"))
2288 (if (file-directory-p dir) (setq dir (file-name-as-directory dir)))
2289 (vc-call-backend (vc-responsible-backend dir)
2290 'create-snapshot dir name branchp)
2291 (message "Making %s... done" (if branchp "branch" "snapshot")))
2293 (defun vc-default-create-snapshot (backend dir name branchp)
2294 (when branchp
2295 (error "VC backend %s does not support module branches" backend))
2296 (let ((result (vc-snapshot-precondition dir)))
2297 (if (stringp result)
2298 (error "File %s is not up-to-date" result)
2299 (vc-file-tree-walk
2301 (lambda (f)
2302 (vc-call assign-name f name))))))
2304 ;;;###autoload
2305 (defun vc-retrieve-snapshot (dir name)
2306 "Descending recursively from DIR, retrieve the snapshot called NAME.
2307 If NAME is empty, it refers to the latest versions.
2308 If locking is used for the files in DIR, then there must not be any
2309 locked files at or below DIR (but if NAME is empty, locked files are
2310 allowed and simply skipped)."
2311 (interactive
2312 (list (read-file-name "Directory: " default-directory default-directory t)
2313 (read-string "Snapshot name to retrieve (default latest versions): ")))
2314 (let ((update (yes-or-no-p "Update any affected buffers? "))
2315 (msg (if (or (not name) (string= name ""))
2316 (format "Updating %s... " (abbreviate-file-name dir))
2317 (format "Retrieving snapshot into %s... "
2318 (abbreviate-file-name dir)))))
2319 (message msg)
2320 (vc-call-backend (vc-responsible-backend dir)
2321 'retrieve-snapshot dir name update)
2322 (message (concat msg "done"))))
2324 (defun vc-default-retrieve-snapshot (backend dir name update)
2325 (if (string= name "")
2326 (progn
2327 (vc-file-tree-walk
2329 (lambda (f) (and
2330 (vc-up-to-date-p f)
2331 (vc-error-occurred
2332 (vc-call checkout f nil "")
2333 (if update (vc-resynch-buffer f t t)))))))
2334 (let ((result (vc-snapshot-precondition dir)))
2335 (if (stringp result)
2336 (error "File %s is locked" result)
2337 (setq update (and (eq result 'visited) update))
2338 (vc-file-tree-walk
2340 (lambda (f) (vc-error-occurred
2341 (vc-call checkout f nil name)
2342 (if update (vc-resynch-buffer f t t)))))))))
2344 ;; Miscellaneous other entry points
2346 ;;;###autoload
2347 (defun vc-print-log (&optional focus-rev)
2348 "List the change log of the current buffer in a window.
2349 If FOCUS-REV is non-nil, leave the point at that revision."
2350 (interactive)
2351 (vc-ensure-vc-buffer)
2352 (let ((file buffer-file-name))
2353 (or focus-rev (setq focus-rev (vc-workfile-version file)))
2354 ;; Don't switch to the output buffer before running the command,
2355 ;; so that any buffer-local settings in the vc-controlled
2356 ;; buffer can be accessed by the command.
2357 (condition-case err
2358 (progn
2359 (vc-call print-log file "*vc-change-log*")
2360 (set-buffer "*vc-change-log*"))
2361 (wrong-number-of-arguments
2362 ;; If this error came from the above call to print-log, try again
2363 ;; without the optional buffer argument (for backward compatibility).
2364 ;; Otherwise, resignal.
2365 (if (or (not (eq (cadr err)
2366 (indirect-function
2367 (vc-find-backend-function (vc-backend file)
2368 'print-log))))
2369 (not (eq (caddr err) 2)))
2370 (signal (car err) (cdr err))
2371 ;; for backward compatibility
2372 (vc-call print-log file)
2373 (set-buffer "*vc*"))))
2374 (pop-to-buffer (current-buffer))
2375 (log-view-mode)
2376 (vc-exec-after
2377 `(let ((inhibit-read-only t))
2378 (goto-char (point-max)) (forward-line -1)
2379 (while (looking-at "=*\n")
2380 (delete-char (- (match-end 0) (match-beginning 0)))
2381 (forward-line -1))
2382 (goto-char (point-min))
2383 (if (looking-at "[\b\t\n\v\f\r ]+")
2384 (delete-char (- (match-end 0) (match-beginning 0))))
2385 (shrink-window-if-larger-than-buffer)
2386 ;; move point to the log entry for the current version
2387 (vc-call-backend ',(vc-backend file)
2388 'show-log-entry
2389 ',focus-rev)
2390 (set-buffer-modified-p nil)))))
2392 (defun vc-default-show-log-entry (backend rev)
2393 (with-no-warnings
2394 (log-view-goto-rev rev)))
2396 (defun vc-default-comment-history (backend file)
2397 "Return a string with all log entries stored in BACKEND for FILE."
2398 (if (vc-find-backend-function backend 'print-log)
2399 (with-current-buffer "*vc*"
2400 (vc-call print-log file)
2401 (vc-call wash-log file)
2402 (buffer-string))))
2404 (defun vc-default-wash-log (backend file)
2405 "Remove all non-comment information from log output.
2406 This default implementation works for RCS logs; backends should override
2407 it if their logs are not in RCS format."
2408 (let ((separator (concat "^-+\nrevision [0-9.]+\ndate: .*\n"
2409 "\\(branches: .*;\n\\)?"
2410 "\\(\\*\\*\\* empty log message \\*\\*\\*\n\\)?")))
2411 (goto-char (point-max)) (forward-line -1)
2412 (while (looking-at "=*\n")
2413 (delete-char (- (match-end 0) (match-beginning 0)))
2414 (forward-line -1))
2415 (goto-char (point-min))
2416 (if (looking-at "[\b\t\n\v\f\r ]+")
2417 (delete-char (- (match-end 0) (match-beginning 0))))
2418 (goto-char (point-min))
2419 (re-search-forward separator nil t)
2420 (delete-region (point-min) (point))
2421 (while (re-search-forward separator nil t)
2422 (delete-region (match-beginning 0) (match-end 0)))))
2424 ;;;###autoload
2425 (defun vc-revert-buffer ()
2426 "Revert the current buffer's file to the version it was based on.
2427 This asks for confirmation if the buffer contents are not identical
2428 to that version. This function does not automatically pick up newer
2429 changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so."
2430 (interactive)
2431 (vc-ensure-vc-buffer)
2432 ;; Make sure buffer is saved. If the user says `no', abort since
2433 ;; we cannot show the changes and ask for confirmation to discard them.
2434 (vc-buffer-sync nil)
2435 (let ((file buffer-file-name)
2436 ;; This operation should always ask for confirmation.
2437 (vc-suppress-confirm nil)
2438 (obuf (current-buffer))
2439 status)
2440 (if (vc-up-to-date-p file)
2441 (unless (yes-or-no-p "File seems up-to-date. Revert anyway? ")
2442 (error "Revert canceled")))
2443 (unless (vc-workfile-unchanged-p file)
2444 ;; vc-diff selects the new window, which is not what we want:
2445 ;; if the new window is on another frame, that'd require the user
2446 ;; moving her mouse to answer the yes-or-no-p question.
2447 (let ((win (save-selected-window
2448 (setq status (vc-diff nil t)) (selected-window))))
2449 (vc-exec-after `(message nil))
2450 (when status
2451 (unwind-protect
2452 (unless (yes-or-no-p "Discard changes? ")
2453 (error "Revert canceled"))
2454 (select-window win)
2455 (if (one-window-p t)
2456 (if (window-dedicated-p (selected-window))
2457 (make-frame-invisible))
2458 (delete-window))))))
2459 (set-buffer obuf)
2460 ;; Do the reverting
2461 (message "Reverting %s..." file)
2462 (vc-revert-file file)
2463 (message "Reverting %s...done" file)))
2465 ;;;###autoload
2466 (defun vc-update ()
2467 "Update the current buffer's file to the latest version on its branch.
2468 If the file contains no changes, and is not locked, then this simply replaces
2469 the working file with the latest version on its branch. If the file contains
2470 changes, and the backend supports merging news, then any recent changes from
2471 the current branch are merged into the working file."
2472 (interactive)
2473 (vc-ensure-vc-buffer)
2474 (vc-buffer-sync nil)
2475 (let ((file buffer-file-name))
2476 (if (vc-up-to-date-p file)
2477 (vc-checkout file nil "")
2478 (if (eq (vc-checkout-model file) 'locking)
2479 (if (eq (vc-state file) 'edited)
2480 (error
2481 (substitute-command-keys
2482 "File is locked--type \\[vc-revert-buffer] to discard changes"))
2483 (error
2484 (substitute-command-keys
2485 "Unexpected file state (%s)--type \\[vc-next-action] to correct")
2486 (vc-state file)))
2487 (if (not (vc-find-backend-function (vc-backend file) 'merge-news))
2488 (error "Sorry, merging news is not implemented for %s"
2489 (vc-backend file))
2490 (vc-call merge-news file)
2491 (vc-resynch-window file t t))))))
2493 (defun vc-version-backup-file (file &optional rev)
2494 "Return name of backup file for revision REV of FILE.
2495 If version backups should be used for FILE, and there exists
2496 such a backup for REV or the current workfile version of file,
2497 return its name; otherwise return nil."
2498 (when (vc-call make-version-backups-p file)
2499 (let ((backup-file (vc-version-backup-file-name file rev)))
2500 (if (file-exists-p backup-file)
2501 backup-file
2502 ;; there is no automatic backup, but maybe the user made one manually
2503 (setq backup-file (vc-version-backup-file-name file rev 'manual))
2504 (if (file-exists-p backup-file)
2505 backup-file)))))
2507 (defun vc-revert-file (file)
2508 "Revert FILE back to the version it was based on."
2509 (with-vc-properties
2510 file
2511 (let ((backup-file (vc-version-backup-file file)))
2512 (when backup-file
2513 (copy-file backup-file file 'ok-if-already-exists 'keep-date)
2514 (vc-delete-automatic-version-backups file))
2515 (vc-call revert file backup-file))
2516 `((vc-state . up-to-date)
2517 (vc-checkout-time . ,(nth 5 (file-attributes file)))))
2518 (vc-resynch-buffer file t t))
2520 ;;;###autoload
2521 (defun vc-cancel-version (norevert)
2522 "Get rid of most recently checked in version of this file.
2523 A prefix argument NOREVERT means do not revert the buffer afterwards."
2524 (interactive "P")
2525 (vc-ensure-vc-buffer)
2526 (let* ((file buffer-file-name)
2527 (backend (vc-backend file))
2528 (target (vc-workfile-version file)))
2529 (cond
2530 ((not (vc-find-backend-function backend 'cancel-version))
2531 (error "Sorry, canceling versions is not supported under %s" backend))
2532 ((not (vc-call latest-on-branch-p file))
2533 (error "This is not the latest version; VC cannot cancel it"))
2534 ((not (vc-up-to-date-p file))
2535 (error "%s" (substitute-command-keys "File is not up to date; use \\[vc-revert-buffer] to discard changes"))))
2536 (if (null (yes-or-no-p (format "Remove version %s from master? " target)))
2537 (error "Aborted")
2538 (setq norevert (or norevert (not
2539 (yes-or-no-p "Revert buffer to most recent remaining version? "))))
2541 (message "Removing last change from %s..." file)
2542 (with-vc-properties
2543 file
2544 (vc-call cancel-version file norevert)
2545 `((vc-state . ,(if norevert 'edited 'up-to-date))
2546 (vc-checkout-time . ,(if norevert
2548 (nth 5 (file-attributes file))))
2549 (vc-workfile-version . nil)))
2550 (message "Removing last change from %s...done" file)
2552 (cond
2553 (norevert ;; clear version headers and mark the buffer modified
2554 (set-visited-file-name file)
2555 (when (not vc-make-backup-files)
2556 ;; inhibit backup for this buffer
2557 (make-local-variable 'backup-inhibited)
2558 (setq backup-inhibited t))
2559 (setq buffer-read-only nil)
2560 (vc-clear-headers)
2561 (vc-mode-line file)
2562 (vc-dired-resynch-file file))
2563 (t ;; revert buffer to file on disk
2564 (vc-resynch-buffer file t t)))
2565 (message "Version %s has been removed from the master" target))))
2567 ;;;###autoload
2568 (defun vc-switch-backend (file backend)
2569 "Make BACKEND the current version control system for FILE.
2570 FILE must already be registered in BACKEND. The change is not
2571 permanent, only for the current session. This function only changes
2572 VC's perspective on FILE, it does not register or unregister it.
2573 By default, this command cycles through the registered backends.
2574 To get a prompt, use a prefix argument."
2575 (interactive
2576 (list
2577 buffer-file-name
2578 (let ((backend (vc-backend buffer-file-name))
2579 (backends nil))
2580 ;; Find the registered backends.
2581 (dolist (backend vc-handled-backends)
2582 (when (vc-call-backend backend 'registered buffer-file-name)
2583 (push backend backends)))
2584 ;; Find the next backend.
2585 (let ((def (car (delq backend (append (memq backend backends) backends))))
2586 (others (delete backend backends)))
2587 (cond
2588 ((null others) (error "No other backend to switch to"))
2589 (current-prefix-arg
2590 (intern
2591 (upcase
2592 (completing-read
2593 (format "Switch to backend [%s]: " def)
2594 (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends)
2595 nil t nil nil (downcase (symbol-name def))))))
2596 (t def))))))
2597 (unless (eq backend (vc-backend file))
2598 (vc-file-clearprops file)
2599 (vc-file-setprop file 'vc-backend backend)
2600 ;; Force recomputation of the state
2601 (unless (vc-call-backend backend 'registered file)
2602 (vc-file-clearprops file)
2603 (error "%s is not registered in %s" file backend))
2604 (vc-mode-line file)))
2606 ;;;###autoload
2607 (defun vc-transfer-file (file new-backend)
2608 "Transfer FILE to another version control system NEW-BACKEND.
2609 If NEW-BACKEND has a higher precedence than FILE's current backend
2610 \(i.e. it comes earlier in `vc-handled-backends'), then register FILE in
2611 NEW-BACKEND, using the version number from the current backend as the
2612 base level. If NEW-BACKEND has a lower precedence than the current
2613 backend, then commit all changes that were made under the current
2614 backend to NEW-BACKEND, and unregister FILE from the current backend.
2615 \(If FILE is not yet registered under NEW-BACKEND, register it.)"
2616 (let* ((old-backend (vc-backend file))
2617 (edited (memq (vc-state file) '(edited needs-merge)))
2618 (registered (vc-call-backend new-backend 'registered file))
2619 (move
2620 (and registered ; Never move if not registered in new-backend yet.
2621 ;; move if new-backend comes later in vc-handled-backends
2622 (or (memq new-backend (memq old-backend vc-handled-backends))
2623 (y-or-n-p "Final transfer? "))))
2624 (comment nil))
2625 (if (eq old-backend new-backend)
2626 (error "%s is the current backend of %s" new-backend file))
2627 (if registered
2628 (set-file-modes file (logior (file-modes file) 128))
2629 ;; `registered' might have switched under us.
2630 (vc-switch-backend file old-backend)
2631 (let* ((rev (vc-workfile-version file))
2632 (modified-file (and edited (make-temp-file file)))
2633 (unmodified-file (and modified-file (vc-version-backup-file file))))
2634 ;; Go back to the base unmodified file.
2635 (unwind-protect
2636 (progn
2637 (when modified-file
2638 (copy-file file modified-file 'ok-if-already-exists)
2639 ;; If we have a local copy of the unmodified file, handle that
2640 ;; here and not in vc-revert-file because we don't want to
2641 ;; delete that copy -- it is still useful for OLD-BACKEND.
2642 (if unmodified-file
2643 (copy-file unmodified-file file
2644 'ok-if-already-exists 'keep-date)
2645 (if (y-or-n-p "Get base version from master? ")
2646 (vc-revert-file file))))
2647 (vc-call-backend new-backend 'receive-file file rev))
2648 (when modified-file
2649 (vc-switch-backend file new-backend)
2650 (unless (eq (vc-checkout-model file) 'implicit)
2651 (vc-checkout file t nil))
2652 (rename-file modified-file file 'ok-if-already-exists)
2653 (vc-file-setprop file 'vc-checkout-time nil)))))
2654 (when move
2655 (vc-switch-backend file old-backend)
2656 (setq comment (vc-call comment-history file))
2657 (vc-call unregister file))
2658 (vc-switch-backend file new-backend)
2659 (when (or move edited)
2660 (vc-file-setprop file 'vc-state 'edited)
2661 (vc-mode-line file)
2662 (vc-checkin file nil comment (stringp comment)))))
2664 (defun vc-default-unregister (backend file)
2665 "Default implementation of `vc-unregister', signals an error."
2666 (error "Unregistering files is not supported for %s" backend))
2668 (defun vc-default-receive-file (backend file rev)
2669 "Let BACKEND receive FILE from another version control system."
2670 (vc-call-backend backend 'register file rev ""))
2672 (defun vc-rename-master (oldmaster newfile templates)
2673 "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES."
2674 (let* ((dir (file-name-directory (expand-file-name oldmaster)))
2675 (newdir (or (file-name-directory newfile) ""))
2676 (newbase (file-name-nondirectory newfile))
2677 (masters
2678 ;; List of potential master files for `newfile'
2679 (mapcar
2680 (lambda (s) (vc-possible-master s newdir newbase))
2681 templates)))
2682 (if (or (file-symlink-p oldmaster)
2683 (file-symlink-p (file-name-directory oldmaster)))
2684 (error "This is unsafe in the presence of symbolic links"))
2685 (rename-file
2686 oldmaster
2687 (catch 'found
2688 ;; If possible, keep the master file in the same directory.
2689 (dolist (f masters)
2690 (if (and f (string= (file-name-directory (expand-file-name f)) dir))
2691 (throw 'found f)))
2692 ;; If not, just use the first possible place.
2693 (dolist (f masters)
2694 (and f (or (not (setq dir (file-name-directory f)))
2695 (file-directory-p dir))
2696 (throw 'found f)))
2697 (error "New file lacks a version control directory")))))
2699 (defun vc-delete-file (file)
2700 "Delete file and mark it as such in the version control system."
2701 (interactive "fVC delete file: ")
2702 (let ((buf (get-file-buffer file))
2703 (backend (vc-backend file)))
2704 (unless backend
2705 (error "File %s is not under version control"
2706 (file-name-nondirectory file)))
2707 (unless (vc-find-backend-function backend 'delete-file)
2708 (error "Deleting files under %s is not supported in VC" backend))
2709 (if (and buf (buffer-modified-p buf))
2710 (error "Please save files before deleting them"))
2711 (unless (y-or-n-p (format "Really want to delete %s ? "
2712 (file-name-nondirectory file)))
2713 (error "Abort!"))
2714 (unless (or (file-directory-p file) (null make-backup-files))
2715 (with-current-buffer (or buf (find-file-noselect file))
2716 (let ((backup-inhibited nil))
2717 (backup-buffer))))
2718 (vc-call delete-file file)
2719 ;; If the backend hasn't deleted the file itself, let's do it for him.
2720 (if (file-exists-p file) (delete-file file))))
2722 (defun vc-default-rename-file (backend old new)
2723 (condition-case nil
2724 (add-name-to-file old new)
2725 (error (rename-file old new)))
2726 (vc-delete-file old)
2727 (with-current-buffer (find-file-noselect new)
2728 (vc-register)))
2730 ;;;###autoload
2731 (defun vc-rename-file (old new)
2732 "Rename file OLD to NEW, and rename its master file likewise."
2733 (interactive "fVC rename file: \nFRename to: ")
2734 (let ((oldbuf (get-file-buffer old)))
2735 (if (and oldbuf (buffer-modified-p oldbuf))
2736 (error "Please save files before moving them"))
2737 (if (get-file-buffer new)
2738 (error "Already editing new file name"))
2739 (if (file-exists-p new)
2740 (error "New file already exists"))
2741 (let ((state (vc-state old)))
2742 (unless (memq state '(up-to-date edited))
2743 (error "Please %s files before moving them"
2744 (if (stringp state) "check in" "update"))))
2745 (vc-call rename-file old new)
2746 (vc-file-clearprops old)
2747 ;; Move the actual file (unless the backend did it already)
2748 (if (file-exists-p old) (rename-file old new))
2749 ;; ?? Renaming a file might change its contents due to keyword expansion.
2750 ;; We should really check out a new copy if the old copy was precisely equal
2751 ;; to some checked in version. However, testing for this is tricky....
2752 (if oldbuf
2753 (with-current-buffer oldbuf
2754 (let ((buffer-read-only buffer-read-only))
2755 (set-visited-file-name new))
2756 (vc-backend new)
2757 (vc-mode-line new)
2758 (set-buffer-modified-p nil)))))
2760 ;; Only defined in very recent Emacsen
2761 (defvar small-temporary-file-directory nil)
2763 ;;;###autoload
2764 (defun vc-update-change-log (&rest args)
2765 "Find change log file and add entries from recent version control logs.
2766 Normally, find log entries for all registered files in the default
2767 directory.
2769 With prefix arg of \\[universal-argument], only find log entries for the current buffer's file.
2771 With any numeric prefix arg, find log entries for all currently visited
2772 files that are under version control. This puts all the entries in the
2773 log for the default directory, which may not be appropriate.
2775 From a program, any ARGS are assumed to be filenames for which
2776 log entries should be gathered."
2777 (interactive
2778 (cond ((consp current-prefix-arg) ;C-u
2779 (list buffer-file-name))
2780 (current-prefix-arg ;Numeric argument.
2781 (let ((files nil)
2782 (buffers (buffer-list))
2783 file)
2784 (while buffers
2785 (setq file (buffer-file-name (car buffers)))
2786 (and file (vc-backend file)
2787 (setq files (cons file files)))
2788 (setq buffers (cdr buffers)))
2789 files))
2791 ;; Don't supply any filenames to backend; this means
2792 ;; it should find all relevant files relative to
2793 ;; the default-directory.
2794 nil)))
2795 (vc-call-backend (vc-responsible-backend default-directory)
2796 'update-changelog args))
2798 (defun vc-default-update-changelog (backend files)
2799 "Default implementation of update-changelog.
2800 Uses `rcs2log' which only works for RCS and CVS."
2801 ;; FIXME: We (c|sh)ould add support for cvs2cl
2802 (let ((odefault default-directory)
2803 (changelog (find-change-log))
2804 ;; Presumably not portable to non-Unixy systems, along with rcs2log:
2805 (tempfile (make-temp-file
2806 (expand-file-name "vc"
2807 (or small-temporary-file-directory
2808 temporary-file-directory))))
2809 (full-name (or add-log-full-name
2810 (user-full-name)
2811 (user-login-name)
2812 (format "uid%d" (number-to-string (user-uid)))))
2813 (mailing-address (or add-log-mailing-address
2814 user-mail-address)))
2815 (find-file-other-window changelog)
2816 (barf-if-buffer-read-only)
2817 (vc-buffer-sync)
2818 (undo-boundary)
2819 (goto-char (point-min))
2820 (push-mark)
2821 (message "Computing change log entries...")
2822 (message "Computing change log entries... %s"
2823 (unwind-protect
2824 (progn
2825 (setq default-directory odefault)
2826 (if (eq 0 (apply 'call-process
2827 (expand-file-name "rcs2log"
2828 exec-directory)
2829 nil (list t tempfile) nil
2830 "-c" changelog
2831 "-u" (concat (vc-user-login-name)
2832 "\t" full-name
2833 "\t" mailing-address)
2834 (mapcar
2835 (lambda (f)
2836 (file-relative-name
2837 (if (file-name-absolute-p f)
2839 (concat odefault f))))
2840 files)))
2841 "done"
2842 (pop-to-buffer
2843 (set-buffer (get-buffer-create "*vc*")))
2844 (erase-buffer)
2845 (insert-file tempfile)
2846 "failed"))
2847 (setq default-directory (file-name-directory changelog))
2848 (delete-file tempfile)))))
2850 ;; Annotate functionality
2852 ;; Declare globally instead of additional parameter to
2853 ;; temp-buffer-show-function (not possible to pass more than one
2854 ;; parameter). The use of annotate-ratio is deprecated in favor of
2855 ;; annotate-mode, which replaces it with the more sensible "span-to
2856 ;; days", along with autoscaling support.
2857 (defvar vc-annotate-ratio nil "Global variable.")
2858 (defvar vc-annotate-backend nil "Global variable.")
2860 ;; internal buffer-local variables
2861 (defvar vc-annotate-parent-file nil)
2862 (defvar vc-annotate-parent-rev nil)
2863 (defvar vc-annotate-parent-display-mode nil)
2865 (defconst vc-annotate-font-lock-keywords
2866 ;; The fontification is done by vc-annotate-lines instead of font-lock.
2867 '((vc-annotate-lines)))
2869 (defun vc-annotate-get-backend (buffer)
2870 "Return the backend matching \"Annotate\" buffer BUFFER.
2871 Return nil if no match made. Associations are made based on
2872 `vc-annotate-buffers'."
2873 (cdr (assoc buffer vc-annotate-buffers)))
2875 (define-derived-mode vc-annotate-mode fundamental-mode "Annotate"
2876 "Major mode for output buffers of the `vc-annotate' command.
2878 You can use the mode-specific menu to alter the time-span of the used
2879 colors. See variable `vc-annotate-menu-elements' for customizing the
2880 menu items."
2881 (set (make-local-variable 'truncate-lines) t)
2882 (set (make-local-variable 'font-lock-defaults)
2883 '(vc-annotate-font-lock-keywords t))
2884 (view-mode 1)
2885 (vc-annotate-add-menu))
2887 (defun vc-annotate-display-default (&optional ratio)
2888 "Display the output of \\[vc-annotate] using the default color range.
2889 The color range is given by `vc-annotate-color-map', scaled by RATIO
2890 if present. The current time is used as the offset."
2891 (interactive "e")
2892 (message "Redisplaying annotation...")
2893 (vc-annotate-display
2894 (if ratio (vc-annotate-time-span vc-annotate-color-map ratio)))
2895 (message "Redisplaying annotation...done"))
2897 (defun vc-annotate-display-autoscale (&optional full)
2898 "Highlight the output of \\[vc-annotate] using an autoscaled color map.
2899 Autoscaling means that the map is scaled from the current time to the
2900 oldest annotation in the buffer, or, with prefix argument FULL, to
2901 cover the range from the oldest annotation to the newest."
2902 (interactive "P")
2903 (let ((newest 0.0)
2904 (oldest 999999.) ;Any CVS users at the founding of Rome?
2905 (current (vc-annotate-convert-time (current-time)))
2906 date)
2907 (message "Redisplaying annotation...")
2908 ;; Run through this file and find the oldest and newest dates annotated.
2909 (save-excursion
2910 (goto-char (point-min))
2911 (while (setq date (prog1 (vc-call-backend vc-annotate-backend
2912 'annotate-time)
2913 (forward-line 1)))
2914 (if (> date newest)
2915 (setq newest date))
2916 (if (< date oldest)
2917 (setq oldest date))))
2918 (vc-annotate-display
2919 (vc-annotate-time-span ;return the scaled colormap.
2920 vc-annotate-color-map
2921 (/ (- (if full newest current) oldest)
2922 (vc-annotate-car-last-cons vc-annotate-color-map)))
2923 (if full newest))
2924 (message "Redisplaying annotation...done \(%s\)"
2925 (if full
2926 (format "Spanned from %.1f to %.1f days old"
2927 (- current oldest)
2928 (- current newest))
2929 (format "Spanned to %.1f days old" (- current oldest))))))
2931 ;; Menu -- Using easymenu.el
2932 (defun vc-annotate-add-menu ()
2933 "Add the menu 'Annotate' to the menu bar in VC-Annotate mode."
2934 (let ((menu-elements vc-annotate-menu-elements)
2935 (menu-def
2936 '("VC-Annotate"
2937 ["Default" (unless (null vc-annotate-display-mode)
2938 (setq vc-annotate-display-mode nil)
2939 (vc-annotate-display-select))
2940 :style toggle :selected (null vc-annotate-display-mode)]))
2941 (oldest-in-map (vc-annotate-car-last-cons vc-annotate-color-map)))
2942 (while menu-elements
2943 (let* ((element (car menu-elements))
2944 (days (* element oldest-in-map)))
2945 (setq menu-elements (cdr menu-elements))
2946 (setq menu-def
2947 (append menu-def
2948 `([,(format "Span %.1f days" days)
2949 (unless (and (numberp vc-annotate-display-mode)
2950 (= vc-annotate-display-mode ,days))
2951 (vc-annotate-display-select nil ,days))
2952 :style toggle :selected
2953 (and (numberp vc-annotate-display-mode)
2954 (= vc-annotate-display-mode ,days)) ])))))
2955 (setq menu-def
2956 (append menu-def
2957 (list
2958 ["Span ..."
2959 (let ((days
2960 (float (string-to-number
2961 (read-string "Span how many days? ")))))
2962 (vc-annotate-display-select nil days)) t])
2963 (list "--")
2964 (list
2965 ["Span to Oldest"
2966 (unless (eq vc-annotate-display-mode 'scale)
2967 (vc-annotate-display-select nil 'scale))
2968 :style toggle :selected
2969 (eq vc-annotate-display-mode 'scale)])
2970 (list
2971 ["Span Oldest->Newest"
2972 (unless (eq vc-annotate-display-mode 'fullscale)
2973 (vc-annotate-display-select nil 'fullscale))
2974 :style toggle :selected
2975 (eq vc-annotate-display-mode 'fullscale)])
2976 (list "--")
2977 (list ["Annotate previous revision"
2978 (call-interactively 'vc-annotate-prev-version)])
2979 (list ["Annotate next revision"
2980 (call-interactively 'vc-annotate-next-version)])
2981 (list ["Annotate revision at line"
2982 (vc-annotate-revision-at-line)])
2983 (list ["Annotate revision previous to line"
2984 (vc-annotate-revision-previous-to-line)])
2985 (list ["Annotate latest revision"
2986 (vc-annotate-workfile-version)])
2987 (list ["Show log of revision at line"
2988 (vc-annotate-show-log-revision-at-line)])
2989 (list ["Show diff of revision at line"
2990 (vc-annotate-show-diff-revision-at-line)])))
2992 ;; Define the menu
2993 (if (or (featurep 'easymenu) (load "easymenu" t))
2994 (easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map
2995 "VC Annotate Display Menu" menu-def))))
2997 (defun vc-annotate-display-select (&optional buffer mode)
2998 "Highlight the output of \\[vc-annotate].
2999 By default, the current buffer is highlighted, unless overridden by
3000 BUFFER. `vc-annotate-display-mode' specifies the highlighting mode to
3001 use; you may override this using the second optional arg MODE."
3002 (interactive)
3003 (if mode (setq vc-annotate-display-mode mode))
3004 (when buffer
3005 (set-buffer buffer)
3006 (display-buffer buffer))
3007 (if (not vc-annotate-parent-rev)
3008 (vc-annotate-mode))
3009 (cond ((null vc-annotate-display-mode)
3010 (vc-annotate-display-default vc-annotate-ratio))
3011 ;; One of the auto-scaling modes
3012 ((eq vc-annotate-display-mode 'scale)
3013 (vc-annotate-display-autoscale))
3014 ((eq vc-annotate-display-mode 'fullscale)
3015 (vc-annotate-display-autoscale t))
3016 ((numberp vc-annotate-display-mode) ; A fixed number of days lookback
3017 (vc-annotate-display-default
3018 (/ vc-annotate-display-mode (vc-annotate-car-last-cons
3019 vc-annotate-color-map))))
3020 (t (error "No such display mode: %s"
3021 vc-annotate-display-mode))))
3023 ;;;; (defun vc-BACKEND-annotate-command (file buffer) ...)
3024 ;;;; Execute "annotate" on FILE by using `call-process' and insert
3025 ;;;; the contents in BUFFER.
3027 ;;;###autoload
3028 (defun vc-annotate (prefix &optional revision display-mode)
3029 "Display the edit history of the current file using colours.
3031 This command creates a buffer that shows, for each line of the current
3032 file, when it was last edited and by whom. Additionally, colours are
3033 used to show the age of each line--blue means oldest, red means
3034 youngest, and intermediate colours indicate intermediate ages. By
3035 default, the time scale stretches back one year into the past;
3036 everything that is older than that is shown in blue.
3038 With a prefix argument, this command asks two questions in the
3039 minibuffer. First, you may enter a version number; then the buffer
3040 displays and annotates that version instead of the current version
3041 \(type RET in the minibuffer to leave that default unchanged). Then,
3042 you are prompted for the time span in days which the color range
3043 should cover. For example, a time span of 20 days means that changes
3044 over the past 20 days are shown in red to blue, according to their
3045 age, and everything that is older than that is shown in blue.
3047 Customization variables:
3049 `vc-annotate-menu-elements' customizes the menu elements of the
3050 mode-specific menu. `vc-annotate-color-map' and
3051 `vc-annotate-very-old-color' defines the mapping of time to
3052 colors. `vc-annotate-background' specifies the background color."
3053 (interactive "P")
3054 (vc-ensure-vc-buffer)
3055 (let* ((temp-buffer-name nil)
3056 (temp-buffer-show-function 'vc-annotate-display-select)
3057 (rev (or revision (vc-workfile-version buffer-file-name)))
3058 (bfn buffer-file-name)
3059 (vc-annotate-version
3060 (if prefix (read-string
3061 (format "Annotate from version: (default %s) " rev)
3062 nil nil rev)
3063 rev)))
3064 (if display-mode
3065 (setq vc-annotate-display-mode display-mode)
3066 (if prefix
3067 (setq vc-annotate-display-mode
3068 (float (string-to-number
3069 (read-string "Annotate span days: (default 20) "
3070 nil nil "20"))))))
3071 (setq temp-buffer-name (format "*Annotate %s (rev %s)*"
3072 (buffer-name) vc-annotate-version))
3073 (setq vc-annotate-backend (vc-backend buffer-file-name))
3074 (message "Annotating...")
3075 (if (not (vc-find-backend-function vc-annotate-backend 'annotate-command))
3076 (error "Sorry, annotating is not implemented for %s"
3077 vc-annotate-backend))
3078 (with-output-to-temp-buffer temp-buffer-name
3079 (vc-call-backend vc-annotate-backend 'annotate-command
3080 buffer-file-name
3081 (get-buffer temp-buffer-name)
3082 vc-annotate-version))
3083 (save-excursion
3084 (set-buffer temp-buffer-name)
3085 (set (make-local-variable 'vc-annotate-parent-file) bfn)
3086 (set (make-local-variable 'vc-annotate-parent-rev) vc-annotate-version)
3087 (set (make-local-variable 'vc-annotate-parent-display-mode)
3088 vc-annotate-display-mode))
3090 ;; Don't use the temp-buffer-name until the buffer is created
3091 ;; (only after `with-output-to-temp-buffer'.)
3092 (setq vc-annotate-buffers
3093 (append vc-annotate-buffers
3094 (list (cons (get-buffer temp-buffer-name) vc-annotate-backend))))
3095 (message "Annotating... done")))
3097 (defun vc-annotate-prev-version (prefix)
3098 "Visit the annotation of the version previous to this one.
3100 With a numeric prefix argument, annotate the version that many
3101 versions previous."
3102 (interactive "p")
3103 (vc-annotate-warp-version (- 0 prefix)))
3105 (defun vc-annotate-next-version (prefix)
3106 "Visit the annotation of the version after this one.
3108 With a numeric prefix argument, annotate the version that many
3109 versions after."
3110 (interactive "p")
3111 (vc-annotate-warp-version prefix))
3113 (defun vc-annotate-workfile-version ()
3114 "Visit the annotation of the workfile version of this file."
3115 (interactive)
3116 (if (not (equal major-mode 'vc-annotate-mode))
3117 (message "Cannot be invoked outside of a vc annotate buffer")
3118 (let ((warp-rev (vc-workfile-version vc-annotate-parent-file)))
3119 (if (equal warp-rev vc-annotate-parent-rev)
3120 (message "Already at version %s" warp-rev)
3121 (vc-annotate-warp-version warp-rev)))))
3123 (defun vc-annotate-extract-revision-at-line ()
3124 "Extract the revision number of the current line."
3125 ;; This function must be invoked from a buffer in vc-annotate-mode
3126 (save-window-excursion
3127 (vc-ensure-vc-buffer)
3128 (setq vc-annotate-backend (vc-backend buffer-file-name)))
3129 (vc-call-backend vc-annotate-backend 'annotate-extract-revision-at-line))
3131 (defun vc-annotate-revision-at-line ()
3132 "Visit the annotation of the version identified in the current line."
3133 (interactive)
3134 (if (not (equal major-mode 'vc-annotate-mode))
3135 (message "Cannot be invoked outside of a vc annotate buffer")
3136 (let ((rev-at-line (vc-annotate-extract-revision-at-line)))
3137 (if (not rev-at-line)
3138 (message "Cannot extract revision number from the current line")
3139 (if (equal rev-at-line vc-annotate-parent-rev)
3140 (message "Already at version %s" rev-at-line)
3141 (vc-annotate-warp-version rev-at-line))))))
3143 (defun vc-annotate-revision-previous-to-line ()
3144 "Visit the annotation of the version before the version at line."
3145 (interactive)
3146 (if (not (equal major-mode 'vc-annotate-mode))
3147 (message "Cannot be invoked outside of a vc annotate buffer")
3148 (let ((rev-at-line (vc-annotate-extract-revision-at-line))
3149 (prev-rev nil))
3150 (if (not rev-at-line)
3151 (message "Cannot extract revision number from the current line")
3152 (setq prev-rev
3153 (vc-call previous-version vc-annotate-parent-file rev-at-line))
3154 (vc-annotate-warp-version prev-rev)))))
3156 (defun vc-annotate-show-log-revision-at-line ()
3157 "Visit the log of the version at line."
3158 (interactive)
3159 (if (not (equal major-mode 'vc-annotate-mode))
3160 (message "Cannot be invoked outside of a vc annotate buffer")
3161 (let ((rev-at-line (vc-annotate-extract-revision-at-line)))
3162 (if (not rev-at-line)
3163 (message "Cannot extract revision number from the current line")
3164 (vc-print-log rev-at-line)))))
3166 (defun vc-annotate-show-diff-revision-at-line ()
3167 "Visit the diff of the version at line from its previous version."
3168 (interactive)
3169 (if (not (equal major-mode 'vc-annotate-mode))
3170 (message "Cannot be invoked outside of a vc annotate buffer")
3171 (let ((rev-at-line (vc-annotate-extract-revision-at-line))
3172 (prev-rev nil))
3173 (if (not rev-at-line)
3174 (message "Cannot extract revision number from the current line")
3175 (setq prev-rev
3176 (vc-call previous-version vc-annotate-parent-file rev-at-line))
3177 (if (not prev-rev)
3178 (message "Cannot diff from any version prior to %s" rev-at-line)
3179 (save-window-excursion
3180 (vc-version-diff vc-annotate-parent-file prev-rev rev-at-line))
3181 (switch-to-buffer "*vc-diff*"))))))
3183 (defun vc-annotate-warp-version (revspec)
3184 "Annotate the version described by REVSPEC.
3186 If REVSPEC is a positive integer, warp that many versions
3187 forward, if possible, otherwise echo a warning message. If
3188 REVSPEC is a negative integer, warp that many versions backward,
3189 if possible, otherwise echo a warning message. If REVSPEC is a
3190 string, then it describes a revision number, so warp to that
3191 revision."
3192 (if (not (equal major-mode 'vc-annotate-mode))
3193 (message "Cannot be invoked outside of a vc annotate buffer")
3194 (let* ((oldline (line-number-at-pos))
3195 (revspeccopy revspec)
3196 (newrev nil))
3197 (cond
3198 ((and (integerp revspec) (> revspec 0))
3199 (setq newrev vc-annotate-parent-rev)
3200 (while (and (> revspec 0) newrev)
3201 (setq newrev (vc-call next-version
3202 vc-annotate-parent-file newrev))
3203 (setq revspec (1- revspec)))
3204 (if (not newrev)
3205 (message "Cannot increment %d versions from version %s"
3206 revspeccopy vc-annotate-parent-rev)))
3207 ((and (integerp revspec) (< revspec 0))
3208 (setq newrev vc-annotate-parent-rev)
3209 (while (and (< revspec 0) newrev)
3210 (setq newrev (vc-call previous-version
3211 vc-annotate-parent-file newrev))
3212 (setq revspec (1+ revspec)))
3213 (if (not newrev)
3214 (message "Cannot decrement %d versions from version %s"
3215 (- 0 revspeccopy) vc-annotate-parent-rev)))
3216 ((stringp revspec) (setq newrev revspec))
3217 (t (error "Invalid argument to vc-annotate-warp-version")))
3218 (when newrev
3219 (save-window-excursion
3220 (find-file vc-annotate-parent-file)
3221 (vc-annotate nil newrev vc-annotate-parent-display-mode))
3222 (kill-buffer (current-buffer)) ;; kill the buffer we started from
3223 (switch-to-buffer (car (car (last vc-annotate-buffers))))
3224 (goto-line (min oldline (progn (goto-char (point-max))
3225 (previous-line)
3226 (line-number-at-pos))))))))
3228 (defun vc-annotate-car-last-cons (a-list)
3229 "Return car of last cons in association list A-LIST."
3230 (if (not (eq nil (cdr a-list)))
3231 (vc-annotate-car-last-cons (cdr a-list))
3232 (car (car a-list))))
3234 (defun vc-annotate-time-span (a-list span &optional quantize)
3235 "Apply factor SPAN to the time-span of association list A-LIST.
3236 Return the new alist.
3237 Optionally quantize to the factor of QUANTIZE."
3238 ;; Apply span to each car of every cons
3239 (if (not (eq nil a-list))
3240 (append (list (cons (* (car (car a-list)) span)
3241 (cdr (car a-list))))
3242 (vc-annotate-time-span (nthcdr (or quantize ; optional
3243 1) ; Default to cdr
3244 a-list) span quantize))))
3246 (defun vc-annotate-compcar (threshold a-list)
3247 "Test successive cons cells of A-LIST against THRESHOLD.
3248 Return the first cons cell with a car that is not less than THRESHOLD,
3249 nil if no such cell exists."
3250 (let ((i 1)
3251 (tmp-cons (car a-list)))
3252 (while (and tmp-cons (< (car tmp-cons) threshold))
3253 (setq tmp-cons (car (nthcdr i a-list)))
3254 (setq i (+ i 1)))
3255 tmp-cons)) ; Return the appropriate value
3257 (defun vc-annotate-convert-time (time)
3258 "Convert a time value to a floating-point number of days.
3259 The argument TIME is a list as returned by `current-time' or
3260 `encode-time', only the first two elements of that list are considered."
3261 (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600))
3263 (defun vc-annotate-difference (&optional offset)
3264 "Return the time span in days to the next annotation.
3265 This calls the backend function annotate-time, and returns the
3266 difference in days between the time returned and the current time,
3267 or OFFSET if present."
3268 (let ((next-time (vc-call-backend vc-annotate-backend 'annotate-time)))
3269 (if next-time
3270 (- (or offset
3271 (vc-call-backend vc-annotate-backend 'annotate-current-time))
3272 next-time))))
3274 (defun vc-default-annotate-current-time (backend)
3275 "Return the current time, encoded as fractional days."
3276 (vc-annotate-convert-time (current-time)))
3278 (defvar vc-annotate-offset nil)
3280 (defun vc-annotate-display (&optional color-map offset)
3281 "Highlight `vc-annotate' output in the current buffer.
3282 COLOR-MAP, if present, overrides `vc-annotate-color-map'.
3283 The annotations are relative to the current time, unless overridden by OFFSET."
3284 (if (and color-map (not (eq color-map vc-annotate-color-map)))
3285 (set (make-local-variable 'vc-annotate-color-map) color-map))
3286 (set (make-local-variable 'vc-annotate-offset) offset)
3287 (font-lock-mode 1))
3289 (defun vc-annotate-lines (limit)
3290 (let (difference)
3291 (while (and (< (point) limit)
3292 (setq difference (vc-annotate-difference vc-annotate-offset)))
3293 (let* ((color (or (vc-annotate-compcar difference vc-annotate-color-map)
3294 (cons nil vc-annotate-very-old-color)))
3295 ;; substring from index 1 to remove any leading `#' in the name
3296 (face-name (concat "vc-annotate-face-" (substring (cdr color) 1)))
3297 ;; Make the face if not done.
3298 (face (or (intern-soft face-name)
3299 (let ((tmp-face (make-face (intern face-name))))
3300 (set-face-foreground tmp-face (cdr color))
3301 (if vc-annotate-background
3302 (set-face-background tmp-face
3303 vc-annotate-background))
3304 tmp-face))) ; Return the face
3305 (point (point)))
3306 (forward-line 1)
3307 (put-text-property point (point) 'face face)))
3308 ;; Pretend to font-lock there were no matches.
3309 nil))
3311 ;; Collect back-end-dependent stuff here
3313 (defalias 'vc-default-logentry-check 'ignore)
3315 (defun vc-check-headers ()
3316 "Check if the current file has any headers in it."
3317 (interactive)
3318 (vc-call-backend (vc-backend buffer-file-name) 'check-headers))
3320 (defun vc-default-check-headers (backend)
3321 "Default implementation of check-headers; always returns nil."
3322 nil)
3324 ;; Back-end-dependent stuff ends here.
3326 ;; Set up key bindings for use while editing log messages
3328 (defun vc-log-edit (file)
3329 "Set up `log-edit' for use with VC on FILE."
3330 (setq default-directory
3331 (if file (file-name-directory file)
3332 (with-current-buffer vc-parent-buffer default-directory)))
3333 (log-edit 'vc-finish-logentry nil
3334 (if file `(lambda () ',(list (file-name-nondirectory file)))
3335 ;; If FILE is nil, we were called from vc-dired.
3336 (lambda ()
3337 (with-current-buffer vc-parent-buffer
3338 (dired-get-marked-files t)))))
3339 (set (make-local-variable 'vc-log-file) file)
3340 (make-local-variable 'vc-log-version)
3341 (set-buffer-modified-p nil)
3342 (setq buffer-file-name nil))
3344 ;; These things should probably be generally available
3346 (defun vc-file-tree-walk (dirname func &rest args)
3347 "Walk recursively through DIRNAME.
3348 Invoke FUNC f ARGS on each VC-managed file f underneath it."
3349 (vc-file-tree-walk-internal (expand-file-name dirname) func args)
3350 (message "Traversing directory %s...done" dirname))
3352 (defun vc-file-tree-walk-internal (file func args)
3353 (if (not (file-directory-p file))
3354 (if (vc-backend file) (apply func file args))
3355 (message "Traversing directory %s..." (abbreviate-file-name file))
3356 (let ((dir (file-name-as-directory file)))
3357 (mapcar
3358 (lambda (f) (or
3359 (string-equal f ".")
3360 (string-equal f "..")
3361 (member f vc-directory-exclusion-list)
3362 (let ((dirf (expand-file-name f dir)))
3364 (file-symlink-p dirf);; Avoid possible loops
3365 (vc-file-tree-walk-internal dirf func args)))))
3366 (directory-files dir)))))
3368 (provide 'vc)
3370 ;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE
3372 ;; These may be useful to anyone who has to debug or extend the package.
3373 ;; (Note that this information corresponds to versions 5.x. Some of it
3374 ;; might have been invalidated by the additions to support branching
3375 ;; and RCS keyword lookup. AS, 1995/03/24)
3377 ;; A fundamental problem in VC is that there are time windows between
3378 ;; vc-next-action's computations of the file's version-control state and
3379 ;; the actions that change it. This is a window open to lossage in a
3380 ;; multi-user environment; someone else could nip in and change the state
3381 ;; of the master during it.
3383 ;; The performance problem is that rlog/prs calls are very expensive; we want
3384 ;; to avoid them as much as possible.
3386 ;; ANALYSIS:
3388 ;; The performance problem, it turns out, simplifies in practice to the
3389 ;; problem of making vc-state fast. The two other functions that call
3390 ;; prs/rlog will not be so commonly used that the slowdown is a problem; one
3391 ;; makes snapshots, the other deletes the calling user's last change in the
3392 ;; master.
3394 ;; The race condition implies that we have to either (a) lock the master
3395 ;; during the entire execution of vc-next-action, or (b) detect and
3396 ;; recover from errors resulting from dispatch on an out-of-date state.
3398 ;; Alternative (a) appears to be infeasible. The problem is that we can't
3399 ;; guarantee that the lock will ever be removed. Suppose a user starts a
3400 ;; checkin, the change message buffer pops up, and the user, having wandered
3401 ;; off to do something else, simply forgets about it?
3403 ;; Alternative (b), on the other hand, works well with a cheap way to speed up
3404 ;; vc-state. Usually, if a file is registered, we can read its locked/
3405 ;; unlocked state and its current owner from its permissions.
3407 ;; This shortcut will fail if someone has manually changed the workfile's
3408 ;; permissions; also if developers are munging the workfile in several
3409 ;; directories, with symlinks to a master (in this latter case, the
3410 ;; permissions shortcut will fail to detect a lock asserted from another
3411 ;; directory).
3413 ;; Note that these cases correspond exactly to the errors which could happen
3414 ;; because of a competing checkin/checkout race in between two instances of
3415 ;; vc-next-action.
3417 ;; For VC's purposes, a workfile/master pair may have the following states:
3419 ;; A. Unregistered. There is a workfile, there is no master.
3421 ;; B. Registered and not locked by anyone.
3423 ;; C. Locked by calling user and unchanged.
3425 ;; D. Locked by the calling user and changed.
3427 ;; E. Locked by someone other than the calling user.
3429 ;; This makes for 25 states and 20 error conditions. Here's the matrix:
3431 ;; VC's idea of state
3432 ;; |
3433 ;; V Actual state RCS action SCCS action Effect
3434 ;; A B C D E
3435 ;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin
3436 ;; B 5 . 6 7 8 co -l get -e checkout
3437 ;; C 9 10 . 11 12 co -u unget; get revert
3438 ;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin
3439 ;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock
3441 ;; All commands take the master file name as a last argument (not shown).
3443 ;; In the discussion below, a "self-race" is a pathological situation in
3444 ;; which VC operations are being attempted simultaneously by two or more
3445 ;; Emacsen running under the same username.
3447 ;; The vc-next-action code has the following windows:
3449 ;; Window P:
3450 ;; Between the check for existence of a master file and the call to
3451 ;; admin/checkin in vc-buffer-admin (apparent state A). This window may
3452 ;; never close if the initial-comment feature is on.
3454 ;; Window Q:
3455 ;; Between the call to vc-workfile-unchanged-p in and the immediately
3456 ;; following revert (apparent state C).
3458 ;; Window R:
3459 ;; Between the call to vc-workfile-unchanged-p in and the following
3460 ;; checkin (apparent state D). This window may never close.
3462 ;; Window S:
3463 ;; Between the unlock and the immediately following checkout during a
3464 ;; revert operation (apparent state C). Included in window Q.
3466 ;; Window T:
3467 ;; Between vc-state and the following checkout (apparent state B).
3469 ;; Window U:
3470 ;; Between vc-state and the following revert (apparent state C).
3471 ;; Includes windows Q and S.
3473 ;; Window V:
3474 ;; Between vc-state and the following checkin (apparent state
3475 ;; D). This window may never be closed if the user fails to complete the
3476 ;; checkin message. Includes window R.
3478 ;; Window W:
3479 ;; Between vc-state and the following steal-lock (apparent
3480 ;; state E). This window may never close if the user fails to complete
3481 ;; the steal-lock message. Includes window X.
3483 ;; Window X:
3484 ;; Between the unlock and the immediately following re-lock during a
3485 ;; steal-lock operation (apparent state E). This window may never close
3486 ;; if the user fails to complete the steal-lock message.
3488 ;; Errors:
3490 ;; Apparent state A ---
3492 ;; 1. File looked unregistered but is actually registered and not locked.
3494 ;; Potential cause: someone else's admin during window P, with
3495 ;; caller's admin happening before their checkout.
3497 ;; RCS: Prior to version 5.6.4, ci fails with message
3498 ;; "no lock set by <user>". From 5.6.4 onwards, VC uses the new
3499 ;; ci -i option and the message is "<file>,v: already exists".
3500 ;; SCCS: admin will fail with error (ad19).
3502 ;; We can let these errors be passed up to the user.
3504 ;; 2. File looked unregistered but is actually locked by caller, unchanged.
3506 ;; Potential cause: self-race during window P.
3508 ;; RCS: Prior to version 5.6.4, reverts the file to the last saved
3509 ;; version and unlocks it. From 5.6.4 onwards, VC uses the new
3510 ;; ci -i option, failing with message "<file>,v: already exists".
3511 ;; SCCS: will fail with error (ad19).
3513 ;; Either of these consequences is acceptable.
3515 ;; 3. File looked unregistered but is actually locked by caller, changed.
3517 ;; Potential cause: self-race during window P.
3519 ;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as
3520 ;; a delta with a null change comment (the -t- switch will be
3521 ;; ignored). From 5.6.4 onwards, VC uses the new ci -i option,
3522 ;; failing with message "<file>,v: already exists".
3523 ;; SCCS: will fail with error (ad19).
3525 ;; 4. File looked unregistered but is locked by someone else.
3527 ;; Potential cause: someone else's admin during window P, with
3528 ;; caller's admin happening *after* their checkout.
3530 ;; RCS: Prior to version 5.6.4, ci fails with a
3531 ;; "no lock set by <user>" message. From 5.6.4 onwards,
3532 ;; VC uses the new ci -i option, failing with message
3533 ;; "<file>,v: already exists".
3534 ;; SCCS: will fail with error (ad19).
3536 ;; We can let these errors be passed up to the user.
3538 ;; Apparent state B ---
3540 ;; 5. File looked registered and not locked, but is actually unregistered.
3542 ;; Potential cause: master file got nuked during window P.
3544 ;; RCS: will fail with "RCS/<file>: No such file or directory"
3545 ;; SCCS: will fail with error ut4.
3547 ;; We can let these errors be passed up to the user.
3549 ;; 6. File looked registered and not locked, but is actually locked by the
3550 ;; calling user and unchanged.
3552 ;; Potential cause: self-race during window T.
3554 ;; RCS: in the same directory as the previous workfile, co -l will fail
3555 ;; with "co error: writable foo exists; checkout aborted". In any other
3556 ;; directory, checkout will succeed.
3557 ;; SCCS: will fail with ge17.
3559 ;; Either of these consequences is acceptable.
3561 ;; 7. File looked registered and not locked, but is actually locked by the
3562 ;; calling user and changed.
3564 ;; As case 6.
3566 ;; 8. File looked registered and not locked, but is actually locked by another
3567 ;; user.
3569 ;; Potential cause: someone else checks it out during window T.
3571 ;; RCS: co error: revision 1.3 already locked by <user>
3572 ;; SCCS: fails with ge4 (in directory) or ut7 (outside it).
3574 ;; We can let these errors be passed up to the user.
3576 ;; Apparent state C ---
3578 ;; 9. File looks locked by calling user and unchanged, but is unregistered.
3580 ;; As case 5.
3582 ;; 10. File looks locked by calling user and unchanged, but is actually not
3583 ;; locked.
3585 ;; Potential cause: a self-race in window U, or by the revert's
3586 ;; landing during window X of some other user's steal-lock or window S
3587 ;; of another user's revert.
3589 ;; RCS: succeeds, refreshing the file from the identical version in
3590 ;; the master.
3591 ;; SCCS: fails with error ut4 (p file nonexistent).
3593 ;; Either of these consequences is acceptable.
3595 ;; 11. File is locked by calling user. It looks unchanged, but is actually
3596 ;; changed.
3598 ;; Potential cause: the file would have to be touched by a self-race
3599 ;; during window Q.
3601 ;; The revert will succeed, removing whatever changes came with
3602 ;; the touch. It is theoretically possible that work could be lost.
3604 ;; 12. File looks like it's locked by the calling user and unchanged, but
3605 ;; it's actually locked by someone else.
3607 ;; Potential cause: a steal-lock in window V.
3609 ;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u
3610 ;; SCCS: fails with error un2
3612 ;; We can pass these errors up to the user.
3614 ;; Apparent state D ---
3616 ;; 13. File looks like it's locked by the calling user and changed, but it's
3617 ;; actually unregistered.
3619 ;; Potential cause: master file got nuked during window P.
3621 ;; RCS: Prior to version 5.6.4, checks in the user's version as an
3622 ;; initial delta. From 5.6.4 onwards, VC uses the new ci -j
3623 ;; option, failing with message "no such file or directory".
3624 ;; SCCS: will fail with error ut4.
3626 ;; This case is kind of nasty. Under RCS prior to version 5.6.4,
3627 ;; VC may fail to detect the loss of previous version information.
3629 ;; 14. File looks like it's locked by the calling user and changed, but it's
3630 ;; actually unlocked.
3632 ;; Potential cause: self-race in window V, or the checkin happening
3633 ;; during the window X of someone else's steal-lock or window S of
3634 ;; someone else's revert.
3636 ;; RCS: ci will fail with "no lock set by <user>".
3637 ;; SCCS: delta will fail with error ut4.
3639 ;; 15. File looks like it's locked by the calling user and changed, but it's
3640 ;; actually locked by the calling user and unchanged.
3642 ;; Potential cause: another self-race --- a whole checkin/checkout
3643 ;; sequence by the calling user would have to land in window R.
3645 ;; SCCS: checks in a redundant delta and leaves the file unlocked as usual.
3646 ;; RCS: reverts to the file state as of the second user's checkin, leaving
3647 ;; the file unlocked.
3649 ;; It is theoretically possible that work could be lost under RCS.
3651 ;; 16. File looks like it's locked by the calling user and changed, but it's
3652 ;; actually locked by a different user.
3654 ;; RCS: ci error: no lock set by <user>
3655 ;; SCCS: unget will fail with error un2
3657 ;; We can pass these errors up to the user.
3659 ;; Apparent state E ---
3661 ;; 17. File looks like it's locked by some other user, but it's actually
3662 ;; unregistered.
3664 ;; As case 13.
3666 ;; 18. File looks like it's locked by some other user, but it's actually
3667 ;; unlocked.
3669 ;; Potential cause: someone released a lock during window W.
3671 ;; RCS: The calling user will get the lock on the file.
3672 ;; SCCS: unget -n will fail with cm4.
3674 ;; Either of these consequences will be OK.
3676 ;; 19. File looks like it's locked by some other user, but it's actually
3677 ;; locked by the calling user and unchanged.
3679 ;; Potential cause: the other user relinquishing a lock followed by
3680 ;; a self-race, both in window W.
3682 ;; Under both RCS and SCCS, both unlock and lock will succeed, making
3683 ;; the sequence a no-op.
3685 ;; 20. File looks like it's locked by some other user, but it's actually
3686 ;; locked by the calling user and changed.
3688 ;; As case 19.
3690 ;; PROBLEM CASES:
3692 ;; In order of decreasing severity:
3694 ;; Cases 11 and 15 are the only ones that potentially lose work.
3695 ;; They would require a self-race for this to happen.
3697 ;; Case 13 in RCS loses information about previous deltas, retaining
3698 ;; only the information in the current workfile. This can only happen
3699 ;; if the master file gets nuked in window P.
3701 ;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with
3702 ;; no change comment in the master. This would require a self-race in
3703 ;; window P or R respectively.
3705 ;; Cases 2, 10, 19 and 20 do extra work, but make no changes.
3707 ;; Unfortunately, it appears to me that no recovery is possible in these
3708 ;; cases. They don't yield error messages, so there's no way to tell that
3709 ;; a race condition has occurred.
3711 ;; All other cases don't change either the workfile or the master, and
3712 ;; trigger command errors which the user will see.
3714 ;; Thus, there is no explicit recovery code.
3716 ;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6
3717 ;;; vc.el ends here