1 ;;; vc.el --- drive a version-control system from within Emacs
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5 ;; Free Software Foundation, Inc.
7 ;; Author: FSF (see below for full credits)
8 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
11 ;; This file is part of GNU Emacs.
13 ;; GNU Emacs is free software: you can redistribute it and/or modify
14 ;; it under the terms of the GNU General Public License as published by
15 ;; the Free Software Foundation, either version 3 of the License, or
16 ;; (at your option) any later version.
18 ;; GNU Emacs is distributed in the hope that it will be useful,
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 ;; GNU General Public License for more details.
23 ;; You should have received a copy of the GNU General Public License
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
28 ;; VC was initially designed and implemented by Eric S. Raymond
29 ;; <esr@thyrsus.com> in 1992. Over the years, many other people have
30 ;; contributed substantial amounts of work to VC. These include:
32 ;; Per Cederqvist <ceder@lysator.liu.se>
33 ;; Paul Eggert <eggert@twinsun.com>
34 ;; Sebastian Kremer <sk@thp.uni-koeln.de>
35 ;; Martin Lorentzson <martinl@gnu.org>
36 ;; Dave Love <fx@gnu.org>
37 ;; Stefan Monnier <monnier@cs.yale.edu>
38 ;; Thien-Thi Nguyen <ttn@gnu.org>
39 ;; Dan Nicolaescu <dann@ics.uci.edu>
40 ;; J.D. Smith <jdsmith@alum.mit.edu>
41 ;; Andre Spiegel <spiegel@gnu.org>
42 ;; Richard Stallman <rms@gnu.org>
44 ;; In July 2007 ESR returned and redesigned the mode to cope better
45 ;; with modern version-control systems that do commits by fileset
46 ;; rather than per individual file.
48 ;; If you maintain a client of the mode or customize it in your .emacs,
49 ;; note that some backend functions which formerly took single file arguments
50 ;; now take a list of files. These include: register, checkin, print-log,
51 ;; rollback, and diff.
55 ;; This mode is fully documented in the Emacs user's manual.
57 ;; Supported version-control systems presently include CVS, RCS, GNU
58 ;; Arch, Subversion, Bzr, Git, Mercurial, Monotone and SCCS
59 ;; (or its free replacement, CSSC).
61 ;; Some features will not work with old RCS versions. Where
62 ;; appropriate, VC finds out which version you have, and allows or
63 ;; disallows those features (stealing locks, for example, works only
64 ;; from 5.6.2 onwards).
65 ;; Even initial checkins will fail if your RCS version is so old that ci
66 ;; doesn't understand -t-; this has been known to happen to people running
69 ;; You can support the RCS -x option by customizing vc-rcs-master-templates.
71 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff
72 ;; to be installed somewhere on Emacs's path for executables.
74 ;; If your site uses the ChangeLog convention supported by Emacs, the
75 ;; function `log-edit-comment-to-change-log' could prove a useful checkin hook,
76 ;; although you might prefer to use C-c C-a (i.e. `log-edit-insert-changelog')
77 ;; from the commit buffer instead or to set `log-edit-setup-invert'.
79 ;; The vc code maintains some internal state in order to reduce expensive
80 ;; version-control operations to a minimum. Some names are only computed
81 ;; once. If you perform version control operations with the backend while
82 ;; vc's back is turned, or move/rename master files while vc is running,
83 ;; vc may get seriously confused. Don't do these things!
85 ;; ADDING SUPPORT FOR OTHER BACKENDS
87 ;; VC can use arbitrary version control systems as a backend. To add
88 ;; support for a new backend named SYS, write a library vc-sys.el that
89 ;; contains functions of the form `vc-sys-...' (note that SYS is in lower
90 ;; case for the function and library names). VC will use that library if
91 ;; you put the symbol SYS somewhere into the list of
92 ;; `vc-handled-backends'. Then, for example, if `vc-sys-registered'
93 ;; returns non-nil for a file, all SYS-specific versions of VC commands
94 ;; will be available for that file.
96 ;; VC keeps some per-file information in the form of properties (see
97 ;; vc-file-set/getprop in vc-hooks.el). The backend-specific functions
98 ;; do not generally need to be aware of these properties. For example,
99 ;; `vc-sys-working-revision' should compute the working revision and
100 ;; return it; it should not look it up in the property, and it needn't
101 ;; store it there either. However, if a backend-specific function does
102 ;; store a value in a property, that value takes precedence over any
103 ;; value that the generic code might want to set (check for uses of
104 ;; the macro `with-vc-properties' in vc.el).
106 ;; In the list of functions below, each identifier needs to be prepended
107 ;; with `vc-sys-'. Some of the functions are mandatory (marked with a
108 ;; `*'), others are optional (`-').
110 ;; BACKEND PROPERTIES
112 ;; * revision-granularity
114 ;; Takes no arguments. Returns either 'file or 'repository. Backends
115 ;; that return 'file have per-file revision numbering; backends
116 ;; that return 'repository have per-repository revision numbering,
117 ;; so a revision level implicitly identifies a changeset
119 ;; STATE-QUERYING FUNCTIONS
121 ;; * registered (file)
123 ;; Return non-nil if FILE is registered in this backend. Both this
124 ;; function as well as `state' should be careful to fail gracefully
125 ;; in the event that the backend executable is absent. It is
126 ;; preferable that this function's body is autoloaded, that way only
127 ;; calling vc-registered does not cause the backend to be loaded
128 ;; (all the vc-FOO-registered functions are called to try to find
129 ;; the controlling backend for FILE.
133 ;; Return the current version control state of FILE. For a list of
134 ;; possible values, see `vc-state'. This function should do a full and
135 ;; reliable state computation; it is usually called immediately after
136 ;; C-x v v. If you want to use a faster heuristic when visiting a
137 ;; file, put that into `state-heuristic' below. Note that under most
138 ;; VCSes this won't be called at all, dir-status is used instead.
140 ;; - state-heuristic (file)
142 ;; If provided, this function is used to estimate the version control
143 ;; state of FILE at visiting time. It should be considerably faster
144 ;; than the implementation of `state'. For a list of possible values,
145 ;; see the doc string of `vc-state'.
147 ;; - dir-status (dir update-function)
149 ;; Produce RESULT: a list of lists of the form (FILE VC-STATE EXTRA)
150 ;; for the files in DIR.
151 ;; EXTRA can be used for backend specific information about FILE.
152 ;; If a command needs to be run to compute this list, it should be
153 ;; run asynchronously using (current-buffer) as the buffer for the
154 ;; command. When RESULT is computed, it should be passed back by
155 ;; doing: (funcall UPDATE-FUNCTION RESULT nil).
156 ;; If the backend uses a process filter, hence it produces partial results,
157 ;; they can be passed back by doing:
158 ;; (funcall UPDATE-FUNCTION RESULT t)
159 ;; and then do a (funcall UPDATE-FUNCTION RESULT nil)
160 ;; when all the results have been computed.
161 ;; To provide more backend specific functionality for `vc-dir'
162 ;; the following functions might be needed: `dir-extra-headers',
163 ;; `dir-printer', `extra-dir-menu' and `dir-status-files'.
165 ;; - dir-status-files (dir files default-state update-function)
167 ;; This function is identical to dir-status except that it should
168 ;; only report status for the specified FILES. Also it needs to
169 ;; report on all requested files, including up-to-date or ignored
170 ;; files. If not provided, the default is to consider that the files
171 ;; are in DEFAULT-STATE.
173 ;; - dir-extra-headers (dir)
175 ;; Return a string that will be added to the *vc-dir* buffer header.
177 ;; - dir-printer (fileinfo)
179 ;; Pretty print the `vc-dir-fileinfo' FILEINFO.
180 ;; If a backend needs to show more information than the default FILE
181 ;; and STATE in the vc-dir listing, it can store that extra
182 ;; information in `vc-dir-fileinfo->extra'. This function can be
183 ;; used to display that extra information in the *vc-dir* buffer.
185 ;; - status-fileinfo-extra (file)
187 ;; Compute `vc-dir-fileinfo->extra' for FILE.
189 ;; * working-revision (file)
191 ;; Return the working revision of FILE. This is the revision fetched
192 ;; by the last checkout or upate, not necessarily the same thing as the
193 ;; head or tip revision. Should return "0" for a file added but not yet
196 ;; - latest-on-branch-p (file)
198 ;; Return non-nil if the working revision of FILE is the latest revision
199 ;; on its branch (many VCSes call this the 'tip' or 'head' revision).
200 ;; The default implementation always returns t, which means that
201 ;; working with non-current revisions is not supported by default.
203 ;; * checkout-model (files)
205 ;; Indicate whether FILES need to be "checked out" before they can be
206 ;; edited. See `vc-checkout-model' for a list of possible values.
208 ;; - workfile-unchanged-p (file)
210 ;; Return non-nil if FILE is unchanged from the working revision.
211 ;; This function should do a brief comparison of FILE's contents
212 ;; with those of the repository master of the working revision. If
213 ;; the backend does not have such a brief-comparison feature, the
214 ;; default implementation of this function can be used, which
215 ;; delegates to a full vc-BACKEND-diff. (Note that vc-BACKEND-diff
216 ;; must not run asynchronously in this case, see variable
217 ;; `vc-disable-async-diff'.)
219 ;; - mode-line-string (file)
221 ;; If provided, this function should return the VC-specific mode
222 ;; line string for FILE. The returned string should have a
223 ;; `help-echo' property which is the text to be displayed as a
224 ;; tooltip when the mouse hovers over the VC entry on the mode-line.
225 ;; The default implementation deals well with all states that
226 ;; `vc-state' can return.
228 ;; - prettify-state-info (file)
230 ;; Translate the `vc-state' property of FILE into a string that can be
231 ;; used in a human-readable buffer. The default implementation deals well
232 ;; with all states that `vc-state' can return.
234 ;; STATE-CHANGING FUNCTIONS
236 ;; * create-repo (backend)
238 ;; Create an empty repository in the current directory and initialize
239 ;; it so VC mode can add files to it. For file-oriented systems, this
240 ;; need do no more than create a subdirectory with the right name.
242 ;; * register (files &optional rev comment)
244 ;; Register FILES in this backend. Optionally, an initial revision REV
245 ;; and an initial description of the file, COMMENT, may be specified,
246 ;; but it is not guaranteed that the backend will do anything with this.
247 ;; The implementation should pass the value of vc-register-switches
248 ;; to the backend command. (Note: in older versions of VC, this
249 ;; command took a single file argument and not a list.)
251 ;; - init-revision (file)
253 ;; The initial revision to use when registering FILE if one is not
254 ;; specified by the user. If not provided, the variable
255 ;; vc-default-init-revision is used instead.
257 ;; - responsible-p (file)
259 ;; Return non-nil if this backend considers itself "responsible" for
260 ;; FILE, which can also be a directory. This function is used to find
261 ;; out what backend to use for registration of new files and for things
262 ;; like change log generation. The default implementation always
265 ;; - could-register (file)
267 ;; Return non-nil if FILE could be registered under this backend. The
268 ;; default implementation always returns t.
270 ;; - receive-file (file rev)
272 ;; Let this backend "receive" a file that is already registered under
273 ;; another backend. The default implementation simply calls `register'
274 ;; for FILE, but it can be overridden to do something more specific,
275 ;; e.g. keep revision numbers consistent or choose editing modes for
276 ;; FILE that resemble those of the other backend.
278 ;; - unregister (file)
280 ;; Unregister FILE from this backend. This is only needed if this
281 ;; backend may be used as a "more local" backend for temporary editing.
283 ;; * checkin (files rev comment)
285 ;; Commit changes in FILES to this backend. If REV is non-nil, that
286 ;; should become the new revision number (not all backends do
287 ;; anything with it). COMMENT is used as a check-in comment. The
288 ;; implementation should pass the value of vc-checkin-switches to
289 ;; the backend command. (Note: in older versions of VC, this
290 ;; command took a single file argument and not a list.)
292 ;; * find-revision (file rev buffer)
294 ;; Fetch revision REV of file FILE and put it into BUFFER.
295 ;; If REV is the empty string, fetch the head of the trunk.
296 ;; The implementation should pass the value of vc-checkout-switches
297 ;; to the backend command.
299 ;; * checkout (file &optional editable rev)
301 ;; Check out revision REV of FILE into the working area. If EDITABLE
302 ;; is non-nil, FILE should be writable by the user and if locking is
303 ;; used for FILE, a lock should also be set. If REV is non-nil, that
304 ;; is the revision to check out (default is the working revision).
305 ;; If REV is t, that means to check out the head of the current branch;
306 ;; if it is the empty string, check out the head of the trunk.
307 ;; The implementation should pass the value of vc-checkout-switches
308 ;; to the backend command.
310 ;; * revert (file &optional contents-done)
312 ;; Revert FILE back to the working revision. If optional
313 ;; arg CONTENTS-DONE is non-nil, then the contents of FILE have
314 ;; already been reverted from a version backup, and this function
315 ;; only needs to update the status of FILE within the backend.
317 ;; - rollback (files)
319 ;; Remove the tip revision of each of FILES from the repository. If
320 ;; this function is not provided, trying to cancel a revision is
321 ;; caught as an error. (Most backends don't provide it.) (Also
322 ;; note that older versions of this backend command were called
323 ;; 'cancel-version' and took a single file arg, not a list of
326 ;; - merge (file rev1 rev2)
328 ;; Merge the changes between REV1 and REV2 into the current working file.
330 ;; - merge-news (file)
332 ;; Merge recent changes from the current branch into FILE.
334 ;; - steal-lock (file &optional revision)
336 ;; Steal any lock on the working revision of FILE, or on REVISION if
337 ;; that is provided. This function is only needed if locking is
338 ;; used for files under this backend, and if files can indeed be
339 ;; locked by other users.
341 ;; - modify-change-comment (files rev comment)
343 ;; Modify the change comments associated with the files at the
344 ;; given revision. This is optional, many backends do not support it.
346 ;; - mark-resolved (files)
348 ;; Mark conflicts as resolved. Some VC systems need to run a
349 ;; command to mark conflicts as resolved.
353 ;; * print-log (files &optional buffer)
355 ;; Insert the revision log for FILES into BUFFER, or the *vc* buffer
356 ;; if BUFFER is nil. (Note: older versions of this function expected
357 ;; only a single file argument.)
359 ;; - log-view-mode ()
361 ;; Mode to use for the output of print-log. This defaults to
362 ;; `log-view-mode' and is expected to be changed (if at all) to a derived
363 ;; mode of `log-view-mode'.
365 ;; - show-log-entry (revision)
367 ;; If provided, search the log entry for REVISION in the current buffer,
368 ;; and make sure it is displayed in the buffer's window. The default
369 ;; implementation of this function works for RCS-style logs.
371 ;; - comment-history (file)
373 ;; Return a string containing all log entries that were made for FILE.
374 ;; This is used for transferring a file from one backend to another,
375 ;; retaining comment information.
377 ;; - update-changelog (files)
379 ;; Using recent log entries, create ChangeLog entries for FILES, or for
380 ;; all files at or below the default-directory if FILES is nil. The
381 ;; default implementation runs rcs2log, which handles RCS- and
384 ;; * diff (files &optional rev1 rev2 buffer)
386 ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if
387 ;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences
388 ;; from REV1 to REV2. If REV1 is nil, use the working revision (as
389 ;; found in the repository) as the older revision; if REV2 is nil,
390 ;; use the current working-copy contents as the newer revision. This
391 ;; function should pass the value of (vc-switches BACKEND 'diff) to
392 ;; the backend command. It should return a status of either 0 (no
393 ;; differences found), or 1 (either non-empty diff or the diff is
394 ;; run asynchronously).
396 ;; - revision-completion-table (files)
398 ;; Return a completion table for existing revisions of FILES.
399 ;; The default is to not use any completion table.
401 ;; - annotate-command (file buf &optional rev)
403 ;; If this function is provided, it should produce an annotated display
404 ;; of FILE in BUF, relative to revision REV. Annotation means each line
405 ;; of FILE displayed is prefixed with version information associated with
406 ;; its addition (deleted lines leave no history) and that the text of the
407 ;; file is fontified according to age.
409 ;; - annotate-time ()
411 ;; Only required if `annotate-command' is defined for the backend.
412 ;; Return the time of the next line of annotation at or after point,
413 ;; as a floating point fractional number of days. The helper
414 ;; function `vc-annotate-convert-time' may be useful for converting
415 ;; multi-part times as returned by `current-time' and `encode-time'
416 ;; to this format. Return nil if no more lines of annotation appear
417 ;; in the buffer. You can safely assume that point is placed at the
418 ;; beginning of each line, starting at `point-min'. The buffer that
419 ;; point is placed in is the Annotate output, as defined by the
420 ;; relevant backend. This function also affects how much of the line
421 ;; is fontified; where it leaves point is where fontification begins.
423 ;; - annotate-current-time ()
425 ;; Only required if `annotate-command' is defined for the backend,
426 ;; AND you'd like the current time considered to be anything besides
427 ;; (vc-annotate-convert-time (current-time)) -- i.e. the current
428 ;; time with hours, minutes, and seconds included. Probably safe to
429 ;; ignore. Return the current-time, in units of fractional days.
431 ;; - annotate-extract-revision-at-line ()
433 ;; Only required if `annotate-command' is defined for the backend.
434 ;; Invoked from a buffer in vc-annotate-mode, return the revision
435 ;; corresponding to the current line, or nil if there is no revision
436 ;; corresponding to the current line.
440 ;; - create-tag (dir name branchp)
442 ;; Attach the tag NAME to the state of the working copy. This
443 ;; should make sure that files are up-to-date before proceeding with
444 ;; the action. DIR can also be a file and if BRANCHP is specified,
445 ;; NAME should be created as a branch and DIR should be checked out
446 ;; under this new branch. The default implementation does not
447 ;; support branches but does a sanity check, a tree traversal and
448 ;; assigns the tag to each file.
450 ;; - retrieve-tag (dir name update)
452 ;; Retrieve the version tagged by NAME of all registered files at or below DIR.
453 ;; If UPDATE is non-nil, then update buffers of any files in the
454 ;; tag that are currently visited. The default implementation
455 ;; does a sanity check whether there aren't any uncommitted changes at
456 ;; or below DIR, and then performs a tree walk, using the `checkout'
457 ;; function to retrieve the corresponding revisions.
461 ;; - make-version-backups-p (file)
463 ;; Return non-nil if unmodified repository revisions of FILE should be
464 ;; backed up locally. If this is done, VC can perform `diff' and
465 ;; `revert' operations itself, without calling the backend system. The
466 ;; default implementation always returns nil.
468 ;; - repository-hostname (dirname)
470 ;; Return the hostname that the backend will have to contact
471 ;; in order to operate on a file in DIRNAME. If the return value
472 ;; is nil, it means that the repository is local.
473 ;; This function is used in `vc-stay-local-p' which backends can use
474 ;; for their convenience.
476 ;; - previous-revision (file rev)
478 ;; Return the revision number that precedes REV for FILE, or nil if no such
481 ;; - next-revision (file rev)
483 ;; Return the revision number that follows REV for FILE, or nil if no such
486 ;; - check-headers ()
488 ;; Return non-nil if the current buffer contains any version headers.
490 ;; - clear-headers ()
492 ;; In the current buffer, reset all version headers to their unexpanded
493 ;; form. This function should be provided if the state-querying code
494 ;; for this backend uses the version headers to determine the state of
495 ;; a file. This function will then be called whenever VC changes the
496 ;; version control state in such a way that the headers would give
497 ;; wrong information.
499 ;; - delete-file (file)
501 ;; Delete FILE and mark it as deleted in the repository. If this
502 ;; function is not provided, the command `vc-delete-file' will
505 ;; - rename-file (old new)
507 ;; Rename file OLD to NEW, both in the working area and in the
508 ;; repository. If this function is not provided, the renaming
509 ;; will be done by (vc-delete-file old) and (vc-register new).
511 ;; - find-file-hook ()
513 ;; Operation called in current buffer when opening a file. This can
514 ;; be used by the backend to setup some local variables it might need.
516 ;; - find-file-not-found-hook ()
518 ;; Operation called in current buffer when opening a non-existing file.
519 ;; By default, this asks the user if she wants to check out the file.
523 ;; Return a menu keymap, the items in the keymap will appear at the
524 ;; end of the Version Control menu. The goal is to allow backends
525 ;; to specify extra menu items that appear in the VC menu. This way
526 ;; you can provide menu entries for functionality that is specific
527 ;; to your backend and which does not map to any of the VC generic
530 ;; - extra-dir-menu ()
532 ;; Return a menu keymap, the items in the keymap will appear at the
533 ;; end of the VC Status menu. The goal is to allow backends to
534 ;; specify extra menu items that appear in the VC Status menu. This
535 ;; makes it possible to provide menu entries for functionality that
536 ;; is specific to a backend and which does not map to any of the VC
541 ;; - Get rid of the "master file" terminology.
543 ;; - Add key-binding for vc-delete-file.
547 ;; - deal with push/pull operations.
549 ;; - add a mechanism for editing the underlying VCS's list of files
550 ;; to be ignored, when that's possible.
552 ;;;; Primitives that need changing:
554 ;; - vc-update/vc-merge should deal with VC systems that don't
555 ;; update/merge on a file basis, but on a whole repository basis.
556 ;; vc-update and vc-merge assume the arguments are always files,
557 ;; they don't deal with directories. Make sure the *vc-dir* buffer
558 ;; is updated after these operations.
559 ;; At least bzr, git and hg should benefit from this.
561 ;;;; Improved branch and tag handling:
563 ;; - add a generic mechanism for remembering the current branch names,
564 ;; display the branch name in the mode-line. Replace
565 ;; vc-cvs-sticky-tag with that.
567 ;; - vc-create-tag and vc-retrieve-tag should update the
568 ;; buffers that might be visiting the affected files.
570 ;;;; Default Behavior:
572 ;; - do not default to RCS anymore when the current directory is not
573 ;; controlled by any VCS and the user does C-x v v
575 ;; - vc-responsible-backend should not return RCS if no backend
576 ;; declares itself responsible.
578 ;;;; Internal cleanups:
580 ;; - backends that care about vc-stay-local should try to take it into
581 ;; account for vc-dir. Is this likely to be useful??? YES!
583 ;; - vc-expand-dirs should take a backend parameter and only look for
584 ;; files managed by that backend.
586 ;; - Another important thing: merge all the status-like backend operations.
587 ;; We should remove dir-status, state, and dir-status-files, and
588 ;; replace them with just `status' which takes a fileset and a continuation
589 ;; (like dir-status) and returns a buffer in which the process(es) are run
590 ;; (or nil if it worked synchronously). Hopefully we can define the old
591 ;; 4 operations in term of this one.
595 ;; - when a file is in `conflict' state, turn on smerge-mode.
597 ;; - figure out what to do with conflicts that are not caused by the
598 ;; file contents, but by metadata or other causes. Example: File A
599 ;; gets renamed to B in one branch and to C in another and you merge
600 ;; the two branches. Or you locally add file FOO and then pull a
601 ;; change that also adds a new file FOO, ...
603 ;; - make it easier to write logs. Maybe C-x 4 a should add to the log
604 ;; buffer, if one is present, instead of adding to the ChangeLog.
606 ;; - When vc-next-action calls vc-checkin it could pre-fill the
607 ;; *VC-log* buffer with some obvious items: the list of files that
608 ;; were added, the list of files that were removed. If the diff is
609 ;; available, maybe it could even call something like
610 ;; `diff-add-change-log-entries-other-window' to create a detailed
611 ;; skeleton for the log...
613 ;; - most vc-dir backends need more work. They might need to
614 ;; provide custom headers, use the `extra' field and deal with all
615 ;; possible VC states.
617 ;; - add a function that calls vc-dir to `find-directory-functions'.
619 ;; - vc-diff, vc-annotate, etc. need to deal better with unregistered
620 ;; files. Now that unregistered and ignored files are shown in
621 ;; vc-dir, it is possible that these commands are called
622 ;; for unregistered/ignored files.
624 ;; - vc-next-action needs work in order to work with multiple
625 ;; backends: `vc-state' returns the state for the default backend,
626 ;; not for the backend in the current *vc-dir* buffer.
628 ;; - vc-dir-kill-dir-status-process should not be specific to dir-status,
629 ;; it should work for other async commands done through vc-do-command
632 ;; - vc-dir toolbar needs more icons.
634 ;; - The backends should avoid using `vc-file-setprop' and `vc-file-getprop'.
639 (require 'vc-dispatcher
)
644 (unless (assoc 'vc-parent-buffer minor-mode-alist
)
645 (setq minor-mode-alist
646 (cons '(vc-parent-buffer vc-parent-buffer-name
)
649 ;; General customization
652 "Version-control system in Emacs."
655 (defcustom vc-initial-comment nil
656 "If non-nil, prompt for initial comment when a file is registered."
660 (defcustom vc-default-init-revision
"1.1"
661 "A string used as the default revision number when a new file is registered.
662 This can be overridden by giving a prefix argument to \\[vc-register]. This
663 can also be overridden by a particular VC backend."
668 (defcustom vc-checkin-switches nil
669 "A string or list of strings specifying extra switches for checkin.
670 These are passed to the checkin program by \\[vc-checkin]."
671 :type
'(choice (const :tag
"None" nil
)
672 (string :tag
"Argument String")
673 (repeat :tag
"Argument List"
678 (defcustom vc-checkout-switches nil
679 "A string or list of strings specifying extra switches for checkout.
680 These are passed to the checkout program by \\[vc-checkout]."
681 :type
'(choice (const :tag
"None" nil
)
682 (string :tag
"Argument String")
683 (repeat :tag
"Argument List"
688 (defcustom vc-register-switches nil
689 "A string or list of strings; extra switches for registering a file.
690 These are passed to the checkin program by \\[vc-register]."
691 :type
'(choice (const :tag
"None" nil
)
692 (string :tag
"Argument String")
693 (repeat :tag
"Argument List"
698 (defcustom vc-diff-switches nil
699 "A string or list of strings specifying switches for diff under VC.
700 When running diff under a given BACKEND, VC uses the first
701 non-nil value of `vc-BACKEND-diff-switches', `vc-diff-switches',
702 and `diff-switches', in that order. Since nil means to check the
703 next variable in the sequence, either of the first two may use
704 the value t to mean no switches at all. `vc-diff-switches'
705 should contain switches that are specific to version control, but
706 not specific to any particular backend."
707 :type
'(choice (const :tag
"Unspecified" nil
)
708 (const :tag
"None" t
)
709 (string :tag
"Argument String")
710 (repeat :tag
"Argument List" :value
("") string
))
714 (defcustom vc-diff-knows-L nil
715 "Indicates whether diff understands the -L option.
716 The value is either `yes', `no', or nil. If it is nil, VC tries
717 to use -L and sets this variable to remember whether it worked."
718 :type
'(choice (const :tag
"Work out" nil
) (const yes
) (const no
))
721 (defcustom vc-allow-async-revert nil
722 "Specifies whether the diff during \\[vc-revert] may be asynchronous.
723 Enabling this option means that you can confirm a revert operation even
724 if the local changes in the file have not been found and displayed yet."
725 :type
'(choice (const :tag
"No" nil
)
726 (const :tag
"Yes" t
))
731 (defcustom vc-checkout-hook nil
732 "Normal hook (list of functions) run after checking out a file.
739 (defcustom vc-checkin-hook nil
740 "Normal hook (list of functions) run after commit or file checkin.
741 See also `log-edit-done-hook'."
743 :options
'(log-edit-comment-to-change-log)
747 (defcustom vc-before-checkin-hook nil
748 "Normal hook (list of functions) run before a commit or a file checkin.
753 ;; Header-insertion hair
755 (defcustom vc-static-header-alist
757 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
758 "Associate static header string templates with file types.
759 A \%s in the template is replaced with the first string associated with
760 the file's version control type in `vc-header-alist'."
761 :type
'(repeat (cons :format
"%v"
762 (regexp :tag
"File Type")
763 (string :tag
"Header String")))
766 (defcustom vc-comment-alist
767 '((nroff-mode ".\\\"" ""))
768 "Special comment delimiters for generating VC headers.
769 Add an entry in this list if you need to override the normal `comment-start'
770 and `comment-end' variables. This will only be necessary if the mode language
771 is sensitive to blank lines."
772 :type
'(repeat (list :format
"%v"
774 (string :tag
"Comment Start")
775 (string :tag
"Comment End")))
778 (defcustom vc-checkout-carefully
(= (user-uid) 0)
779 "Non-nil means be extra-careful in checkout.
780 Verify that the file really is not locked
781 and that its contents match what the master file says."
784 (make-obsolete-variable 'vc-checkout-carefully
785 "the corresponding checks are always done now."
789 ;; Variables users don't need to see
791 (defvar vc-disable-async-diff nil
792 "VC sets this to t locally to disable some async diff operations.
793 Backends that offer asynchronous diffs should respect this variable
794 in their implementation of vc-BACKEND-diff.")
796 ;; File property caching
798 (defun vc-clear-context ()
799 "Clear all cached file properties."
801 (fillarray vc-file-prop-obarray
0))
803 (defmacro with-vc-properties
(files form settings
)
804 "Execute FORM, then maybe set per-file properties for FILES.
805 SETTINGS is an association list of property/value pairs. After
806 executing FORM, set those properties from SETTINGS that have not yet
807 been updated to their corresponding values."
809 `(let ((vc-touched-properties (list t
)))
811 (dolist (file ,files
)
812 (dolist (setting ,settings
)
813 (let ((property (car setting
)))
814 (unless (memq property vc-touched-properties
)
815 (put (intern file vc-file-prop-obarray
)
816 property
(cdr setting
))))))))
818 ;;; Code for deducing what fileset and backend to assume
820 (defun vc-responsible-backend (file &optional register
)
821 "Return the name of a backend system that is responsible for FILE.
822 The optional argument REGISTER means that a backend suitable for
823 registration should be found.
825 If REGISTER is nil, then if FILE is already registered, return the
826 backend of FILE. If FILE is not registered, or a directory, then the
827 first backend in `vc-handled-backends' that declares itself
828 responsible for FILE is returned. If no backend declares itself
829 responsible, return the first backend.
831 If REGISTER is non-nil, return the first responsible backend under
832 which FILE is not yet registered. If there is no such backend, return
833 the first backend under which FILE is not yet registered, but could
835 (when (not vc-handled-backends
)
836 (error "No handled backends"))
837 (or (and (not (file-directory-p file
)) (not register
) (vc-backend file
))
839 ;; First try: find a responsible backend. If this is for registration,
840 ;; it must be a backend under which FILE is not yet registered.
841 (dolist (backend vc-handled-backends
)
842 (and (or (not register
)
843 (not (vc-call-backend backend
'registered file
)))
844 (vc-call-backend backend
'responsible-p file
)
845 (throw 'found backend
)))
846 ;; no responsible backend
848 ;; if this is not for registration, the first backend must do
849 (car vc-handled-backends
)
850 ;; for registration, we need to find a new backend that
851 ;; could register FILE
852 (dolist (backend vc-handled-backends
)
853 (and (not (vc-call-backend backend
'registered file
))
854 (vc-call-backend backend
'could-register file
)
855 (throw 'found backend
)))
856 (error "No backend that could register")))))
858 (defun vc-expand-dirs (file-or-dir-list)
859 "Expands directories in a file list specification.
860 Within directories, only files already under version control are noticed."
861 (let ((flattened '()))
862 (dolist (node file-or-dir-list
)
863 (when (file-directory-p node
)
865 node
(lambda (f) (when (vc-backend f
) (push f flattened
)))))
866 (unless (file-directory-p node
) (push node flattened
)))
867 (nreverse flattened
)))
869 (defun vc-derived-from-dir-mode (&optional buffer
)
870 "Are we in a VC-directory buffer, or do we have one as an ancestor?"
871 (let ((buffer (or buffer
(current-buffer))))
872 (cond ((derived-mode-p 'vc-dir-mode
) t
)
873 (vc-parent-buffer (vc-derived-from-dir-mode vc-parent-buffer
))
876 (defvar vc-dir-backend
)
878 ;; FIXME: this is not functional, commented out.
879 ;; (defun vc-deduce-fileset (&optional observer)
880 ;; "Deduce a set of files and a backend to which to apply an operation and
881 ;; the common state of the fileset. Return (BACKEND . FILESET)."
882 ;; (let* ((selection (vc-dispatcher-selection-set observer))
883 ;; (raw (car selection)) ;; Selection as user made it
884 ;; (cooked (cdr selection)) ;; Files only
885 ;; ;; FIXME: Store the backend in a buffer-local variable.
886 ;; (backend (if (vc-derived-from-dir-mode (current-buffer))
887 ;; ;; FIXME: this should use vc-dir-backend from
888 ;; ;; the *vc-dir* buffer.
889 ;; (vc-responsible-backend default-directory)
890 ;; (assert (and (= 1 (length raw))
891 ;; (not (file-directory-p (car raw)))))
892 ;; (vc-backend (car cooked)))))
893 ;; (cons backend selection)))
895 (declare-function vc-dir-current-file
"vc-dir" ())
896 (declare-function vc-dir-deduce-fileset
"vc-dir" (&optional state-model-only-files
))
898 (defun vc-deduce-fileset (&optional observer allow-unregistered
899 state-model-only-files
)
900 "Deduce a set of files and a backend to which to apply an operation.
902 Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL).
903 If we're in VC-dir mode, the fileset is the list of marked files.
904 Otherwise, if we're looking at a buffer visiting a version-controlled file,
905 the fileset is a singleton containing this file.
906 If none of these conditions is met, but ALLOW_UNREGISTERED is on and the
907 visited file is not registered, return a singleton fileset containing it.
908 Otherwise, throw an error.
910 STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs
911 the FILESET-ONLY-FILES STATE and MODEL info. Otherwise, that
913 BEWARE: this function may change the
915 ;; FIXME: OBSERVER is unused. The name is not intuitive and is not
916 ;; documented. It's set to t when called from diff and print-log.
919 ((derived-mode-p 'vc-dir-mode
)
920 (vc-dir-deduce-fileset state-model-only-files
))
921 ((setq backend
(vc-backend buffer-file-name
))
922 (if state-model-only-files
923 (list backend
(list buffer-file-name
)
924 (list buffer-file-name
)
925 (vc-state buffer-file-name
)
926 (vc-checkout-model backend buffer-file-name
))
927 (list backend
(list buffer-file-name
))))
928 ((and (buffer-live-p vc-parent-buffer
)
929 ;; FIXME: Why this test? --Stef
930 (or (buffer-file-name vc-parent-buffer
)
931 (with-current-buffer vc-parent-buffer
932 (eq major-mode
'vc-dir-mode
))))
933 (progn ;FIXME: Why not `with-current-buffer'? --Stef.
934 (set-buffer vc-parent-buffer
)
935 (vc-deduce-fileset observer allow-unregistered state-model-only-files
)))
936 ((not buffer-file-name
)
937 (error "Buffer %s is not associated with a file" (buffer-name)))
938 ((and allow-unregistered
(not (vc-registered buffer-file-name
)))
939 (if state-model-only-files
940 (list (vc-responsible-backend
941 (file-name-directory (buffer-file-name)))
942 (list buffer-file-name
)
943 (list buffer-file-name
)
944 (when state-model-only-files
'unregistered
)
946 (list (vc-responsible-backend
947 (file-name-directory (buffer-file-name)))
948 (list buffer-file-name
))))
949 (t (error "No fileset is available here.")))))
951 (defun vc-ensure-vc-buffer ()
952 "Make sure that the current buffer visits a version-controlled file."
954 ((derived-mode-p 'vc-dir-mode
)
955 (set-buffer (find-file-noselect (vc-dir-current-file))))
957 (while (and vc-parent-buffer
958 (buffer-live-p vc-parent-buffer
)
959 ;; Avoid infinite looping when vc-parent-buffer and
960 ;; current buffer are the same buffer.
961 (not (eq vc-parent-buffer
(current-buffer))))
962 (set-buffer vc-parent-buffer
))
963 (if (not buffer-file-name
)
964 (error "Buffer %s is not associated with a file" (buffer-name))
965 (unless (vc-backend buffer-file-name
)
966 (error "File %s is not under version control" buffer-file-name
))))))
968 ;;; Support for the C-x v v command.
969 ;; This is where all the single-file-oriented code from before the fileset
972 (defsubst vc-editable-p
(file)
973 "Return non-nil if FILE can be edited."
974 (let ((backend (vc-backend file
)))
976 (or (eq (vc-checkout-model backend
(list file
)) 'implicit
)
977 (memq (vc-state file
) '(edited needs-merge conflict
))))))
979 (defun vc-compatible-state (p q
)
980 "Controls which states can be in the same commit."
983 (and (member p
'(edited added removed
)) (member q
'(edited added removed
)))))
985 ;; Here's the major entry point.
988 (defun vc-next-action (verbose)
989 "Do the next logical version control operation on the current fileset.
990 This requires that all files in the fileset be in the same state.
993 If every file is not already registered, this registers each for version
995 If every file is registered and not locked by anyone, this checks out
996 a writable and locked file of each ready for editing.
997 If every file is checked out and locked by the calling user, this
998 first checks to see if each file has changed since checkout. If not,
999 it performs a revert on that file.
1000 If every file has been changed, this pops up a buffer for entry
1001 of a log message; when the message has been entered, it checks in the
1002 resulting changes along with the log message as change commentary. If
1003 the variable `vc-keep-workfiles' is non-nil (which is its default), a
1004 read-only copy of each changed file is left in place afterwards.
1005 If the affected file is registered and locked by someone else, you are
1006 given the option to steal the lock(s).
1008 For merging systems:
1009 If every file is not already registered, this registers each one for version
1010 control. This does an add, but not a commit.
1011 If every file is added but not committed, each one is committed.
1012 If every working file is changed, but the corresponding repository file is
1013 unchanged, this pops up a buffer for entry of a log message; when the
1014 message has been entered, it checks in the resulting changes along
1015 with the logmessage as change commentary. A writable file is retained.
1016 If the repository file is changed, you are asked if you want to
1017 merge in the changes into your working copy."
1019 (let* ((vc-fileset (vc-deduce-fileset nil t
'state-model-only-files
))
1020 (backend (car vc-fileset
))
1021 (files (nth 1 vc-fileset
))
1022 (fileset-only-files (nth 2 vc-fileset
))
1023 ;; FIXME: We used to call `vc-recompute-state' here.
1024 (state (nth 3 vc-fileset
))
1025 ;; The backend should check that the checkout-model is consistent
1026 ;; among all the `files'.
1027 (model (nth 4 vc-fileset
))
1030 ;; Do the right thing
1032 ((eq state
'missing
)
1033 (error "Fileset files are missing, so cannot be operated on."))
1034 ((eq state
'ignored
)
1035 (error "Fileset files are ignored by the version-control system."))
1036 ((or (null state
) (eq state
'unregistered
))
1037 (vc-register nil vc-fileset
))
1038 ;; Files are up-to-date, or need a merge and user specified a revision
1039 ((or (eq state
'up-to-date
) (and verbose
(eq state
'needs-update
)))
1042 ;; go to a different revision
1043 (setq revision
(read-string "Branch, revision, or backend to move to: "))
1044 (let ((revision-downcase (downcase revision
)))
1047 (mapcar (lambda (arg) (downcase (symbol-name arg
))) vc-handled-backends
))
1048 (let ((vsym (intern-soft revision-downcase
)))
1049 (dolist (file files
) (vc-transfer-file file vsym
)))
1050 (dolist (file files
)
1051 (vc-checkout file
(eq model
'implicit
) revision
)))))
1052 ((not (eq model
'implicit
))
1053 ;; check the files out
1054 (dolist (file files
) (vc-checkout file t
)))
1057 (message "Fileset is up-to-date"))))
1058 ;; Files have local changes
1059 ((vc-compatible-state state
'edited
)
1060 (let ((ready-for-commit files
))
1061 ;; If files are edited but read-only, give user a chance to correct
1062 (dolist (file files
)
1063 (unless (file-writable-p file
)
1064 ;; Make the file+buffer read-write.
1065 (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file
))
1067 (set-file-modes file
(logior (file-modes file
) 128))
1068 (let ((visited (get-file-buffer file
)))
1070 (with-current-buffer visited
1071 (toggle-read-only -
1))))))
1072 ;; Allow user to revert files with no changes
1074 (dolist (file files
)
1075 (let ((visited (get-file-buffer file
)))
1076 ;; For files with locking, if the file does not contain
1077 ;; any changes, just let go of the lock, i.e. revert.
1078 (when (and (not (eq model
'implicit
))
1079 (vc-workfile-unchanged-p file
)
1080 ;; If buffer is modified, that means the user just
1081 ;; said no to saving it; in that case, don't revert,
1082 ;; because the user might intend to save after
1083 ;; finishing the log entry and committing.
1084 (not (and visited
(buffer-modified-p))))
1085 (vc-revert-file file
)
1086 (setq ready-for-commit
(delete file ready-for-commit
))))))
1087 ;; Remaining files need to be committed
1088 (if (not ready-for-commit
)
1089 (message "No files remain to be committed")
1091 (vc-checkin ready-for-commit backend
)
1092 (setq revision
(read-string "New revision or backend: "))
1093 (let ((revision-downcase (downcase revision
)))
1096 (mapcar (lambda (arg) (downcase (symbol-name arg
)))
1097 vc-handled-backends
))
1098 (let ((vsym (intern revision-downcase
)))
1099 (dolist (file files
) (vc-transfer-file file vsym
)))
1100 (vc-checkin ready-for-commit backend revision
)))))))
1101 ;; locked by somebody else (locking VCSes only)
1103 ;; In the old days, we computed the revision once and used it on
1104 ;; the single file. Then, for the 2007-2008 fileset rewrite, we
1105 ;; computed the revision once (incorrectly, using a free var) and
1106 ;; used it on all files. To fix the free var bug, we can either
1107 ;; use `(car files)' or do what we do here: distribute the
1108 ;; revision computation among `files'. Although this may be
1109 ;; tedious for those backends where a "revision" is a trans-file
1110 ;; concept, it is nonetheless correct for both those and (more
1111 ;; importantly) for those where "revision" is a per-file concept.
1112 ;; If the intersection of the former group and "locking VCSes" is
1113 ;; non-empty [I vaguely doubt it --ttn], we can reinstate the
1114 ;; pre-computation approach of yore.
1115 (dolist (file files
)
1118 (read-string (format "%s revision to steal: " file
))
1119 (vc-working-revision file
))
1122 ((eq state
'conflict
)
1123 ;; FIXME: Is it really the UI we want to provide?
1124 ;; In my experience, the conflicted files should be marked as resolved
1125 ;; one-by-one when saving the file after resolving the conflicts.
1126 ;; I.e. stating explicitly that the conflicts are resolved is done
1128 (vc-mark-resolved backend files
))
1130 ((eq state
'needs-update
)
1131 (dolist (file files
)
1132 (if (yes-or-no-p (format
1133 "%s is not up-to-date. Get latest revision? "
1134 (file-name-nondirectory file
)))
1135 (vc-checkout file
(eq model
'implicit
) t
)
1136 (when (and (not (eq model
'implicit
))
1137 (yes-or-no-p "Lock this revision? "))
1138 (vc-checkout file t
)))))
1140 ((eq state
'needs-merge
)
1141 (dolist (file files
)
1142 (when (yes-or-no-p (format
1143 "%s is not up-to-date. Merge in changes now? "
1144 (file-name-nondirectory file
)))
1145 (vc-maybe-resolve-conflicts
1146 file
(vc-call-backend backend
'merge-news file
)))))
1149 ((eq state
'unlocked-changes
)
1150 (dolist (file files
)
1151 (when (not (equal buffer-file-name file
))
1152 (find-file-other-window file
))
1153 (if (save-window-excursion
1154 (vc-diff-internal nil
1155 (cons (car vc-fileset
) (cons (cadr vc-fileset
) (list file
)))
1156 (vc-working-revision file
) nil
)
1157 (goto-char (point-min))
1158 (let ((inhibit-read-only t
))
1160 (format "Changes to %s since last lock:\n\n" file
)))
1162 (yes-or-no-p (concat "File has unlocked changes. "
1163 "Claim lock retaining changes? ")))
1164 (progn (vc-call-backend backend
'steal-lock file
)
1165 (clear-visited-file-modtime)
1166 ;; Must clear any headers here because they wouldn't
1167 ;; show that the file is locked now.
1168 (vc-clear-headers file
)
1169 (write-file buffer-file-name
)
1170 (vc-mode-line file
))
1171 (if (not (yes-or-no-p
1172 "Revert to checked-in revision, instead? "))
1173 (error "Checkout aborted")
1174 (vc-revert-buffer-internal t t
)
1175 (vc-checkout file t
)))))
1176 ;; Unknown fileset state
1178 (error "Fileset is in an unknown state %s" state
)))))
1180 (defun vc-create-repo (backend)
1181 "Create an empty repository in the current directory."
1187 "Create repository for: "
1188 (mapcar (lambda (b) (list (downcase (symbol-name b
)))) vc-handled-backends
)
1190 (vc-call-backend backend
'create-repo
))
1193 (defun vc-register (&optional set-revision vc-fileset comment
)
1194 "Register into a version control system.
1195 If VC-FILESET is given, register the files in that fileset.
1196 Otherwise register the current file.
1197 With prefix argument SET-REVISION, allow user to specify initial revision
1198 level. If COMMENT is present, use that as an initial comment.
1200 The version control system to use is found by cycling through the list
1201 `vc-handled-backends'. The first backend in that list which declares
1202 itself responsible for the file (usually because other files in that
1203 directory are already registered under that backend) will be used to
1204 register the file. If no backend declares itself responsible, the
1205 first backend that could register the file is used."
1207 (let* ((fileset-arg (or vc-fileset
(vc-deduce-fileset nil t
)))
1208 (backend (car fileset-arg
))
1209 (files (nth 1 fileset-arg
)))
1210 ;; We used to operate on `only-files', but VC wants to provide the
1211 ;; possibility to register directories rather than files only, since
1212 ;; many VCS allow that as well.
1213 (dolist (fname files
)
1214 (let ((bname (get-file-buffer fname
)))
1215 (unless fname
(setq fname buffer-file-name
))
1216 (when (vc-backend fname
)
1217 (if (vc-registered fname
)
1218 (error "This file is already registered")
1219 (unless (y-or-n-p "Previous master file has vanished. Make a new one? ")
1220 (error "Aborted"))))
1221 ;; Watch out for new buffers of size 0: the corresponding file
1222 ;; does not exist yet, even though buffer-modified-p is nil.
1224 (with-current-buffer bname
1225 (when (and (not (buffer-modified-p))
1226 (zerop (buffer-size))
1227 (not (file-exists-p buffer-file-name
)))
1228 (set-buffer-modified-p t
))
1229 (vc-buffer-sync)))))
1230 (lexical-let ((backend backend
)
1235 (read-string (format "Initial revision level for %s: " files
))
1236 (vc-call-backend backend
'init-revision
))
1237 (or comment
(not vc-initial-comment
))
1239 "Enter initial comment."
1241 (lambda (files rev comment
)
1242 (message "Registering %s... " files
)
1243 (mapc 'vc-file-clearprops files
)
1244 (vc-call-backend backend
'register files rev comment
)
1245 (dolist (file files
)
1246 (vc-file-setprop file
'vc-backend backend
)
1247 ;; FIXME: This is wrong: it should set `backup-inhibited' in all
1248 ;; the buffers visiting files affected by this `vc-register', not
1249 ;; in the current-buffer.
1250 ;; (unless vc-make-backup-files
1251 ;; (make-local-variable 'backup-inhibited)
1252 ;; (setq backup-inhibited t))
1254 (message "Registering %s... done" files
))))))
1256 (defun vc-register-with (backend)
1257 "Register the current file with a specified back end."
1258 (interactive "SBackend: ")
1259 (when (not (member backend vc-handled-backends
))
1260 (error "Unknown back end."))
1261 (let ((vc-handled-backends (list backend
)))
1262 (call-interactively 'vc-register
)))
1264 (defun vc-checkout (file &optional writable rev
)
1265 "Retrieve a copy of the revision REV of FILE.
1266 If WRITABLE is non-nil, make sure the retrieved file is writable.
1267 REV defaults to the latest revision.
1269 After check-out, runs the normal hook `vc-checkout-hook'."
1272 (vc-call make-version-backups-p file
)
1273 (vc-up-to-date-p file
)
1274 (vc-make-version-backup file
))
1275 (let ((backend (vc-backend file
)))
1276 (with-vc-properties (list file
)
1278 (vc-call-backend backend
'checkout file writable rev
)
1280 ;; Maybe the backend is not installed ;-(
1282 (let ((buf (get-file-buffer file
)))
1283 (when buf
(with-current-buffer buf
(toggle-read-only -
1)))))
1284 (signal (car err
) (cdr err
))))
1285 `((vc-state .
,(if (or (eq (vc-checkout-model backend
(list file
)) 'implicit
)
1287 (if (vc-call-backend backend
'latest-on-branch-p file
)
1291 (vc-checkout-time .
,(nth 5 (file-attributes file
))))))
1292 (vc-resynch-buffer file t t
)
1293 (run-hooks 'vc-checkout-hook
))
1295 (defun vc-mark-resolved (backend files
)
1296 (prog1 (with-vc-properties
1298 (vc-call-backend backend
'mark-resolved files
)
1299 ;; FIXME: Is this TRTD? Might not be.
1300 `((vc-state . edited
)))
1302 (substitute-command-keys
1303 "Conflicts have been resolved in %s. \
1304 Type \\[vc-next-action] to check in changes.")
1305 (if (> (length files
) 1)
1306 (format "%d files" (length files
))
1309 (defun vc-steal-lock (file rev owner
)
1310 "Steal the lock on FILE."
1311 (let (file-description)
1313 (setq file-description
(format "%s:%s" file rev
))
1314 (setq file-description file
))
1315 (when (not (yes-or-no-p (format "Steal the lock on %s from %s? "
1316 file-description owner
)))
1317 (error "Steal canceled"))
1318 (message "Stealing lock on %s..." file
)
1321 (vc-call steal-lock file rev
)
1322 `((vc-state . edited
)))
1323 (vc-resynch-buffer file t t
)
1324 (message "Stealing lock on %s...done" file
)
1325 ;; Write mail after actually stealing, because if the stealing
1326 ;; goes wrong, we don't want to send any mail.
1327 (compose-mail owner
(format "Stolen lock on %s" file-description
))
1328 (setq default-directory
(expand-file-name "~/"))
1329 (goto-char (point-max))
1331 (format "I stole the lock on %s, " file-description
)
1332 (current-time-string)
1334 (message "Please explain why you stole the lock. Type C-c C-c when done.")))
1336 (defun vc-checkin (files backend
&optional rev comment initial-contents
)
1338 The optional argument REV may be a string specifying the new revision
1339 level (if nil increment the current level). COMMENT is a comment
1340 string; if omitted, a buffer is popped up to accept a comment. If
1341 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial contents
1342 of the log entry buffer.
1344 If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided
1345 that the version control system supports this mode of operation.
1347 Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
1348 (when vc-before-checkin-hook
1349 (run-hooks 'vc-before-checkin-hook
))
1353 files rev comment initial-contents
1354 "Enter a change comment."
1356 (lambda (files rev comment
)
1357 (message "Checking in %s..." (vc-delistify files
))
1358 ;; "This log message intentionally left almost blank".
1359 ;; RCS 5.7 gripes about white-space-only comments too.
1360 (or (and comment
(string-match "[^\t\n ]" comment
))
1361 (setq comment
"*** empty log message ***"))
1364 ;; We used to change buffers to get local value of vc-checkin-switches,
1365 ;; but 'the' local buffer is not a well-defined concept for filesets.
1367 (vc-call-backend backend
'checkin files rev comment
)
1368 (mapc 'vc-delete-automatic-version-backups files
))
1369 `((vc-state . up-to-date
)
1370 (vc-checkout-time .
,(nth 5 (file-attributes file
)))
1371 (vc-working-revision . nil
)))
1372 (message "Checking in %s...done" (vc-delistify files
)))
1375 ;;; Additional entry points for examining version histories
1377 ;; (defun vc-default-diff-tree (backend dir rev1 rev2)
1378 ;; "List differences for all registered files at and below DIR.
1379 ;; The meaning of REV1 and REV2 is the same as for `vc-revision-diff'."
1380 ;; ;; This implementation does an explicit tree walk, and calls
1381 ;; ;; vc-BACKEND-diff directly for each file. An optimization
1382 ;; ;; would be to use `vc-diff-internal', so that diffs can be local,
1383 ;; ;; and to call it only for files that are actually changed.
1384 ;; ;; However, this is expensive for some backends, and so it is left
1385 ;; ;; to backend-specific implementations.
1386 ;; (setq default-directory dir)
1387 ;; (vc-file-tree-walk
1388 ;; default-directory
1391 ;; `(let ((coding-system-for-read (vc-coding-system-for-diff ',f)))
1392 ;; (message "Looking at %s" ',f)
1393 ;; (vc-call-backend ',(vc-backend f)
1394 ;; 'diff (list ',f) ',rev1 ',rev2))))))
1396 (defun vc-coding-system-for-diff (file)
1397 "Return the coding system for reading diff output for FILE."
1398 (or coding-system-for-read
1399 ;; if we already have this file open,
1400 ;; use the buffer's coding system
1401 (let ((buf (find-buffer-visiting file
)))
1402 (when buf
(with-current-buffer buf
1403 buffer-file-coding-system
)))
1404 ;; otherwise, try to find one based on the file name
1405 (car (find-operation-coding-system 'insert-file-contents file
))
1406 ;; and a final fallback
1409 (defun vc-switches (backend op
)
1410 "Return a list of vc-BACKEND switches for operation OP.
1411 BACKEND is a symbol such as `CVS', which will be downcased.
1412 OP is a symbol such as `diff'.
1414 In decreasing order of preference, return the value of:
1415 vc-BACKEND-OP-switches (e.g. `vc-cvs-diff-switches');
1416 vc-OP-switches (e.g. `vc-diff-switches'); or, in the case of
1417 diff only, `diff-switches'.
1419 If the chosen value is not a string or a list, return nil.
1420 This is so that you may set, e.g. `vc-svn-diff-switches' to t in order
1421 to override the value of `vc-diff-switches' and `diff-switches'."
1424 (let ((sym (vc-make-backend-sym
1425 backend
(intern (concat (symbol-name op
)
1427 (when (boundp sym
) (symbol-value sym
))))
1428 (let ((sym (intern (format "vc-%s-switches" (symbol-name op
)))))
1429 (when (boundp sym
) (symbol-value sym
)))
1431 ((eq op
'diff
) diff-switches
)))))
1432 (if (stringp switches
) (list switches
)
1433 ;; If not a list, return nil.
1434 ;; This is so we can set vc-diff-switches to t to override
1435 ;; any switches in diff-switches.
1436 (when (listp switches
) switches
))))
1438 ;; Old def for compatibility with Emacs-21.[123].
1439 (defmacro vc-diff-switches-list
(backend) `(vc-switches ',backend
'diff
))
1440 (make-obsolete 'vc-diff-switches-list
'vc-switches
"22.1")
1442 (defun vc-diff-finish (buffer messages
)
1443 ;; The empty sync output case has already been handled, so the only
1444 ;; possibility of an empty output is for an async process.
1445 (when (buffer-live-p buffer
)
1446 (let ((window (get-buffer-window buffer t
))
1447 (emptyp (zerop (buffer-size buffer
))))
1448 (with-current-buffer buffer
1449 (and messages emptyp
1450 (let ((inhibit-read-only t
))
1451 (insert (cdr messages
) ".\n")
1452 (message "%s" (cdr messages
))))
1453 (goto-char (point-min))
1455 (shrink-window-if-larger-than-buffer window
)))
1456 (when (and messages
(not emptyp
))
1457 (message "%sdone" (car messages
))))))
1459 (defvar vc-diff-added-files nil
1460 "If non-nil, diff added files by comparing them to /dev/null.")
1462 (defun vc-diff-internal (async vc-fileset rev1 rev2
&optional verbose
)
1463 "Report diffs between two revisions of a fileset.
1464 Diff output goes to the *vc-diff* buffer. The function
1465 returns t if the buffer had changes, nil otherwise."
1466 (let* ((files (cadr vc-fileset
))
1467 (messages (cons (format "Finding changes in %s..."
1468 (vc-delistify files
))
1469 (format "No changes between %s and %s"
1470 (or rev1
"working revision")
1471 (or rev2
"workfile"))))
1472 ;; Set coding system based on the first file. It's a kluge,
1473 ;; but the only way to set it for each file included would
1474 ;; be to call the back end separately for each file.
1475 (coding-system-for-read
1476 (if files
(vc-coding-system-for-diff (car files
)) 'undecided
)))
1477 (vc-setup-buffer "*vc-diff*")
1478 (message "%s" (car messages
))
1479 ;; Many backends don't handle well the case of a file that has been
1480 ;; added but not yet committed to the repo (notably CVS and Subversion).
1481 ;; Do that work here so the backends don't have to futz with it. --ESR
1483 ;; Actually most backends (including CVS) have options to control the
1484 ;; behavior since which one is better depends on the user and on the
1485 ;; situation). Worse yet: this code does not handle the case where
1486 ;; `file' is a directory which contains added files.
1487 ;; I made it conditional on vc-diff-added-files but it should probably
1488 ;; just be removed (or copied/moved to specific backends). --Stef.
1489 (when vc-diff-added-files
1490 (let ((filtered '()))
1491 (dolist (file files
)
1492 (if (or (file-directory-p file
)
1493 (not (string= (vc-working-revision file
) "0")))
1494 (push file filtered
)
1495 ;; This file is added but not yet committed;
1496 ;; there is no master file to diff against.
1498 (error "No revisions of %s exist" file
)
1499 ;; We regard this as "changed".
1500 ;; Diff it against /dev/null.
1501 (apply 'vc-do-command
"*vc-diff*"
1503 (append (vc-switches nil
'diff
) '("/dev/null"))))))
1504 (setq files
(nreverse filtered
))))
1505 (let ((vc-disable-async-diff (not async
)))
1506 (vc-call-backend (car vc-fileset
) 'diff files rev1 rev2
"*vc-diff*"))
1507 (set-buffer "*vc-diff*")
1508 (if (and (zerop (buffer-size))
1509 (not (get-buffer-process (current-buffer))))
1510 ;; Treat this case specially so as not to pop the buffer.
1512 (message "%s" (cdr messages
))
1515 ;; Make the *vc-diff* buffer read only, the diff-mode key
1516 ;; bindings are nicer for read only buffers. pcl-cvs does the
1518 (setq buffer-read-only t
)
1519 (vc-exec-after `(vc-diff-finish ,(current-buffer) ',(when verbose
1521 ;; Display the buffer, but at the end because it can change point.
1522 (pop-to-buffer (current-buffer))
1523 ;; In the async case, we return t even if there are no differences
1524 ;; because we don't know that yet.
1528 (defun vc-version-diff (files rev1 rev2
)
1529 "Report diffs between revisions of the fileset in the repository history."
1531 (let* ((vc-fileset (vc-deduce-fileset t
)) ;FIXME: why t? --Stef
1532 (files (cadr vc-fileset
))
1533 (backend (car vc-fileset
))
1536 (vc-call-backend backend
'revision-completion-table files
))
1540 ;; someday we may be able to do revision completion on non-singleton
1541 ;; filesets, but not yet.
1542 ((/= (length files
) 1)
1544 ;; if it's a directory, don't supply any revision default
1545 ((file-directory-p first
)
1547 ;; if the file is not up-to-date, use working revision as older revision
1548 ((not (vc-up-to-date-p first
))
1549 (setq rev1-default
(vc-working-revision first
)))
1550 ;; if the file is not locked, use last and previous revisions as defaults
1552 (setq rev1-default
(vc-call-backend backend
'previous-revision first
1553 (vc-working-revision first
)))
1554 (when (string= rev1-default
"") (setq rev1-default nil
))
1555 (setq rev2-default
(vc-working-revision first
))))
1556 ;; construct argument list
1557 (let* ((rev1-prompt (if rev1-default
1558 (concat "Older revision (default "
1560 "Older revision: "))
1561 (rev2-prompt (concat "Newer revision (default "
1562 (or rev2-default
"current source") "): "))
1563 (rev1 (if completion-table
1564 (completing-read rev1-prompt completion-table
1565 nil nil nil nil rev1-default
)
1566 (read-string rev1-prompt nil nil rev1-default
)))
1567 (rev2 (if completion-table
1568 (completing-read rev2-prompt completion-table
1569 nil nil nil nil rev2-default
)
1570 (read-string rev2-prompt nil nil rev2-default
))))
1571 (when (string= rev1
"") (setq rev1 nil
))
1572 (when (string= rev2
"") (setq rev2 nil
))
1573 (list files rev1 rev2
))))
1574 ;; All that was just so we could do argument completion!
1575 (when (and (not rev1
) rev2
)
1576 (error "Not a valid revision range."))
1577 ;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the
1578 ;; placement rules for (interactive) don't actually leave us a choice.
1579 (vc-diff-internal t
(vc-deduce-fileset) rev1 rev2
(interactive-p)))
1581 ;; (defun vc-contains-version-controlled-file (dir)
1582 ;; "Return t if DIR contains a version-controlled file, nil otherwise."
1584 ;; (mapc (lambda (f) (and (not (file-directory-p f)) (vc-backend f) (throw 'found 't))) (directory-files dir))
1588 (defun vc-diff (historic &optional not-urgent
)
1589 "Display diffs between file revisions.
1590 Normally this compares the currently selected fileset with their
1591 working revisions. With a prefix argument HISTORIC, it reads two revision
1592 designators specifying which revisions to compare.
1594 The optional argument NOT-URGENT non-nil means it is ok to say no to
1596 (interactive (list current-prefix-arg t
))
1598 (call-interactively 'vc-version-diff
)
1599 (when buffer-file-name
(vc-buffer-sync not-urgent
))
1600 (vc-diff-internal t
(vc-deduce-fileset) nil nil
(interactive-p))))
1603 (defun vc-revision-other-window (rev)
1604 "Visit revision REV of the current file in another window.
1605 If the current file is named `F', the revision is named `F.~REV~'.
1606 If `F.~REV~' already exists, use it instead of checking it out again."
1608 (save-current-buffer
1609 (vc-ensure-vc-buffer)
1610 (let ((completion-table
1611 (vc-call revision-completion-table buffer-file-name
))
1612 (prompt "Revision to visit (default is working revision): "))
1614 (if completion-table
1615 (completing-read prompt completion-table
)
1616 (read-string prompt
))))))
1617 (vc-ensure-vc-buffer)
1618 (let* ((file buffer-file-name
)
1619 (revision (if (string-equal rev
"")
1620 (vc-working-revision file
)
1622 (switch-to-buffer-other-window (vc-find-revision file revision
))))
1624 (defun vc-find-revision (file revision
)
1625 "Read REVISION of FILE into a buffer and return the buffer."
1626 (let ((automatic-backup (vc-version-backup-file-name file revision
))
1627 (filebuf (or (get-file-buffer file
) (current-buffer)))
1628 (filename (vc-version-backup-file-name file revision
'manual
)))
1629 (unless (file-exists-p filename
)
1630 (if (file-exists-p automatic-backup
)
1631 (rename-file automatic-backup filename nil
)
1632 (message "Checking out %s..." filename
)
1633 (with-current-buffer filebuf
1636 (let ((coding-system-for-read 'no-conversion
)
1637 (coding-system-for-write 'no-conversion
))
1638 (with-temp-file filename
1639 (let ((outbuf (current-buffer)))
1640 ;; Change buffer to get local value of
1641 ;; vc-checkout-switches.
1642 (with-current-buffer filebuf
1643 (vc-call find-revision file revision outbuf
))))
1645 (when (and failed
(file-exists-p filename
))
1646 (delete-file filename
))))
1647 (vc-mode-line file
))
1648 (message "Checking out %s...done" filename
)))
1649 (let ((result-buf (find-file-noselect filename
)))
1650 (with-current-buffer result-buf
1651 ;; Set the parent buffer so that things like
1652 ;; C-x v g, C-x v l, ... etc work.
1653 (set (make-local-variable 'vc-parent-buffer
) filebuf
))
1656 ;; Header-insertion code
1659 (defun vc-insert-headers ()
1660 "Insert headers into a file for use with a version control system.
1661 Headers desired are inserted at point, and are pulled from
1662 the variable `vc-BACKEND-header'."
1664 (vc-ensure-vc-buffer)
1668 (when (or (not (vc-check-headers))
1669 (y-or-n-p "Version headers already exist. Insert another set? "))
1670 (let* ((delims (cdr (assq major-mode vc-comment-alist
)))
1671 (comment-start-vc (or (car delims
) comment-start
"#"))
1672 (comment-end-vc (or (car (cdr delims
)) comment-end
""))
1673 (hdsym (vc-make-backend-sym (vc-backend buffer-file-name
)
1675 (hdstrings (and (boundp hdsym
) (symbol-value hdsym
))))
1676 (dolist (s hdstrings
)
1677 (insert comment-start-vc
"\t" s
"\t"
1678 comment-end-vc
"\n"))
1679 (when vc-static-header-alist
1680 (dolist (f vc-static-header-alist
)
1681 (when (string-match (car f
) buffer-file-name
)
1682 (insert (format (cdr f
) (car hdstrings
)))))))))))
1684 (defun vc-clear-headers (&optional file
)
1685 "Clear all version headers in the current buffer (or FILE).
1686 The headers are reset to their non-expanded form."
1687 (let* ((filename (or file buffer-file-name
))
1688 (visited (find-buffer-visiting filename
))
1689 (backend (vc-backend filename
)))
1690 (when (vc-find-backend-function backend
'clear-headers
)
1692 (let ((context (vc-buffer-context)))
1693 ;; save-excursion may be able to relocate point and mark
1694 ;; properly. If it fails, vc-restore-buffer-context
1695 ;; will give it a second try.
1697 (vc-call-backend backend
'clear-headers
))
1698 (vc-restore-buffer-context context
))
1699 (set-buffer (find-file-noselect filename
))
1700 (vc-call-backend backend
'clear-headers
)
1701 (kill-buffer filename
)))))
1703 (defun vc-modify-change-comment (files rev oldcomment
)
1704 "Edit the comment associated with the given files and revision."
1706 files rev oldcomment t
1707 "Enter a replacement change comment."
1709 (lambda (files rev comment
)
1711 ;; Less of a kluge than it looks like; log-view mode only passes
1712 ;; this function a singleton list. Arguments left in this form in
1713 ;; case the more general operation ever becomes meaningful.
1714 (vc-responsible-backend (car files
))
1715 'modify-change-comment files rev comment
))))
1719 "Merge changes between two revisions into the current buffer's file.
1720 This asks for two revisions to merge from in the minibuffer. If the
1721 first revision is a branch number, then merge all changes from that
1722 branch. If the first revision is empty, merge news, i.e. recent changes
1723 from the current branch.
1725 See Info node `Merging'."
1727 (vc-ensure-vc-buffer)
1729 (let* ((file buffer-file-name
)
1730 (backend (vc-backend file
))
1731 (state (vc-state file
))
1732 first-revision second-revision status
)
1734 ((stringp state
) ;; Locking VCses only
1735 (error "File is locked by %s" state
))
1736 ((not (vc-editable-p file
))
1738 "File must be checked out for merging. Check out now? ")
1739 (vc-checkout file t
)
1740 (error "Merge aborted"))))
1741 (setq first-revision
1742 (read-string (concat "Branch or revision to merge from "
1743 "(default news on current branch): ")))
1744 (if (string= first-revision
"")
1745 (setq status
(vc-call-backend backend
'merge-news file
))
1746 (if (not (vc-find-backend-function backend
'merge
))
1747 (error "Sorry, merging is not implemented for %s" backend
)
1748 (if (not (vc-branch-p first-revision
))
1749 (setq second-revision
1750 (read-string "Second revision: "
1751 (concat (vc-branch-part first-revision
) ".")))
1752 ;; We want to merge an entire branch. Set revisions
1753 ;; accordingly, so that vc-BACKEND-merge understands us.
1754 (setq second-revision first-revision
)
1755 ;; first-revision must be the starting point of the branch
1756 (setq first-revision
(vc-branch-part first-revision
)))
1757 (setq status
(vc-call-backend backend
'merge file
1758 first-revision second-revision
))))
1759 (vc-maybe-resolve-conflicts file status
"WORKFILE" "MERGE SOURCE")))
1761 (defun vc-maybe-resolve-conflicts (file status
&optional name-A name-B
)
1762 (vc-resynch-buffer file t
(not (buffer-modified-p)))
1763 (if (zerop status
) (message "Merge successful")
1765 (message "File contains conflicts.")))
1768 (defalias 'vc-resolve-conflicts
'smerge-ediff
)
1770 ;; Named-configuration entry points
1772 (defun vc-tag-precondition (dir)
1773 "Scan the tree below DIR, looking for files not up-to-date.
1774 If any file is not up-to-date, return the name of the first such file.
1775 \(This means, neither tag creation nor retrieval is allowed.\)
1776 If one or more of the files are currently visited, return `visited'.
1777 Otherwise, return nil."
1779 (catch 'vc-locked-example
1783 (if (not (vc-up-to-date-p f
)) (throw 'vc-locked-example f
)
1784 (when (get-file-buffer f
) (setq status
'visited
)))))
1788 (defun vc-create-tag (dir name branchp
)
1789 "Descending recursively from DIR, make a tag called NAME.
1790 For each registered file, the working revision becomes part of
1791 the named configuration. If the prefix argument BRANCHP is
1792 given, the tag is made as a new branch and the files are
1793 checked out in that new branch."
1795 (list (read-file-name "Directory: " default-directory default-directory t
)
1796 (read-string "New tag name: ")
1797 current-prefix-arg
))
1798 (message "Making %s... " (if branchp
"branch" "tag"))
1799 (when (file-directory-p dir
) (setq dir
(file-name-as-directory dir
)))
1800 (vc-call-backend (vc-responsible-backend dir
)
1801 'create-tag dir name branchp
)
1802 (message "Making %s... done" (if branchp
"branch" "tag")))
1805 (defun vc-retrieve-tag (dir name
)
1806 "Descending recursively from DIR, retrieve the tag called NAME.
1807 If NAME is empty, it refers to the latest revisions.
1808 If locking is used for the files in DIR, then there must not be any
1809 locked files at or below DIR (but if NAME is empty, locked files are
1810 allowed and simply skipped)."
1812 (list (read-file-name "Directory: " default-directory default-directory t
)
1813 (read-string "Tag name to retrieve (default latest revisions): ")))
1814 (let ((update (yes-or-no-p "Update any affected buffers? "))
1815 (msg (if (or (not name
) (string= name
""))
1816 (format "Updating %s... " (abbreviate-file-name dir
))
1817 (format "Retrieving tag into %s... "
1818 (abbreviate-file-name dir
)))))
1820 (vc-call-backend (vc-responsible-backend dir
)
1821 'retrieve-tag dir name update
)
1822 (message "%s" (concat msg
"done"))))
1824 ;; Miscellaneous other entry points
1827 (defun vc-print-log (&optional working-revision
)
1828 "List the change log of the current fileset in a window.
1829 If WORKING-REVISION is non-nil, leave the point at that revision."
1831 (let* ((vc-fileset (vc-deduce-fileset t
)) ;FIXME: Why t? --Stef
1832 (backend (car vc-fileset
))
1833 (files (cadr vc-fileset
))
1834 (working-revision (or working-revision
(vc-working-revision (car files
)))))
1835 ;; Don't switch to the output buffer before running the command,
1836 ;; so that any buffer-local settings in the vc-controlled
1837 ;; buffer can be accessed by the command.
1838 (vc-call-backend backend
'print-log files
"*vc-change-log*")
1839 (pop-to-buffer "*vc-change-log*")
1841 `(let ((inhibit-read-only t
))
1842 (vc-call-backend ',backend
'log-view-mode
)
1843 (set (make-local-variable 'log-view-vc-backend
) ',backend
)
1844 (set (make-local-variable 'log-view-vc-fileset
) ',files
)
1845 (goto-char (point-max)) (forward-line -
1)
1846 (while (looking-at "=*\n")
1847 (delete-char (- (match-end 0) (match-beginning 0)))
1849 (goto-char (point-min))
1850 (when (looking-at "[\b\t\n\v\f\r ]+")
1851 (delete-char (- (match-end 0) (match-beginning 0))))
1852 (shrink-window-if-larger-than-buffer)
1853 ;; move point to the log entry for the working revision
1854 (vc-call-backend ',backend
'show-log-entry
',working-revision
)
1855 (setq vc-sentinel-movepoint
(point))
1856 (set-buffer-modified-p nil
)))))
1860 "Revert working copies of the selected fileset to their repository contents.
1861 This asks for confirmation if the buffer contents are not identical
1862 to the working revision (except for keyword expansion)."
1864 (let* ((vc-fileset (vc-deduce-fileset))
1865 (files (cadr vc-fileset
)))
1866 ;; If any of the files is visited by the current buffer, make
1867 ;; sure buffer is saved. If the user says `no', abort since
1868 ;; we cannot show the changes and ask for confirmation to
1870 (when (or (not files
) (memq (buffer-file-name) files
))
1871 (vc-buffer-sync nil
))
1872 (dolist (file files
)
1873 (let ((buf (get-file-buffer file
)))
1874 (when (and buf
(buffer-modified-p buf
))
1875 (error "Please kill or save all modified buffers before reverting.")))
1876 (when (vc-up-to-date-p file
)
1877 (unless (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file
))
1878 (error "Revert canceled"))))
1879 (when (vc-diff-internal vc-allow-async-revert vc-fileset nil nil
)
1880 (unless (yes-or-no-p
1881 (format "Discard changes in %s? "
1882 (let ((str (vc-delistify files
)))
1883 (if (< (length str
) 50)
1885 (format "%d files" (length files
))))))
1886 (error "Revert canceled"))
1887 (delete-windows-on "*vc-diff*")
1888 (kill-buffer "*vc-diff*"))
1889 (dolist (file files
)
1890 (message "Reverting %s..." (vc-delistify files
))
1891 (vc-revert-file file
)
1892 (message "Reverting %s...done" (vc-delistify files
)))))
1895 (defun vc-rollback ()
1896 "Roll back (remove) the most recent changeset committed to the repository.
1897 This may be either a file-level or a repository-level operation,
1898 depending on the underlying version-control system."
1900 (let* ((vc-fileset (vc-deduce-fileset))
1901 (backend (car vc-fileset
))
1902 (files (cadr vc-fileset
))
1903 (granularity (vc-call-backend backend
'revision-granularity
)))
1904 (unless (vc-find-backend-function backend
'rollback
)
1905 (error "Rollback is not supported in %s" backend
))
1906 (when (and (not (eq granularity
'repository
)) (/= (length files
) 1))
1907 (error "Rollback requires a singleton fileset or repository versioning"))
1908 ;; FIXME: latest-on-branch-p should take the fileset.
1909 (when (not (vc-call-backend backend
'latest-on-branch-p
(car files
)))
1910 (error "Rollback is only possible at the tip revision."))
1911 ;; If any of the files is visited by the current buffer, make
1912 ;; sure buffer is saved. If the user says `no', abort since
1913 ;; we cannot show the changes and ask for confirmation to
1915 (when (or (not files
) (memq (buffer-file-name) files
))
1916 (vc-buffer-sync nil
))
1917 (dolist (file files
)
1918 (when (buffer-modified-p (get-file-buffer file
))
1919 (error "Please kill or save all modified buffers before rollback."))
1920 (when (not (vc-up-to-date-p file
))
1921 (error "Please revert all modified workfiles before rollback.")))
1922 ;; Accumulate changes associated with the fileset
1923 (vc-setup-buffer "*vc-diff*")
1925 (message "Finding changes...")
1926 (let* ((tip (vc-working-revision (car files
)))
1927 ;; FIXME: `previous-revision' should take the fileset.
1928 (previous (vc-call-backend backend
'previous-revision
1930 (vc-diff-internal nil vc-fileset previous tip
))
1932 (unless (yes-or-no-p "Discard these revisions? ")
1933 (error "Rollback canceled"))
1934 (delete-windows-on "*vc-diff*")
1935 (kill-buffer"*vc-diff*")
1936 ;; Do the actual reversions
1937 (message "Rolling back %s..." (vc-delistify files
))
1940 (vc-call-backend backend
'rollback files
)
1941 `((vc-state .
,'up-to-date
)
1942 (vc-checkout-time .
, (nth 5 (file-attributes file
)))
1943 (vc-working-revision . nil
)))
1944 (dolist (f files
) (vc-resynch-buffer f t t
))
1945 (message "Rolling back %s...done" (vc-delistify files
))))
1948 (define-obsolete-function-alias 'vc-revert-buffer
'vc-revert
"23.1")
1952 "Update the current fileset's files to their tip revisions.
1953 For each one that contains no changes, and is not locked, then this simply
1954 replaces the work file with the latest revision on its branch. If the file
1955 contains changes, and the backend supports merging news, then any recent
1956 changes from the current branch are merged into the working file."
1958 (let* ((vc-fileset (vc-deduce-fileset))
1959 (backend (car vc-fileset
))
1960 (files (cadr vc-fileset
)))
1961 (save-some-buffers ; save buffers visiting files
1963 (and (buffer-modified-p)
1964 (let ((file (buffer-file-name)))
1965 (and file
(member file files
))))))
1966 (dolist (file files
)
1967 (if (vc-up-to-date-p file
)
1968 (vc-checkout file nil t
)
1969 (if (eq (vc-checkout-model backend
(list file
)) 'locking
)
1970 (if (eq (vc-state file
) 'edited
)
1972 (substitute-command-keys
1973 "File is locked--type \\[vc-revert] to discard changes"))
1974 (error "Unexpected file state (%s) -- type %s"
1976 (substitute-command-keys
1977 "\\[vc-next-action] to correct")))
1978 (vc-maybe-resolve-conflicts
1979 file
(vc-call-backend backend
'merge-news file
)))))))
1981 (defun vc-version-backup-file (file &optional rev
)
1982 "Return name of backup file for revision REV of FILE.
1983 If version backups should be used for FILE, and there exists
1984 such a backup for REV or the working revision of file, return
1985 its name; otherwise return nil."
1986 (when (vc-call make-version-backups-p file
)
1987 (let ((backup-file (vc-version-backup-file-name file rev
)))
1988 (if (file-exists-p backup-file
)
1990 ;; there is no automatic backup, but maybe the user made one manually
1991 (setq backup-file
(vc-version-backup-file-name file rev
'manual
))
1992 (when (file-exists-p backup-file
)
1995 (defun vc-revert-file (file)
1996 "Revert FILE back to the repository working revision it was based on."
1999 (let ((backup-file (vc-version-backup-file file
)))
2001 (copy-file backup-file file
'ok-if-already-exists
'keep-date
)
2002 (vc-delete-automatic-version-backups file
))
2003 (vc-call revert file backup-file
))
2004 `((vc-state . up-to-date
)
2005 (vc-checkout-time .
,(nth 5 (file-attributes file
)))))
2006 (vc-resynch-buffer file t t
))
2009 (defun vc-switch-backend (file backend
)
2010 "Make BACKEND the current version control system for FILE.
2011 FILE must already be registered in BACKEND. The change is not
2012 permanent, only for the current session. This function only changes
2013 VC's perspective on FILE, it does not register or unregister it.
2014 By default, this command cycles through the registered backends.
2015 To get a prompt, use a prefix argument."
2018 (or buffer-file-name
2019 (error "There is no version-controlled file in this buffer"))
2020 (let ((crt-bk (vc-backend buffer-file-name
))
2023 (error "File %s is not under version control" buffer-file-name
))
2024 ;; Find the registered backends.
2025 (dolist (crt vc-handled-backends
)
2026 (when (and (vc-call-backend crt
'registered buffer-file-name
)
2027 (not (eq crt-bk crt
)))
2028 (push crt backends
)))
2029 ;; Find the next backend.
2030 (let ((def (car backends
))
2033 ((null others
) (error "No other backend to switch to"))
2038 (format "Switch to backend [%s]: " def
)
2039 (mapcar (lambda (b) (list (downcase (symbol-name b
)))) backends
)
2040 nil t nil nil
(downcase (symbol-name def
))))))
2042 (unless (eq backend
(vc-backend file
))
2043 (vc-file-clearprops file
)
2044 (vc-file-setprop file
'vc-backend backend
)
2045 ;; Force recomputation of the state
2046 (unless (vc-call-backend backend
'registered file
)
2047 (vc-file-clearprops file
)
2048 (error "%s is not registered in %s" file backend
))
2049 (vc-mode-line file
)))
2052 (defun vc-transfer-file (file new-backend
)
2053 "Transfer FILE to another version control system NEW-BACKEND.
2054 If NEW-BACKEND has a higher precedence than FILE's current backend
2055 \(i.e. it comes earlier in `vc-handled-backends'), then register FILE in
2056 NEW-BACKEND, using the revision number from the current backend as the
2057 base level. If NEW-BACKEND has a lower precedence than the current
2058 backend, then commit all changes that were made under the current
2059 backend to NEW-BACKEND, and unregister FILE from the current backend.
2060 \(If FILE is not yet registered under NEW-BACKEND, register it.)"
2061 (let* ((old-backend (vc-backend file
))
2062 (edited (memq (vc-state file
) '(edited needs-merge
)))
2063 (registered (vc-call-backend new-backend
'registered file
))
2065 (and registered
; Never move if not registered in new-backend yet.
2066 ;; move if new-backend comes later in vc-handled-backends
2067 (or (memq new-backend
(memq old-backend vc-handled-backends
))
2068 (y-or-n-p "Final transfer? "))))
2070 (when (eq old-backend new-backend
)
2071 (error "%s is the current backend of %s" new-backend file
))
2073 (set-file-modes file
(logior (file-modes file
) 128))
2074 ;; `registered' might have switched under us.
2075 (vc-switch-backend file old-backend
)
2076 (let* ((rev (vc-working-revision file
))
2077 (modified-file (and edited
(make-temp-file file
)))
2078 (unmodified-file (and modified-file
(vc-version-backup-file file
))))
2079 ;; Go back to the base unmodified file.
2083 (copy-file file modified-file
'ok-if-already-exists
)
2084 ;; If we have a local copy of the unmodified file, handle that
2085 ;; here and not in vc-revert-file because we don't want to
2086 ;; delete that copy -- it is still useful for OLD-BACKEND.
2088 (copy-file unmodified-file file
2089 'ok-if-already-exists
'keep-date
)
2090 (when (y-or-n-p "Get base revision from master? ")
2091 (vc-revert-file file
))))
2092 (vc-call-backend new-backend
'receive-file file rev
))
2094 (vc-switch-backend file new-backend
)
2095 (unless (eq (vc-checkout-model new-backend
(list file
)) 'implicit
)
2096 (vc-checkout file t nil
))
2097 (rename-file modified-file file
'ok-if-already-exists
)
2098 (vc-file-setprop file
'vc-checkout-time nil
)))))
2100 (vc-switch-backend file old-backend
)
2101 (setq comment
(vc-call-backend old-backend
'comment-history file
))
2102 (vc-call-backend old-backend
'unregister file
))
2103 (vc-switch-backend file new-backend
)
2104 (when (or move edited
)
2105 (vc-file-setprop file
'vc-state
'edited
)
2107 (vc-checkin file new-backend nil comment
(stringp comment
)))))
2109 (defun vc-rename-master (oldmaster newfile templates
)
2110 "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES."
2111 (let* ((dir (file-name-directory (expand-file-name oldmaster
)))
2112 (newdir (or (file-name-directory newfile
) ""))
2113 (newbase (file-name-nondirectory newfile
))
2115 ;; List of potential master files for `newfile'
2117 (lambda (s) (vc-possible-master s newdir newbase
))
2119 (when (or (file-symlink-p oldmaster
)
2120 (file-symlink-p (file-name-directory oldmaster
)))
2121 (error "This is unsafe in the presence of symbolic links"))
2125 ;; If possible, keep the master file in the same directory.
2127 (when (and f
(string= (file-name-directory (expand-file-name f
)) dir
))
2129 ;; If not, just use the first possible place.
2131 (and f
(or (not (setq dir
(file-name-directory f
)))
2132 (file-directory-p dir
))
2134 (error "New file lacks a version control directory")))))
2136 (defun vc-delete-file (file)
2137 "Delete file and mark it as such in the version control system."
2138 (interactive "fVC delete file: ")
2139 (setq file
(expand-file-name file
))
2140 (let ((buf (get-file-buffer file
))
2141 (backend (vc-backend file
)))
2143 (error "File %s is not under version control"
2144 (file-name-nondirectory file
)))
2145 (unless (vc-find-backend-function backend
'delete-file
)
2146 (error "Deleting files under %s is not supported in VC" backend
))
2147 (when (and buf
(buffer-modified-p buf
))
2148 (error "Please save or undo your changes before deleting %s" file
))
2149 (let ((state (vc-state file
)))
2150 (when (eq state
'edited
)
2151 (error "Please commit or undo your changes before deleting %s" file
))
2152 (when (eq state
'conflict
)
2153 (error "Please resolve the conflicts before deleting %s" file
)))
2154 (unless (y-or-n-p (format "Really want to delete %s? "
2155 (file-name-nondirectory file
)))
2157 (unless (or (file-directory-p file
) (null make-backup-files
)
2158 (not (file-exists-p file
)))
2159 (with-current-buffer (or buf
(find-file-noselect file
))
2160 (let ((backup-inhibited nil
))
2162 ;; Bind `default-directory' so that the command that the backend
2163 ;; runs to remove the file is invoked in the correct context.
2164 (let ((default-directory (file-name-directory file
)))
2165 (vc-call-backend backend
'delete-file file
))
2166 ;; If the backend hasn't deleted the file itself, let's do it for him.
2167 (when (file-exists-p file
) (delete-file file
))
2168 ;; Forget what VC knew about the file.
2169 (vc-file-clearprops file
)
2170 ;; Make sure the buffer is deleted and the *vc-dir* buffers are
2171 ;; updated after this.
2172 (vc-resynch-buffer file nil t
)))
2175 (defun vc-rename-file (old new
)
2176 "Rename file OLD to NEW, and rename its master file likewise."
2177 (interactive "fVC rename file: \nFRename to: ")
2178 ;; in CL I would have said (setq new (merge-pathnames new old))
2179 (let ((old-base (file-name-nondirectory old
)))
2180 (when (and (not (string= "" old-base
))
2181 (string= "" (file-name-nondirectory new
)))
2182 (setq new
(concat new old-base
))))
2183 (let ((oldbuf (get-file-buffer old
)))
2184 (when (and oldbuf
(buffer-modified-p oldbuf
))
2185 (error "Please save files before moving them"))
2186 (when (get-file-buffer new
)
2187 (error "Already editing new file name"))
2188 (when (file-exists-p new
)
2189 (error "New file already exists"))
2190 (let ((state (vc-state old
)))
2191 (unless (memq state
'(up-to-date edited
))
2192 (error "Please %s files before moving them"
2193 (if (stringp state
) "check in" "update"))))
2194 (vc-call rename-file old new
)
2195 (vc-file-clearprops old
)
2196 ;; Move the actual file (unless the backend did it already)
2197 (when (file-exists-p old
) (rename-file old new
))
2198 ;; ?? Renaming a file might change its contents due to keyword expansion.
2199 ;; We should really check out a new copy if the old copy was precisely equal
2200 ;; to some checked-in revision. However, testing for this is tricky....
2202 (with-current-buffer oldbuf
2203 (let ((buffer-read-only buffer-read-only
))
2204 (set-visited-file-name new
))
2207 (set-buffer-modified-p nil
)))))
2210 (defun vc-update-change-log (&rest args
)
2211 "Find change log file and add entries from recent version control logs.
2212 Normally, find log entries for all registered files in the default
2215 With prefix arg of \\[universal-argument], only find log entries for the current buffer's file.
2217 With any numeric prefix arg, find log entries for all currently visited
2218 files that are under version control. This puts all the entries in the
2219 log for the default directory, which may not be appropriate.
2221 From a program, any ARGS are assumed to be filenames for which
2222 log entries should be gathered."
2224 (cond ((consp current-prefix-arg
) ;C-u
2225 (list buffer-file-name
))
2226 (current-prefix-arg ;Numeric argument.
2228 (buffers (buffer-list))
2231 (setq file
(buffer-file-name (car buffers
)))
2232 (and file
(vc-backend file
)
2233 (setq files
(cons file files
)))
2234 (setq buffers
(cdr buffers
)))
2237 ;; Don't supply any filenames to backend; this means
2238 ;; it should find all relevant files relative to
2239 ;; the default-directory.
2241 (vc-call-backend (vc-responsible-backend default-directory
)
2242 'update-changelog args
))
2244 ;;; The default back end. Assumes RCS-like revision numbering.
2246 (defun vc-default-revision-granularity ()
2247 (error "Your backend will not work with this version of VC mode."))
2249 ;; functions that operate on RCS revision numbers. This code should
2250 ;; also be moved into the backends. It stays for now, however, since
2251 ;; it is used in code below.
2253 (defun vc-trunk-p (rev)
2254 "Return t if REV is a revision on the trunk."
2255 (not (eq nil
(string-match "\\`[0-9]+\\.[0-9]+\\'" rev
))))
2257 (defun vc-branch-p (rev)
2258 "Return t if REV is a branch revision."
2259 (not (eq nil
(string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev
))))
2262 (defun vc-branch-part (rev)
2263 "Return the branch part of a revision number REV."
2264 (let ((index (string-match "\\.[0-9]+\\'" rev
)))
2266 (substring rev
0 index
))))
2268 (defun vc-minor-part (rev)
2269 "Return the minor revision number of a revision number REV."
2270 (string-match "[0-9]+\\'" rev
)
2271 (substring rev
(match-beginning 0) (match-end 0)))
2273 (define-obsolete-function-alias
2274 'vc-default-previous-version
'vc-default-previous-revision
"23.1")
2276 (defun vc-default-previous-revision (backend file rev
)
2277 "Return the revision number immediately preceding REV for FILE,
2278 or nil if there is no previous revision. This default
2279 implementation works for MAJOR.MINOR-style revision numbers as
2280 used by RCS and CVS."
2281 (let ((branch (vc-branch-part rev
))
2282 (minor-num (string-to-number (vc-minor-part rev
))))
2285 ;; revision does probably not start a branch or release
2286 (concat branch
"." (number-to-string (1- minor-num
)))
2287 (if (vc-trunk-p rev
)
2288 ;; we are at the beginning of the trunk --
2289 ;; don't know anything to return here
2291 ;; we are at the beginning of a branch --
2292 ;; return revision of starting point
2293 (vc-branch-part branch
))))))
2295 (defun vc-default-next-revision (backend file rev
)
2296 "Return the revision number immediately following REV for FILE,
2297 or nil if there is no next revision. This default implementation
2298 works for MAJOR.MINOR-style revision numbers as used by RCS
2300 (when (not (string= rev
(vc-working-revision file
)))
2301 (let ((branch (vc-branch-part rev
))
2302 (minor-num (string-to-number (vc-minor-part rev
))))
2303 (concat branch
"." (number-to-string (1+ minor-num
))))))
2305 (defun vc-default-responsible-p (backend file
)
2306 "Indicate whether BACKEND is reponsible for FILE.
2307 The default is to return nil always."
2310 (defun vc-default-could-register (backend file
)
2311 "Return non-nil if BACKEND could be used to register FILE.
2312 The default implementation returns t for all files."
2315 (defun vc-default-latest-on-branch-p (backend file
)
2316 "Return non-nil if FILE is the latest on its branch.
2317 This default implementation always returns non-nil, which means that
2318 editing non-current revisions is not supported by default."
2321 (defun vc-default-init-revision (backend) vc-default-init-revision
)
2323 (defalias 'vc-cvs-update-changelog
'vc-update-changelog-rcs2log
)
2325 (defalias 'vc-rcs-update-changelog
'vc-update-changelog-rcs2log
)
2327 ;; FIXME: This should probably be moved to vc-rcs.el and replaced in
2328 ;; vc-cvs.el by code using cvs2cl.
2329 (defun vc-update-changelog-rcs2log (files)
2330 "Default implementation of update-changelog.
2331 Uses `rcs2log' which only works for RCS and CVS."
2332 ;; FIXME: We (c|sh)ould add support for cvs2cl
2333 (let ((odefault default-directory
)
2334 (changelog (find-change-log))
2335 ;; Presumably not portable to non-Unixy systems, along with rcs2log:
2336 (tempfile (make-temp-file
2337 (expand-file-name "vc"
2338 (or small-temporary-file-directory
2339 temporary-file-directory
))))
2340 (login-name (or user-login-name
2341 (format "uid%d" (number-to-string (user-uid)))))
2342 (full-name (or add-log-full-name
2345 (format "uid%d" (number-to-string (user-uid)))))
2346 (mailing-address (or add-log-mailing-address
2347 user-mail-address
)))
2348 (find-file-other-window changelog
)
2349 (barf-if-buffer-read-only)
2352 (goto-char (point-min))
2354 (message "Computing change log entries...")
2355 (message "Computing change log entries... %s"
2358 (setq default-directory odefault
)
2359 (if (eq 0 (apply 'call-process
2360 (expand-file-name "rcs2log"
2362 nil
(list t tempfile
) nil
2364 "-u" (concat login-name
2366 "\t" mailing-address
)
2370 (expand-file-name f odefault
)))
2373 (pop-to-buffer (get-buffer-create "*vc*"))
2375 (insert-file-contents tempfile
)
2377 (setq default-directory
(file-name-directory changelog
))
2378 (delete-file tempfile
)))))
2380 (defun vc-default-find-revision (backend file rev buffer
)
2381 "Provide the new `find-revision' op based on the old `checkout' op.
2382 This is only for compatibility with old backends. They should be updated
2383 to provide the `find-revision' operation instead."
2384 (let ((tmpfile (make-temp-file (expand-file-name file
))))
2387 (vc-call-backend backend
'checkout file nil rev tmpfile
)
2388 (with-current-buffer buffer
2389 (insert-file-contents-literally tmpfile
)))
2390 (delete-file tmpfile
))))
2392 (defun vc-default-prettify-state-info (backend file
)
2393 (let* ((state (vc-state file
))
2396 ((stringp state
) (concat "(locked:" state
")"))
2397 ((eq state
'edited
) "(modified)")
2398 ((eq state
'needs-merge
) "(merge)")
2399 ((eq state
'needs-update
) "(update)")
2400 ((eq state
'added
) "(added)")
2401 ((eq state
'removed
) "(removed)")
2402 ((eq state
'ignored
) "(ignored)")
2403 ((eq state
'unregistered
) "(unregistered)")
2404 ((eq state
'unlocked-changes
) "(stale)")
2405 (t (format "(unknown:%s)" state
))))
2407 (get-file-buffer file
))
2409 (if (and buffer
(buffer-modified-p buffer
)) "+" "")))
2410 (concat statestring modflag
)))
2412 (defun vc-default-rename-file (backend old new
)
2414 (add-name-to-file old new
)
2415 (error (rename-file old new
)))
2416 (vc-delete-file old
)
2417 (with-current-buffer (find-file-noselect new
)
2420 (defalias 'vc-default-check-headers
'ignore
)
2422 (defun vc-default-log-view-mode (backend) (log-view-mode))
2424 (defun vc-default-show-log-entry (backend rev
)
2426 (log-view-goto-rev rev
)))
2428 (defun vc-default-comment-history (backend file
)
2429 "Return a string with all log entries stored in BACKEND for FILE."
2430 (when (vc-find-backend-function backend
'print-log
)
2431 (with-current-buffer "*vc*"
2432 (vc-call-backend backend
'print-log
(list file
))
2435 (defun vc-default-receive-file (backend file rev
)
2436 "Let BACKEND receive FILE from another version control system."
2437 (vc-call-backend backend
'register
(list file
) rev
""))
2439 (defun vc-default-retrieve-tag (backend dir name update
)
2440 (if (string= name
"")
2447 (vc-call-backend backend
'checkout f nil
"")
2448 (when update
(vc-resynch-buffer f t t
)))))))
2449 (let ((result (vc-tag-precondition dir
)))
2450 (if (stringp result
)
2451 (error "File %s is locked" result
)
2452 (setq update
(and (eq result
'visited
) update
))
2455 (lambda (f) (vc-error-occurred
2456 (vc-call-backend backend
'checkout f nil name
)
2457 (when update
(vc-resynch-buffer f t t
)))))))))
2459 (defun vc-default-revert (backend file contents-done
)
2460 (unless contents-done
2461 (let ((rev (vc-working-revision file
))
2462 (file-buffer (or (get-file-buffer file
) (current-buffer))))
2463 (message "Checking out %s..." file
)
2465 (backup-name (car (find-backup-file-name file
))))
2467 (copy-file file backup-name
'ok-if-already-exists
'keep-date
)
2468 (unless (file-writable-p file
)
2469 (set-file-modes file
(logior (file-modes file
) 128))))
2471 (let ((coding-system-for-read 'no-conversion
)
2472 (coding-system-for-write 'no-conversion
))
2473 (with-temp-file file
2474 (let ((outbuf (current-buffer)))
2475 ;; Change buffer to get local value of vc-checkout-switches.
2476 (with-current-buffer file-buffer
2477 (let ((default-directory (file-name-directory file
)))
2478 (vc-call-backend backend
'find-revision
2479 file rev outbuf
)))))
2483 (rename-file backup-name file
'ok-if-already-exists
)
2484 (and (not vc-make-backup-files
) (delete-file backup-name
))))))
2485 (message "Checking out %s...done" file
))))
2487 (defalias 'vc-default-revision-completion-table
'ignore
)
2488 (defalias 'vc-default-mark-resolved
'ignore
)
2490 (defun vc-default-dir-status-files (backend dir files default-state update-function
)
2491 (funcall update-function
2492 (mapcar (lambda (file) (list file default-state
)) files
)))
2494 (defun vc-check-headers ()
2495 "Check if the current file has any headers in it."
2497 (vc-call-backend (vc-backend buffer-file-name
) 'check-headers
))
2501 ;; These things should probably be generally available
2503 (defun vc-string-prefix-p (prefix string
)
2504 (let ((lpref (length prefix
)))
2505 (and (>= (length string
) lpref
)
2506 (eq t
(compare-strings prefix nil nil string nil lpref
)))))
2508 (defun vc-file-tree-walk (dirname func
&rest args
)
2509 "Walk recursively through DIRNAME.
2510 Invoke FUNC f ARGS on each VC-managed file f underneath it."
2511 (vc-file-tree-walk-internal (expand-file-name dirname
) func args
)
2512 (message "Traversing directory %s...done" dirname
))
2514 (defun vc-file-tree-walk-internal (file func args
)
2515 (if (not (file-directory-p file
))
2516 (when (vc-backend file
) (apply func file args
))
2517 (message "Traversing directory %s..." (abbreviate-file-name file
))
2518 (let ((dir (file-name-as-directory file
)))
2521 (string-equal f
".")
2522 (string-equal f
"..")
2523 (member f vc-directory-exclusion-list
)
2524 (let ((dirf (expand-file-name f dir
)))
2526 (file-symlink-p dirf
) ;; Avoid possible loops.
2527 (vc-file-tree-walk-internal dirf func args
)))))
2528 (directory-files dir
)))))
2532 ;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6