* s/netbsd.h (AMPERSAND_FULL_NAME): Remove (defined in AH_BOTTOM).
[emacs.git] / lisp / vc.el
blob01952de20254ae7456d8196c6603f1b36ff7cd21
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, 2010
5 ;; Free Software Foundation, Inc.
7 ;; Author: FSF (see below for full credits)
8 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
9 ;; Keywords: tools
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/>.
26 ;;; Credits:
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.
53 ;;; Commentary:
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 ;; If your site uses the ChangeLog convention supported by Emacs, the
62 ;; function `log-edit-comment-to-change-log' could prove a useful checkin hook,
63 ;; although you might prefer to use C-c C-a (i.e. `log-edit-insert-changelog')
64 ;; from the commit buffer instead or to set `log-edit-setup-invert'.
66 ;; When using SCCS, RCS, CVS: be careful not to do repo surgery, or
67 ;; operations like registrations and deletions and renames, outside VC
68 ;; while VC is running. The support for these systems was designed
69 ;; when disks were much slower, and the code maintains a lot of
70 ;; internal state in order to reduce expensive operations to a
71 ;; minimum. Thus, if you mess with the repo while VC's back is turned,
72 ;; VC may get seriously confused.
74 ;; When using Subversion or a later system, anything you do outside VC
75 ;; *through the VCS tools* should safely interlock with VC
76 ;; operations. Under these VC does little state caching, because local
77 ;; operations are assumed to be fast. The dividing line is
79 ;; ADDING SUPPORT FOR OTHER BACKENDS
81 ;; VC can use arbitrary version control systems as a backend. To add
82 ;; support for a new backend named SYS, write a library vc-sys.el that
83 ;; contains functions of the form `vc-sys-...' (note that SYS is in lower
84 ;; case for the function and library names). VC will use that library if
85 ;; you put the symbol SYS somewhere into the list of
86 ;; `vc-handled-backends'. Then, for example, if `vc-sys-registered'
87 ;; returns non-nil for a file, all SYS-specific versions of VC commands
88 ;; will be available for that file.
90 ;; VC keeps some per-file information in the form of properties (see
91 ;; vc-file-set/getprop in vc-hooks.el). The backend-specific functions
92 ;; do not generally need to be aware of these properties. For example,
93 ;; `vc-sys-working-revision' should compute the working revision and
94 ;; return it; it should not look it up in the property, and it needn't
95 ;; store it there either. However, if a backend-specific function does
96 ;; store a value in a property, that value takes precedence over any
97 ;; value that the generic code might want to set (check for uses of
98 ;; the macro `with-vc-properties' in vc.el).
100 ;; In the list of functions below, each identifier needs to be prepended
101 ;; with `vc-sys-'. Some of the functions are mandatory (marked with a
102 ;; `*'), others are optional (`-').
104 ;; BACKEND PROPERTIES
106 ;; * revision-granularity
108 ;; Takes no arguments. Returns either 'file or 'repository. Backends
109 ;; that return 'file have per-file revision numbering; backends
110 ;; that return 'repository have per-repository revision numbering,
111 ;; so a revision level implicitly identifies a changeset
113 ;; STATE-QUERYING FUNCTIONS
115 ;; * registered (file)
117 ;; Return non-nil if FILE is registered in this backend. Both this
118 ;; function as well as `state' should be careful to fail gracefully
119 ;; in the event that the backend executable is absent. It is
120 ;; preferable that this function's body is autoloaded, that way only
121 ;; calling vc-registered does not cause the backend to be loaded
122 ;; (all the vc-FOO-registered functions are called to try to find
123 ;; the controlling backend for FILE.
125 ;; * state (file)
127 ;; Return the current version control state of FILE. For a list of
128 ;; possible values, see `vc-state'. This function should do a full and
129 ;; reliable state computation; it is usually called immediately after
130 ;; C-x v v. If you want to use a faster heuristic when visiting a
131 ;; file, put that into `state-heuristic' below. Note that under most
132 ;; VCSes this won't be called at all, dir-status is used instead.
134 ;; - state-heuristic (file)
136 ;; If provided, this function is used to estimate the version control
137 ;; state of FILE at visiting time. It should be considerably faster
138 ;; than the implementation of `state'. For a list of possible values,
139 ;; see the doc string of `vc-state'.
141 ;; - dir-status (dir update-function)
143 ;; Produce RESULT: a list of lists of the form (FILE VC-STATE EXTRA)
144 ;; for the files in DIR.
145 ;; EXTRA can be used for backend specific information about FILE.
146 ;; If a command needs to be run to compute this list, it should be
147 ;; run asynchronously using (current-buffer) as the buffer for the
148 ;; command. When RESULT is computed, it should be passed back by
149 ;; doing: (funcall UPDATE-FUNCTION RESULT nil).
150 ;; If the backend uses a process filter, hence it produces partial results,
151 ;; they can be passed back by doing:
152 ;; (funcall UPDATE-FUNCTION RESULT t)
153 ;; and then do a (funcall UPDATE-FUNCTION RESULT nil)
154 ;; when all the results have been computed.
155 ;; To provide more backend specific functionality for `vc-dir'
156 ;; the following functions might be needed: `dir-extra-headers',
157 ;; `dir-printer', `extra-dir-menu' and `dir-status-files'.
159 ;; - dir-status-files (dir files default-state update-function)
161 ;; This function is identical to dir-status except that it should
162 ;; only report status for the specified FILES. Also it needs to
163 ;; report on all requested files, including up-to-date or ignored
164 ;; files. If not provided, the default is to consider that the files
165 ;; are in DEFAULT-STATE.
167 ;; - dir-extra-headers (dir)
169 ;; Return a string that will be added to the *vc-dir* buffer header.
171 ;; - dir-printer (fileinfo)
173 ;; Pretty print the `vc-dir-fileinfo' FILEINFO.
174 ;; If a backend needs to show more information than the default FILE
175 ;; and STATE in the vc-dir listing, it can store that extra
176 ;; information in `vc-dir-fileinfo->extra'. This function can be
177 ;; used to display that extra information in the *vc-dir* buffer.
179 ;; - status-fileinfo-extra (file)
181 ;; Compute `vc-dir-fileinfo->extra' for FILE.
183 ;; * working-revision (file)
185 ;; Return the working revision of FILE. This is the revision fetched
186 ;; by the last checkout or upate, not necessarily the same thing as the
187 ;; head or tip revision. Should return "0" for a file added but not yet
188 ;; committed.
190 ;; - latest-on-branch-p (file)
192 ;; Return non-nil if the working revision of FILE is the latest revision
193 ;; on its branch (many VCSes call this the 'tip' or 'head' revision).
194 ;; The default implementation always returns t, which means that
195 ;; working with non-current revisions is not supported by default.
197 ;; * checkout-model (files)
199 ;; Indicate whether FILES need to be "checked out" before they can be
200 ;; edited. See `vc-checkout-model' for a list of possible values.
202 ;; - workfile-unchanged-p (file)
204 ;; Return non-nil if FILE is unchanged from the working revision.
205 ;; This function should do a brief comparison of FILE's contents
206 ;; with those of the repository copy of the working revision. If
207 ;; the backend does not have such a brief-comparison feature, the
208 ;; default implementation of this function can be used, which
209 ;; delegates to a full vc-BACKEND-diff. (Note that vc-BACKEND-diff
210 ;; must not run asynchronously in this case, see variable
211 ;; `vc-disable-async-diff'.)
213 ;; - mode-line-string (file)
215 ;; If provided, this function should return the VC-specific mode
216 ;; line string for FILE. The returned string should have a
217 ;; `help-echo' property which is the text to be displayed as a
218 ;; tooltip when the mouse hovers over the VC entry on the mode-line.
219 ;; The default implementation deals well with all states that
220 ;; `vc-state' can return.
222 ;; STATE-CHANGING FUNCTIONS
224 ;; * create-repo (backend)
226 ;; Create an empty repository in the current directory and initialize
227 ;; it so VC mode can add files to it. For file-oriented systems, this
228 ;; need do no more than create a subdirectory with the right name.
230 ;; * register (files &optional rev comment)
232 ;; Register FILES in this backend. Optionally, an initial revision REV
233 ;; and an initial description of the file, COMMENT, may be specified,
234 ;; but it is not guaranteed that the backend will do anything with this.
235 ;; The implementation should pass the value of vc-register-switches
236 ;; to the backend command. (Note: in older versions of VC, this
237 ;; command took a single file argument and not a list.)
239 ;; - init-revision (file)
241 ;; The initial revision to use when registering FILE if one is not
242 ;; specified by the user. If not provided, the variable
243 ;; vc-default-init-revision is used instead.
245 ;; - responsible-p (file)
247 ;; Return non-nil if this backend considers itself "responsible" for
248 ;; FILE, which can also be a directory. This function is used to find
249 ;; out what backend to use for registration of new files and for things
250 ;; like change log generation. The default implementation always
251 ;; returns nil.
253 ;; - could-register (file)
255 ;; Return non-nil if FILE could be registered under this backend. The
256 ;; default implementation always returns t.
258 ;; - receive-file (file rev)
260 ;; Let this backend "receive" a file that is already registered under
261 ;; another backend. The default implementation simply calls `register'
262 ;; for FILE, but it can be overridden to do something more specific,
263 ;; e.g. keep revision numbers consistent or choose editing modes for
264 ;; FILE that resemble those of the other backend.
266 ;; - unregister (file)
268 ;; Unregister FILE from this backend. This is only needed if this
269 ;; backend may be used as a "more local" backend for temporary editing.
271 ;; * checkin (files rev comment)
273 ;; Commit changes in FILES to this backend. REV is a historical artifact
274 ;; and should be ignored. COMMENT is used as a check-in comment.
275 ;; The implementation should pass the value of vc-checkin-switches to
276 ;; the backend command.
278 ;; * find-revision (file rev buffer)
280 ;; Fetch revision REV of file FILE and put it into BUFFER.
281 ;; If REV is the empty string, fetch the head of the trunk.
282 ;; The implementation should pass the value of vc-checkout-switches
283 ;; to the backend command.
285 ;; * checkout (file &optional editable rev)
287 ;; Check out revision REV of FILE into the working area. If EDITABLE
288 ;; is non-nil, FILE should be writable by the user and if locking is
289 ;; used for FILE, a lock should also be set. If REV is non-nil, that
290 ;; is the revision to check out (default is the working revision).
291 ;; If REV is t, that means to check out the head of the current branch;
292 ;; if it is the empty string, check out the head of the trunk.
293 ;; The implementation should pass the value of vc-checkout-switches
294 ;; to the backend command.
296 ;; * revert (file &optional contents-done)
298 ;; Revert FILE back to the working revision. If optional
299 ;; arg CONTENTS-DONE is non-nil, then the contents of FILE have
300 ;; already been reverted from a version backup, and this function
301 ;; only needs to update the status of FILE within the backend.
302 ;; If FILE is in the `added' state it should be returned to the
303 ;; `unregistered' state.
305 ;; - rollback (files)
307 ;; Remove the tip revision of each of FILES from the repository. If
308 ;; this function is not provided, trying to cancel a revision is
309 ;; caught as an error. (Most backends don't provide it.) (Also
310 ;; note that older versions of this backend command were called
311 ;; 'cancel-version' and took a single file arg, not a list of
312 ;; files.)
314 ;; - merge (file rev1 rev2)
316 ;; Merge the changes between REV1 and REV2 into the current working file.
318 ;; - merge-news (file)
320 ;; Merge recent changes from the current branch into FILE.
322 ;; - steal-lock (file &optional revision)
324 ;; Steal any lock on the working revision of FILE, or on REVISION if
325 ;; that is provided. This function is only needed if locking is
326 ;; used for files under this backend, and if files can indeed be
327 ;; locked by other users.
329 ;; - modify-change-comment (files rev comment)
331 ;; Modify the change comments associated with the files at the
332 ;; given revision. This is optional, many backends do not support it.
334 ;; - mark-resolved (files)
336 ;; Mark conflicts as resolved. Some VC systems need to run a
337 ;; command to mark conflicts as resolved.
339 ;; HISTORY FUNCTIONS
341 ;; * print-log (files buffer &optional shortlog start-revision limit)
343 ;; Insert the revision log for FILES into BUFFER.
344 ;; If SHORTLOG is true insert a short version of the log.
345 ;; If LIMIT is true insert only insert LIMIT log entries. If the
346 ;; backend does not support limiting the number of entries to show
347 ;; it should return `limit-unsupported'.
348 ;; If START-REVISION is given, then show the log starting from the
349 ;; revision. At this point START-REVISION is only required to work
350 ;; in conjunction with LIMIT = 1.
352 ;; * log-outgoing (backend remote-location)
354 ;; Insert in BUFFER the revision log for the changes that will be
355 ;; sent when performing a push operation to REMOTE-LOCATION.
357 ;; * log-incoming (backend remote-location)
359 ;; Insert in BUFFER the revision log for the changes that will be
360 ;; received when performing a pull operation from REMOTE-LOCATION.
362 ;; - log-view-mode ()
364 ;; Mode to use for the output of print-log. This defaults to
365 ;; `log-view-mode' and is expected to be changed (if at all) to a derived
366 ;; mode of `log-view-mode'.
368 ;; - show-log-entry (revision)
370 ;; If provided, search the log entry for REVISION in the current buffer,
371 ;; and make sure it is displayed in the buffer's window. The default
372 ;; implementation of this function works for RCS-style logs.
374 ;; - comment-history (file)
376 ;; Return a string containing all log entries that were made for FILE.
377 ;; This is used for transferring a file from one backend to another,
378 ;; retaining comment information.
380 ;; - update-changelog (files)
382 ;; Using recent log entries, create ChangeLog entries for FILES, or for
383 ;; all files at or below the default-directory if FILES is nil. The
384 ;; default implementation runs rcs2log, which handles RCS- and
385 ;; CVS-style logs.
387 ;; * diff (files &optional rev1 rev2 buffer)
389 ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if
390 ;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences
391 ;; from REV1 to REV2. If REV1 is nil, use the working revision (as
392 ;; found in the repository) as the older revision; if REV2 is nil,
393 ;; use the current working-copy contents as the newer revision. This
394 ;; function should pass the value of (vc-switches BACKEND 'diff) to
395 ;; the backend command. It should return a status of either 0 (no
396 ;; differences found), or 1 (either non-empty diff or the diff is
397 ;; run asynchronously).
399 ;; - revision-completion-table (files)
401 ;; Return a completion table for existing revisions of FILES.
402 ;; The default is to not use any completion table.
404 ;; - annotate-command (file buf &optional rev)
406 ;; If this function is provided, it should produce an annotated display
407 ;; of FILE in BUF, relative to revision REV. Annotation means each line
408 ;; of FILE displayed is prefixed with version information associated with
409 ;; its addition (deleted lines leave no history) and that the text of the
410 ;; file is fontified according to age.
412 ;; - annotate-time ()
414 ;; Only required if `annotate-command' is defined for the backend.
415 ;; Return the time of the next line of annotation at or after point,
416 ;; as a floating point fractional number of days. The helper
417 ;; function `vc-annotate-convert-time' may be useful for converting
418 ;; multi-part times as returned by `current-time' and `encode-time'
419 ;; to this format. Return nil if no more lines of annotation appear
420 ;; in the buffer. You can safely assume that point is placed at the
421 ;; beginning of each line, starting at `point-min'. The buffer that
422 ;; point is placed in is the Annotate output, as defined by the
423 ;; relevant backend. This function also affects how much of the line
424 ;; is fontified; where it leaves point is where fontification begins.
426 ;; - annotate-current-time ()
428 ;; Only required if `annotate-command' is defined for the backend,
429 ;; AND you'd like the current time considered to be anything besides
430 ;; (vc-annotate-convert-time (current-time)) -- i.e. the current
431 ;; time with hours, minutes, and seconds included. Probably safe to
432 ;; ignore. Return the current-time, in units of fractional days.
434 ;; - annotate-extract-revision-at-line ()
436 ;; Only required if `annotate-command' is defined for the backend.
437 ;; Invoked from a buffer in vc-annotate-mode, return the revision
438 ;; corresponding to the current line, or nil if there is no revision
439 ;; corresponding to the current line.
440 ;; If the backend supports annotating through copies and renames,
441 ;; and displays a file name and a revision, then return a cons
442 ;; (REVISION . FILENAME).
444 ;; TAG SYSTEM
446 ;; - create-tag (dir name branchp)
448 ;; Attach the tag NAME to the state of the working copy. This
449 ;; should make sure that files are up-to-date before proceeding with
450 ;; the action. DIR can also be a file and if BRANCHP is specified,
451 ;; NAME should be created as a branch and DIR should be checked out
452 ;; under this new branch. The default implementation does not
453 ;; support branches but does a sanity check, a tree traversal and
454 ;; assigns the tag to each file.
456 ;; - retrieve-tag (dir name update)
458 ;; Retrieve the version tagged by NAME of all registered files at or below DIR.
459 ;; If UPDATE is non-nil, then update buffers of any files in the
460 ;; tag that are currently visited. The default implementation
461 ;; does a sanity check whether there aren't any uncommitted changes at
462 ;; or below DIR, and then performs a tree walk, using the `checkout'
463 ;; function to retrieve the corresponding revisions.
465 ;; MISCELLANEOUS
467 ;; - make-version-backups-p (file)
469 ;; Return non-nil if unmodified repository revisions of FILE should be
470 ;; backed up locally. If this is done, VC can perform `diff' and
471 ;; `revert' operations itself, without calling the backend system. The
472 ;; default implementation always returns nil.
474 ;; - root (file)
475 ;; Return the root of the VC controlled hierarchy for file.
477 ;; - repository-hostname (dirname)
479 ;; Return the hostname that the backend will have to contact
480 ;; in order to operate on a file in DIRNAME. If the return value
481 ;; is nil, it means that the repository is local.
482 ;; This function is used in `vc-stay-local-p' which backends can use
483 ;; for their convenience.
485 ;; - previous-revision (file rev)
487 ;; Return the revision number that precedes REV for FILE, or nil if no such
488 ;; revision exists.
490 ;; - next-revision (file rev)
492 ;; Return the revision number that follows REV for FILE, or nil if no such
493 ;; revision exists.
495 ;; - log-edit-mode ()
497 ;; Turn on the mode used for editing the check in log. This
498 ;; defaults to `log-edit-mode'. If changed, it should use a mode
499 ;; derived from`log-edit-mode'.
501 ;; - check-headers ()
503 ;; Return non-nil if the current buffer contains any version headers.
505 ;; - clear-headers ()
507 ;; In the current buffer, reset all version headers to their unexpanded
508 ;; form. This function should be provided if the state-querying code
509 ;; for this backend uses the version headers to determine the state of
510 ;; a file. This function will then be called whenever VC changes the
511 ;; version control state in such a way that the headers would give
512 ;; wrong information.
514 ;; - delete-file (file)
516 ;; Delete FILE and mark it as deleted in the repository. If this
517 ;; function is not provided, the command `vc-delete-file' will
518 ;; signal an error.
520 ;; - rename-file (old new)
522 ;; Rename file OLD to NEW, both in the working area and in the
523 ;; repository. If this function is not provided, the renaming
524 ;; will be done by (vc-delete-file old) and (vc-register new).
526 ;; - find-file-hook ()
528 ;; Operation called in current buffer when opening a file. This can
529 ;; be used by the backend to setup some local variables it might need.
531 ;; - extra-menu ()
533 ;; Return a menu keymap, the items in the keymap will appear at the
534 ;; end of the Version Control menu. The goal is to allow backends
535 ;; to specify extra menu items that appear in the VC menu. This way
536 ;; you can provide menu entries for functionality that is specific
537 ;; to your backend and which does not map to any of the VC generic
538 ;; concepts.
540 ;; - extra-dir-menu ()
542 ;; Return a menu keymap, the items in the keymap will appear at the
543 ;; end of the VC Status menu. The goal is to allow backends to
544 ;; specify extra menu items that appear in the VC Status menu. This
545 ;; makes it possible to provide menu entries for functionality that
546 ;; is specific to a backend and which does not map to any of the VC
547 ;; generic concepts.
549 ;; - conflicted-files (dir)
551 ;; Return the list of files where conflict resolution is needed in
552 ;; the project that contains DIR.
553 ;; FIXME: what should it do with non-text conflicts?
555 ;;; Todo:
557 ;; - Get rid of the "master file" terminology.
559 ;; - Add key-binding for vc-delete-file.
561 ;;;; New Primitives:
563 ;; - deal with push/pull operations.
565 ;; - add a mechanism for editing the underlying VCS's list of files
566 ;; to be ignored, when that's possible.
568 ;;;; Primitives that need changing:
570 ;; - vc-update/vc-merge should deal with VC systems that don't
571 ;; update/merge on a file basis, but on a whole repository basis.
572 ;; vc-update and vc-merge assume the arguments are always files,
573 ;; they don't deal with directories. Make sure the *vc-dir* buffer
574 ;; is updated after these operations.
575 ;; At least bzr, git and hg should benefit from this.
577 ;;;; Improved branch and tag handling:
579 ;; - add a generic mechanism for remembering the current branch names,
580 ;; display the branch name in the mode-line. Replace
581 ;; vc-cvs-sticky-tag with that.
583 ;; - vc-create-tag and vc-retrieve-tag should update the
584 ;; buffers that might be visiting the affected files.
586 ;;;; Internal cleanups:
588 ;; - backends that care about vc-stay-local should try to take it into
589 ;; account for vc-dir. Is this likely to be useful??? YES!
591 ;; - vc-expand-dirs should take a backend parameter and only look for
592 ;; files managed by that backend.
594 ;; - Another important thing: merge all the status-like backend operations.
595 ;; We should remove dir-status, state, and dir-status-files, and
596 ;; replace them with just `status' which takes a fileset and a continuation
597 ;; (like dir-status) and returns a buffer in which the process(es) are run
598 ;; (or nil if it worked synchronously). Hopefully we can define the old
599 ;; 4 operations in term of this one.
601 ;;;; Other
603 ;; - when a file is in `conflict' state, turn on smerge-mode.
605 ;; - figure out what to do with conflicts that are not caused by the
606 ;; file contents, but by metadata or other causes. Example: File A
607 ;; gets renamed to B in one branch and to C in another and you merge
608 ;; the two branches. Or you locally add file FOO and then pull a
609 ;; change that also adds a new file FOO, ...
611 ;; - make it easier to write logs. Maybe C-x 4 a should add to the log
612 ;; buffer, if one is present, instead of adding to the ChangeLog.
614 ;; - When vc-next-action calls vc-checkin it could pre-fill the
615 ;; *VC-log* buffer with some obvious items: the list of files that
616 ;; were added, the list of files that were removed. If the diff is
617 ;; available, maybe it could even call something like
618 ;; `diff-add-change-log-entries-other-window' to create a detailed
619 ;; skeleton for the log...
621 ;; - most vc-dir backends need more work. They might need to
622 ;; provide custom headers, use the `extra' field and deal with all
623 ;; possible VC states.
625 ;; - add a function that calls vc-dir to `find-directory-functions'.
627 ;; - vc-diff, vc-annotate, etc. need to deal better with unregistered
628 ;; files. Now that unregistered and ignored files are shown in
629 ;; vc-dir, it is possible that these commands are called
630 ;; for unregistered/ignored files.
632 ;; - vc-next-action needs work in order to work with multiple
633 ;; backends: `vc-state' returns the state for the default backend,
634 ;; not for the backend in the current *vc-dir* buffer.
636 ;; - vc-dir-kill-dir-status-process should not be specific to dir-status,
637 ;; it should work for other async commands done through vc-do-command
638 ;; as well,
640 ;; - vc-dir toolbar needs more icons.
642 ;; - The backends should avoid using `vc-file-setprop' and `vc-file-getprop'.
644 ;;; Code:
646 (require 'vc-hooks)
647 (require 'vc-dispatcher)
649 (eval-when-compile
650 (require 'cl)
651 (require 'dired))
653 (unless (assoc 'vc-parent-buffer minor-mode-alist)
654 (setq minor-mode-alist
655 (cons '(vc-parent-buffer vc-parent-buffer-name)
656 minor-mode-alist)))
658 ;; General customization
660 (defgroup vc nil
661 "Version-control system in Emacs."
662 :group 'tools)
664 (defcustom vc-initial-comment nil
665 "If non-nil, prompt for initial comment when a file is registered."
666 :type 'boolean
667 :group 'vc)
669 (defcustom vc-default-init-revision "1.1"
670 "A string used as the default revision number when a new file is registered.
671 This can be overridden by giving a prefix argument to \\[vc-register]. This
672 can also be overridden by a particular VC backend."
673 :type 'string
674 :group 'vc
675 :version "20.3")
677 (defcustom vc-checkin-switches nil
678 "A string or list of strings specifying extra switches for checkin.
679 These are passed to the checkin program by \\[vc-checkin]."
680 :type '(choice (const :tag "None" nil)
681 (string :tag "Argument String")
682 (repeat :tag "Argument List"
683 :value ("")
684 string))
685 :group 'vc)
687 (defcustom vc-checkout-switches nil
688 "A string or list of strings specifying extra switches for checkout.
689 These are passed to the checkout program by \\[vc-checkout]."
690 :type '(choice (const :tag "None" nil)
691 (string :tag "Argument String")
692 (repeat :tag "Argument List"
693 :value ("")
694 string))
695 :group 'vc)
697 (defcustom vc-register-switches nil
698 "A string or list of strings; extra switches for registering a file.
699 These are passed to the checkin program by \\[vc-register]."
700 :type '(choice (const :tag "None" nil)
701 (string :tag "Argument String")
702 (repeat :tag "Argument List"
703 :value ("")
704 string))
705 :group 'vc)
707 (defcustom vc-diff-switches nil
708 "A string or list of strings specifying switches for diff under VC.
709 When running diff under a given BACKEND, VC uses the first
710 non-nil value of `vc-BACKEND-diff-switches', `vc-diff-switches',
711 and `diff-switches', in that order. Since nil means to check the
712 next variable in the sequence, either of the first two may use
713 the value t to mean no switches at all. `vc-diff-switches'
714 should contain switches that are specific to version control, but
715 not specific to any particular backend."
716 :type '(choice (const :tag "Unspecified" nil)
717 (const :tag "None" t)
718 (string :tag "Argument String")
719 (repeat :tag "Argument List" :value ("") string))
720 :group 'vc
721 :version "21.1")
723 (defcustom vc-diff-knows-L nil
724 "Indicates whether diff understands the -L option.
725 The value is either `yes', `no', or nil. If it is nil, VC tries
726 to use -L and sets this variable to remember whether it worked."
727 :type '(choice (const :tag "Work out" nil) (const yes) (const no))
728 :group 'vc)
730 (defcustom vc-log-show-limit 2000
731 "Limit the number of items shown by the VC log commands.
732 Zero means unlimited.
733 Not all VC backends are able to support this feature."
734 :type 'integer
735 :group 'vc)
737 (defcustom vc-allow-async-revert nil
738 "Specifies whether the diff during \\[vc-revert] may be asynchronous.
739 Enabling this option means that you can confirm a revert operation even
740 if the local changes in the file have not been found and displayed yet."
741 :type '(choice (const :tag "No" nil)
742 (const :tag "Yes" t))
743 :group 'vc
744 :version "22.1")
746 ;;;###autoload
747 (defcustom vc-checkout-hook nil
748 "Normal hook (list of functions) run after checking out a file.
749 See `run-hooks'."
750 :type 'hook
751 :group 'vc
752 :version "21.1")
754 ;;;###autoload
755 (defcustom vc-checkin-hook nil
756 "Normal hook (list of functions) run after commit or file checkin.
757 See also `log-edit-done-hook'."
758 :type 'hook
759 :options '(log-edit-comment-to-change-log)
760 :group 'vc)
762 ;;;###autoload
763 (defcustom vc-before-checkin-hook nil
764 "Normal hook (list of functions) run before a commit or a file checkin.
765 See `run-hooks'."
766 :type 'hook
767 :group 'vc)
769 ;; Header-insertion hair
771 (defcustom vc-static-header-alist
772 '(("\\.c\\'" .
773 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n"))
774 "Associate static header string templates with file types.
775 A \%s in the template is replaced with the first string associated with
776 the file's version control type in `vc-header-alist'."
777 :type '(repeat (cons :format "%v"
778 (regexp :tag "File Type")
779 (string :tag "Header String")))
780 :group 'vc)
782 (defcustom vc-comment-alist
783 '((nroff-mode ".\\\"" ""))
784 "Special comment delimiters for generating VC headers.
785 Add an entry in this list if you need to override the normal `comment-start'
786 and `comment-end' variables. This will only be necessary if the mode language
787 is sensitive to blank lines."
788 :type '(repeat (list :format "%v"
789 (symbol :tag "Mode")
790 (string :tag "Comment Start")
791 (string :tag "Comment End")))
792 :group 'vc)
794 (defcustom vc-checkout-carefully (= (user-uid) 0)
795 "Non-nil means be extra-careful in checkout.
796 Verify that the file really is not locked
797 and that its contents match what the repository version says."
798 :type 'boolean
799 :group 'vc)
800 (make-obsolete-variable 'vc-checkout-carefully
801 "the corresponding checks are always done now."
802 "21.1")
805 ;; Variables users don't need to see
807 (defvar vc-disable-async-diff nil
808 "VC sets this to t locally to disable some async diff operations.
809 Backends that offer asynchronous diffs should respect this variable
810 in their implementation of vc-BACKEND-diff.")
812 ;; File property caching
814 (defun vc-clear-context ()
815 "Clear all cached file properties."
816 (interactive)
817 (fillarray vc-file-prop-obarray 0))
819 (defmacro with-vc-properties (files form settings)
820 "Execute FORM, then maybe set per-file properties for FILES.
821 If any of FILES is actually a directory, then do the same for all
822 buffers for files in that directory.
823 SETTINGS is an association list of property/value pairs. After
824 executing FORM, set those properties from SETTINGS that have not yet
825 been updated to their corresponding values."
826 (declare (debug t))
827 `(let ((vc-touched-properties (list t))
828 (flist nil))
829 (dolist (file ,files)
830 (if (file-directory-p file)
831 (dolist (buffer (buffer-list))
832 (let ((fname (buffer-file-name buffer)))
833 (when (and fname (vc-string-prefix-p file fname))
834 (push fname flist))))
835 (push file flist)))
836 ,form
837 (dolist (file flist)
838 (dolist (setting ,settings)
839 (let ((property (car setting)))
840 (unless (memq property vc-touched-properties)
841 (put (intern file vc-file-prop-obarray)
842 property (cdr setting))))))))
844 ;;; Code for deducing what fileset and backend to assume
846 (defun vc-backend-for-registration (file)
847 "Return a backend that can be used for registering FILE.
849 If no backend declares itself responsible for FILE, then FILE
850 must not be in a version controlled directory, so try to create a
851 repository, prompting for the directory and the VC backend to
852 use."
853 (catch 'found
854 ;; First try: find a responsible backend, it must be a backend
855 ;; under which FILE is not yet registered.
856 (dolist (backend vc-handled-backends)
857 (and (not (vc-call-backend backend 'registered file))
858 (vc-call-backend backend 'responsible-p file)
859 (throw 'found backend)))
860 ;; no responsible backend
861 (let* ((possible-backends
862 (let (pos)
863 (dolist (crt vc-handled-backends)
864 (when (vc-find-backend-function crt 'create-repo)
865 (push crt pos)))
866 pos))
868 (intern
869 ;; Read the VC backend from the user, only
870 ;; complete with the backends that have the
871 ;; 'create-repo method.
872 (completing-read
873 (format "%s is not in a version controlled directory.\nUse VC backend: " file)
874 (mapcar 'symbol-name possible-backends) nil t)))
875 (repo-dir
876 (let ((def-dir (file-name-directory file)))
877 ;; read the directory where to create the
878 ;; repository, make sure it's a parent of
879 ;; file.
880 (read-file-name
881 (format "create %s repository in: " bk)
882 default-directory def-dir t nil
883 (lambda (arg)
884 (message "arg %s" arg)
885 (and (file-directory-p arg)
886 (vc-string-prefix-p (expand-file-name arg) def-dir)))))))
887 (let ((default-directory repo-dir))
888 (vc-call-backend bk 'create-repo))
889 (throw 'found bk))))
891 (defun vc-responsible-backend (file)
892 "Return the name of a backend system that is responsible for FILE.
894 If FILE is already registered, return the
895 backend of FILE. If FILE is not registered, then the
896 first backend in `vc-handled-backends' that declares itself
897 responsible for FILE is returned."
898 (or (and (not (file-directory-p file)) (vc-backend file))
899 (catch 'found
900 ;; First try: find a responsible backend. If this is for registration,
901 ;; it must be a backend under which FILE is not yet registered.
902 (dolist (backend vc-handled-backends)
903 (and (vc-call-backend backend 'responsible-p file)
904 (throw 'found backend))))
905 (error "No VC backend is responsible for %s" file)))
907 (defun vc-expand-dirs (file-or-dir-list)
908 "Expands directories in a file list specification.
909 Within directories, only files already under version control are noticed."
910 (let ((flattened '()))
911 (dolist (node file-or-dir-list)
912 (when (file-directory-p node)
913 (vc-file-tree-walk
914 node (lambda (f) (when (vc-backend f) (push f flattened)))))
915 (unless (file-directory-p node) (push node flattened)))
916 (nreverse flattened)))
918 (defvar vc-dir-backend)
920 (declare-function vc-dir-current-file "vc-dir" ())
921 (declare-function vc-dir-deduce-fileset "vc-dir" (&optional state-model-only-files))
923 (defun vc-deduce-fileset (&optional observer allow-unregistered
924 state-model-only-files)
925 "Deduce a set of files and a backend to which to apply an operation.
927 Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL).
928 If we're in VC-dir mode, the fileset is the list of marked files.
929 Otherwise, if we're looking at a buffer visiting a version-controlled file,
930 the fileset is a singleton containing this file.
931 If none of these conditions is met, but ALLOW_UNREGISTERED is on and the
932 visited file is not registered, return a singleton fileset containing it.
933 Otherwise, throw an error.
935 STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs
936 the FILESET-ONLY-FILES STATE and MODEL info. Otherwise, that
937 part may be skipped.
938 BEWARE: this function may change the
939 current buffer."
940 ;; FIXME: OBSERVER is unused. The name is not intuitive and is not
941 ;; documented. It's set to t when called from diff and print-log.
942 (let (backend)
943 (cond
944 ((derived-mode-p 'vc-dir-mode)
945 (vc-dir-deduce-fileset state-model-only-files))
946 ((derived-mode-p 'dired-mode)
947 (if observer
948 (vc-dired-deduce-fileset)
949 (error "State changing VC operations not supported in `dired-mode'")))
950 ((setq backend (vc-backend buffer-file-name))
951 (if state-model-only-files
952 (list backend (list buffer-file-name)
953 (list buffer-file-name)
954 (vc-state buffer-file-name)
955 (vc-checkout-model backend buffer-file-name))
956 (list backend (list buffer-file-name))))
957 ((and (buffer-live-p vc-parent-buffer)
958 ;; FIXME: Why this test? --Stef
959 (or (buffer-file-name vc-parent-buffer)
960 (with-current-buffer vc-parent-buffer
961 (derived-mode-p 'vc-dir-mode))))
962 (progn ;FIXME: Why not `with-current-buffer'? --Stef.
963 (set-buffer vc-parent-buffer)
964 (vc-deduce-fileset observer allow-unregistered state-model-only-files)))
965 ((not buffer-file-name)
966 (error "Buffer %s is not associated with a file" (buffer-name)))
967 ((and allow-unregistered (not (vc-registered buffer-file-name)))
968 (if state-model-only-files
969 (list (vc-backend-for-registration (buffer-file-name))
970 (list buffer-file-name)
971 (list buffer-file-name)
972 (when state-model-only-files 'unregistered)
973 nil)
974 (list (vc-backend-for-registration (buffer-file-name))
975 (list buffer-file-name))))
976 (t (error "No fileset is available here")))))
978 (defun vc-dired-deduce-fileset ()
979 (let ((backend (vc-responsible-backend default-directory)))
980 (unless backend (error "Directory not under VC"))
981 (list backend
982 (dired-map-over-marks (dired-get-filename nil t) nil))))
984 (defun vc-ensure-vc-buffer ()
985 "Make sure that the current buffer visits a version-controlled file."
986 (cond
987 ((derived-mode-p 'vc-dir-mode)
988 (set-buffer (find-file-noselect (vc-dir-current-file))))
990 (while (and vc-parent-buffer
991 (buffer-live-p vc-parent-buffer)
992 ;; Avoid infinite looping when vc-parent-buffer and
993 ;; current buffer are the same buffer.
994 (not (eq vc-parent-buffer (current-buffer))))
995 (set-buffer vc-parent-buffer))
996 (if (not buffer-file-name)
997 (error "Buffer %s is not associated with a file" (buffer-name))
998 (unless (vc-backend buffer-file-name)
999 (error "File %s is not under version control" buffer-file-name))))))
1001 ;;; Support for the C-x v v command.
1002 ;; This is where all the single-file-oriented code from before the fileset
1003 ;; rewrite lives.
1005 (defsubst vc-editable-p (file)
1006 "Return non-nil if FILE can be edited."
1007 (let ((backend (vc-backend file)))
1008 (and backend
1009 (or (eq (vc-checkout-model backend (list file)) 'implicit)
1010 (memq (vc-state file) '(edited needs-merge conflict))))))
1012 (defun vc-compatible-state (p q)
1013 "Controls which states can be in the same commit."
1015 (eq p q)
1016 (and (member p '(edited added removed)) (member q '(edited added removed)))))
1018 ;; Here's the major entry point.
1020 ;;;###autoload
1021 (defun vc-next-action (verbose)
1022 "Do the next logical version control operation on the current fileset.
1023 This requires that all files in the fileset be in the same state.
1025 For locking systems:
1026 If every file is not already registered, this registers each for version
1027 control.
1028 If every file is registered and not locked by anyone, this checks out
1029 a writable and locked file of each ready for editing.
1030 If every file is checked out and locked by the calling user, this
1031 first checks to see if each file has changed since checkout. If not,
1032 it performs a revert on that file.
1033 If every file has been changed, this pops up a buffer for entry
1034 of a log message; when the message has been entered, it checks in the
1035 resulting changes along with the log message as change commentary. If
1036 the variable `vc-keep-workfiles' is non-nil (which is its default), a
1037 read-only copy of each changed file is left in place afterwards.
1038 If the affected file is registered and locked by someone else, you are
1039 given the option to steal the lock(s).
1041 For merging systems:
1042 If every file is not already registered, this registers each one for version
1043 control. This does an add, but not a commit.
1044 If every file is added but not committed, each one is committed.
1045 If every working file is changed, but the corresponding repository file is
1046 unchanged, this pops up a buffer for entry of a log message; when the
1047 message has been entered, it checks in the resulting changes along
1048 with the logmessage as change commentary. A writable file is retained.
1049 If the repository file is changed, you are asked if you want to
1050 merge in the changes into your working copy."
1051 (interactive "P")
1052 (let* ((vc-fileset (vc-deduce-fileset nil t 'state-model-only-files))
1053 (backend (car vc-fileset))
1054 (files (nth 1 vc-fileset))
1055 (fileset-only-files (nth 2 vc-fileset))
1056 ;; FIXME: We used to call `vc-recompute-state' here.
1057 (state (nth 3 vc-fileset))
1058 ;; The backend should check that the checkout-model is consistent
1059 ;; among all the `files'.
1060 (model (nth 4 vc-fileset)))
1062 ;; Do the right thing
1063 (cond
1064 ((eq state 'missing)
1065 (error "Fileset files are missing, so cannot be operated on"))
1066 ((eq state 'ignored)
1067 (error "Fileset files are ignored by the version-control system"))
1068 ((or (null state) (eq state 'unregistered))
1069 (vc-register nil vc-fileset))
1070 ;; Files are up-to-date, or need a merge and user specified a revision
1071 ((or (eq state 'up-to-date) (and verbose (eq state 'needs-update)))
1072 (cond
1073 (verbose
1074 ;; go to a different revision
1075 (let* ((revision
1076 (read-string "Branch, revision, or backend to move to: "))
1077 (revision-downcase (downcase revision)))
1078 (if (member
1079 revision-downcase
1080 (mapcar (lambda (arg) (downcase (symbol-name arg)))
1081 vc-handled-backends))
1082 (let ((vsym (intern-soft revision-downcase)))
1083 (dolist (file files) (vc-transfer-file file vsym)))
1084 (dolist (file files)
1085 (vc-checkout file (eq model 'implicit) revision)))))
1086 ((not (eq model 'implicit))
1087 ;; check the files out
1088 (dolist (file files) (vc-checkout file t)))
1090 ;; do nothing
1091 (message "Fileset is up-to-date"))))
1092 ;; Files have local changes
1093 ((vc-compatible-state state 'edited)
1094 (let ((ready-for-commit files))
1095 ;; If files are edited but read-only, give user a chance to correct
1096 (dolist (file files)
1097 (unless (file-writable-p file)
1098 ;; Make the file+buffer read-write.
1099 (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file))
1100 (error "Aborted"))
1101 (set-file-modes file (logior (file-modes file) 128))
1102 (let ((visited (get-file-buffer file)))
1103 (when visited
1104 (with-current-buffer visited
1105 (toggle-read-only -1))))))
1106 ;; Allow user to revert files with no changes
1107 (save-excursion
1108 (dolist (file files)
1109 (let ((visited (get-file-buffer file)))
1110 ;; For files with locking, if the file does not contain
1111 ;; any changes, just let go of the lock, i.e. revert.
1112 (when (and (not (eq model 'implicit))
1113 (vc-workfile-unchanged-p file)
1114 ;; If buffer is modified, that means the user just
1115 ;; said no to saving it; in that case, don't revert,
1116 ;; because the user might intend to save after
1117 ;; finishing the log entry and committing.
1118 (not (and visited (buffer-modified-p))))
1119 (vc-revert-file file)
1120 (setq ready-for-commit (delete file ready-for-commit))))))
1121 ;; Remaining files need to be committed
1122 (if (not ready-for-commit)
1123 (message "No files remain to be committed")
1124 (if (not verbose)
1125 (vc-checkin ready-for-commit backend)
1126 (let* ((revision (read-string "New revision or backend: "))
1127 (revision-downcase (downcase revision)))
1128 (if (member
1129 revision-downcase
1130 (mapcar (lambda (arg) (downcase (symbol-name arg)))
1131 vc-handled-backends))
1132 (let ((vsym (intern revision-downcase)))
1133 (dolist (file files) (vc-transfer-file file vsym)))
1134 (vc-checkin ready-for-commit backend revision)))))))
1135 ;; locked by somebody else (locking VCSes only)
1136 ((stringp state)
1137 ;; In the old days, we computed the revision once and used it on
1138 ;; the single file. Then, for the 2007-2008 fileset rewrite, we
1139 ;; computed the revision once (incorrectly, using a free var) and
1140 ;; used it on all files. To fix the free var bug, we can either
1141 ;; use `(car files)' or do what we do here: distribute the
1142 ;; revision computation among `files'. Although this may be
1143 ;; tedious for those backends where a "revision" is a trans-file
1144 ;; concept, it is nonetheless correct for both those and (more
1145 ;; importantly) for those where "revision" is a per-file concept.
1146 ;; If the intersection of the former group and "locking VCSes" is
1147 ;; non-empty [I vaguely doubt it --ttn], we can reinstate the
1148 ;; pre-computation approach of yore.
1149 (dolist (file files)
1150 (vc-steal-lock
1151 file (if verbose
1152 (read-string (format "%s revision to steal: " file))
1153 (vc-working-revision file))
1154 state)))
1155 ;; conflict
1156 ((eq state 'conflict)
1157 ;; FIXME: Is it really the UI we want to provide?
1158 ;; In my experience, the conflicted files should be marked as resolved
1159 ;; one-by-one when saving the file after resolving the conflicts.
1160 ;; I.e. stating explicitly that the conflicts are resolved is done
1161 ;; very rarely.
1162 (vc-mark-resolved backend files))
1163 ;; needs-update
1164 ((eq state 'needs-update)
1165 (dolist (file files)
1166 (if (yes-or-no-p (format
1167 "%s is not up-to-date. Get latest revision? "
1168 (file-name-nondirectory file)))
1169 (vc-checkout file (eq model 'implicit) t)
1170 (when (and (not (eq model 'implicit))
1171 (yes-or-no-p "Lock this revision? "))
1172 (vc-checkout file t)))))
1173 ;; needs-merge
1174 ((eq state 'needs-merge)
1175 (dolist (file files)
1176 (when (yes-or-no-p (format
1177 "%s is not up-to-date. Merge in changes now? "
1178 (file-name-nondirectory file)))
1179 (vc-maybe-resolve-conflicts
1180 file (vc-call-backend backend 'merge-news file)))))
1182 ;; unlocked-changes
1183 ((eq state 'unlocked-changes)
1184 (dolist (file files)
1185 (when (not (equal buffer-file-name file))
1186 (find-file-other-window file))
1187 (if (save-window-excursion
1188 (vc-diff-internal nil
1189 (cons (car vc-fileset) (cons (cadr vc-fileset) (list file)))
1190 (vc-working-revision file) nil)
1191 (goto-char (point-min))
1192 (let ((inhibit-read-only t))
1193 (insert
1194 (format "Changes to %s since last lock:\n\n" file)))
1195 (not (beep))
1196 (yes-or-no-p (concat "File has unlocked changes. "
1197 "Claim lock retaining changes? ")))
1198 (progn (vc-call-backend backend 'steal-lock file)
1199 (clear-visited-file-modtime)
1200 ;; Must clear any headers here because they wouldn't
1201 ;; show that the file is locked now.
1202 (vc-clear-headers file)
1203 (write-file buffer-file-name)
1204 (vc-mode-line file backend))
1205 (if (not (yes-or-no-p
1206 "Revert to checked-in revision, instead? "))
1207 (error "Checkout aborted")
1208 (vc-revert-buffer-internal t t)
1209 (vc-checkout file t)))))
1210 ;; Unknown fileset state
1212 (error "Fileset is in an unknown state %s" state)))))
1214 (defun vc-create-repo (backend)
1215 "Create an empty repository in the current directory."
1216 (interactive
1217 (list
1218 (intern
1219 (upcase
1220 (completing-read
1221 "Create repository for: "
1222 (mapcar (lambda (b) (list (downcase (symbol-name b)))) vc-handled-backends)
1223 nil t)))))
1224 (vc-call-backend backend 'create-repo))
1226 (declare-function vc-dir-move-to-goal-column "vc-dir" ())
1228 ;;;###autoload
1229 (defun vc-register (&optional set-revision vc-fileset comment)
1230 "Register into a version control system.
1231 If VC-FILESET is given, register the files in that fileset.
1232 Otherwise register the current file.
1233 With prefix argument SET-REVISION, allow user to specify initial revision
1234 level. If COMMENT is present, use that as an initial comment.
1236 The version control system to use is found by cycling through the list
1237 `vc-handled-backends'. The first backend in that list which declares
1238 itself responsible for the file (usually because other files in that
1239 directory are already registered under that backend) will be used to
1240 register the file. If no backend declares itself responsible, the
1241 first backend that could register the file is used."
1242 (interactive "P")
1243 (let* ((fileset-arg (or vc-fileset (vc-deduce-fileset nil t)))
1244 (backend (car fileset-arg))
1245 (files (nth 1 fileset-arg)))
1246 ;; We used to operate on `only-files', but VC wants to provide the
1247 ;; possibility to register directories rather than files only, since
1248 ;; many VCS allow that as well.
1249 (dolist (fname files)
1250 (let ((bname (get-file-buffer fname)))
1251 (unless fname (setq fname buffer-file-name))
1252 (when (vc-backend fname)
1253 (if (vc-registered fname)
1254 (error "This file is already registered")
1255 (unless (y-or-n-p "Previous master file has vanished. Make a new one? ")
1256 (error "Aborted"))))
1257 ;; Watch out for new buffers of size 0: the corresponding file
1258 ;; does not exist yet, even though buffer-modified-p is nil.
1259 (when bname
1260 (with-current-buffer bname
1261 (when (and (not (buffer-modified-p))
1262 (zerop (buffer-size))
1263 (not (file-exists-p buffer-file-name)))
1264 (set-buffer-modified-p t))
1265 (vc-buffer-sync)))))
1266 (message "Registering %s... " files)
1267 (mapc 'vc-file-clearprops files)
1268 (vc-call-backend backend 'register files
1269 (if set-revision
1270 (read-string (format "Initial revision level for %s: " files))
1271 (vc-call-backend backend 'init-revision))
1272 comment)
1273 (mapc
1274 (lambda (file)
1275 (vc-file-setprop file 'vc-backend backend)
1276 ;; FIXME: This is wrong: it should set `backup-inhibited' in all
1277 ;; the buffers visiting files affected by this `vc-register', not
1278 ;; in the current-buffer.
1279 ;; (unless vc-make-backup-files
1280 ;; (make-local-variable 'backup-inhibited)
1281 ;; (setq backup-inhibited t))
1283 (vc-resynch-buffer file vc-keep-workfiles t))
1284 files)
1285 (when (derived-mode-p 'vc-dir-mode)
1286 (vc-dir-move-to-goal-column))
1287 (message "Registering %s... done" files)))
1289 (defun vc-register-with (backend)
1290 "Register the current file with a specified back end."
1291 (interactive "SBackend: ")
1292 (when (not (member backend vc-handled-backends))
1293 (error "Unknown back end"))
1294 (let ((vc-handled-backends (list backend)))
1295 (call-interactively 'vc-register)))
1297 (defun vc-checkout (file &optional writable rev)
1298 "Retrieve a copy of the revision REV of FILE.
1299 If WRITABLE is non-nil, make sure the retrieved file is writable.
1300 REV defaults to the latest revision.
1302 After check-out, runs the normal hook `vc-checkout-hook'."
1303 (and writable
1304 (not rev)
1305 (vc-call make-version-backups-p file)
1306 (vc-up-to-date-p file)
1307 (vc-make-version-backup file))
1308 (let ((backend (vc-backend file)))
1309 (with-vc-properties (list file)
1310 (condition-case err
1311 (vc-call-backend backend 'checkout file writable rev)
1312 (file-error
1313 ;; Maybe the backend is not installed ;-(
1314 (when writable
1315 (let ((buf (get-file-buffer file)))
1316 (when buf (with-current-buffer buf (toggle-read-only -1)))))
1317 (signal (car err) (cdr err))))
1318 `((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit)
1319 (not writable))
1320 (if (vc-call-backend backend 'latest-on-branch-p file)
1321 'up-to-date
1322 'needs-update)
1323 'edited))
1324 (vc-checkout-time . ,(nth 5 (file-attributes file))))))
1325 (vc-resynch-buffer file t t)
1326 (run-hooks 'vc-checkout-hook))
1328 (defun vc-mark-resolved (backend files)
1329 (prog1 (with-vc-properties
1330 files
1331 (vc-call-backend backend 'mark-resolved files)
1332 ;; FIXME: Is this TRTD? Might not be.
1333 `((vc-state . edited)))
1334 (message
1335 (substitute-command-keys
1336 "Conflicts have been resolved in %s. \
1337 Type \\[vc-next-action] to check in changes.")
1338 (if (> (length files) 1)
1339 (format "%d files" (length files))
1340 "this file"))))
1342 (defun vc-steal-lock (file rev owner)
1343 "Steal the lock on FILE."
1344 (let (file-description)
1345 (if rev
1346 (setq file-description (format "%s:%s" file rev))
1347 (setq file-description file))
1348 (when (not (yes-or-no-p (format "Steal the lock on %s from %s? "
1349 file-description owner)))
1350 (error "Steal canceled"))
1351 (message "Stealing lock on %s..." file)
1352 (with-vc-properties
1353 (list file)
1354 (vc-call steal-lock file rev)
1355 `((vc-state . edited)))
1356 (vc-resynch-buffer file t t)
1357 (message "Stealing lock on %s...done" file)
1358 ;; Write mail after actually stealing, because if the stealing
1359 ;; goes wrong, we don't want to send any mail.
1360 (compose-mail owner (format "Stolen lock on %s" file-description))
1361 (setq default-directory (expand-file-name "~/"))
1362 (goto-char (point-max))
1363 (insert
1364 (format "I stole the lock on %s, " file-description)
1365 (current-time-string)
1366 ".\n")
1367 (message "Please explain why you stole the lock. Type C-c C-c when done.")))
1369 (defun vc-checkin (files backend &optional rev comment initial-contents)
1370 "Check in FILES.
1371 The optional argument REV may be a string specifying the new revision
1372 level (strongly deprecated). COMMENT is a comment
1373 string; if omitted, a buffer is popped up to accept a comment. If
1374 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial contents
1375 of the log entry buffer.
1377 If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided
1378 that the version control system supports this mode of operation.
1380 Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
1381 (when vc-before-checkin-hook
1382 (run-hooks 'vc-before-checkin-hook))
1383 (lexical-let
1384 ((backend backend))
1385 (vc-start-logentry
1386 files comment initial-contents
1387 "Enter a change comment."
1388 "*VC-log*"
1389 (lambda ()
1390 (vc-call-backend backend 'log-edit-mode))
1391 (lexical-let ((rev rev))
1392 (lambda (files comment)
1393 (message "Checking in %s..." (vc-delistify files))
1394 ;; "This log message intentionally left almost blank".
1395 ;; RCS 5.7 gripes about white-space-only comments too.
1396 (or (and comment (string-match "[^\t\n ]" comment))
1397 (setq comment "*** empty log message ***"))
1398 (with-vc-properties
1399 files
1400 ;; We used to change buffers to get local value of
1401 ;; vc-checkin-switches, but 'the' local buffer is
1402 ;; not a well-defined concept for filesets.
1403 (progn
1404 (vc-call-backend backend 'checkin files rev comment)
1405 (mapc 'vc-delete-automatic-version-backups files))
1406 `((vc-state . up-to-date)
1407 (vc-checkout-time . ,(nth 5 (file-attributes file)))
1408 (vc-working-revision . nil)))
1409 (message "Checking in %s...done" (vc-delistify files))))
1410 'vc-checkin-hook)))
1412 ;;; Additional entry points for examining version histories
1414 ;; (defun vc-default-diff-tree (backend dir rev1 rev2)
1415 ;; "List differences for all registered files at and below DIR.
1416 ;; The meaning of REV1 and REV2 is the same as for `vc-revision-diff'."
1417 ;; ;; This implementation does an explicit tree walk, and calls
1418 ;; ;; vc-BACKEND-diff directly for each file. An optimization
1419 ;; ;; would be to use `vc-diff-internal', so that diffs can be local,
1420 ;; ;; and to call it only for files that are actually changed.
1421 ;; ;; However, this is expensive for some backends, and so it is left
1422 ;; ;; to backend-specific implementations.
1423 ;; (setq default-directory dir)
1424 ;; (vc-file-tree-walk
1425 ;; default-directory
1426 ;; (lambda (f)
1427 ;; (vc-exec-after
1428 ;; `(let ((coding-system-for-read (vc-coding-system-for-diff ',f)))
1429 ;; (message "Looking at %s" ',f)
1430 ;; (vc-call-backend ',(vc-backend f)
1431 ;; 'diff (list ',f) ',rev1 ',rev2))))))
1433 (defun vc-coding-system-for-diff (file)
1434 "Return the coding system for reading diff output for FILE."
1435 (or coding-system-for-read
1436 ;; if we already have this file open,
1437 ;; use the buffer's coding system
1438 (let ((buf (find-buffer-visiting file)))
1439 (when buf (with-current-buffer buf
1440 buffer-file-coding-system)))
1441 ;; otherwise, try to find one based on the file name
1442 (car (find-operation-coding-system 'insert-file-contents file))
1443 ;; and a final fallback
1444 'undecided))
1446 (defun vc-switches (backend op)
1447 "Return a list of vc-BACKEND switches for operation OP.
1448 BACKEND is a symbol such as `CVS', which will be downcased.
1449 OP is a symbol such as `diff'.
1451 In decreasing order of preference, return the value of:
1452 vc-BACKEND-OP-switches (e.g. `vc-cvs-diff-switches');
1453 vc-OP-switches (e.g. `vc-diff-switches'); or, in the case of
1454 diff only, `diff-switches'.
1456 If the chosen value is not a string or a list, return nil.
1457 This is so that you may set, e.g. `vc-svn-diff-switches' to t in order
1458 to override the value of `vc-diff-switches' and `diff-switches'."
1459 (let ((switches
1460 (or (when backend
1461 (let ((sym (vc-make-backend-sym
1462 backend (intern (concat (symbol-name op)
1463 "-switches")))))
1464 (when (boundp sym) (symbol-value sym))))
1465 (let ((sym (intern (format "vc-%s-switches" (symbol-name op)))))
1466 (when (boundp sym) (symbol-value sym)))
1467 (cond
1468 ((eq op 'diff) diff-switches)))))
1469 (if (stringp switches) (list switches)
1470 ;; If not a list, return nil.
1471 ;; This is so we can set vc-diff-switches to t to override
1472 ;; any switches in diff-switches.
1473 (when (listp switches) switches))))
1475 ;; Old def for compatibility with Emacs-21.[123].
1476 (defmacro vc-diff-switches-list (backend) `(vc-switches ',backend 'diff))
1477 (make-obsolete 'vc-diff-switches-list 'vc-switches "22.1")
1479 (defun vc-diff-finish (buffer messages)
1480 ;; The empty sync output case has already been handled, so the only
1481 ;; possibility of an empty output is for an async process.
1482 (when (buffer-live-p buffer)
1483 (let ((window (get-buffer-window buffer t))
1484 (emptyp (zerop (buffer-size buffer))))
1485 (with-current-buffer buffer
1486 (and messages emptyp
1487 (let ((inhibit-read-only t))
1488 (insert (cdr messages) ".\n")
1489 (message "%s" (cdr messages))))
1490 (goto-char (point-min))
1491 (when window
1492 (shrink-window-if-larger-than-buffer window)))
1493 (when (and messages (not emptyp))
1494 (message "%sdone" (car messages))))))
1496 (defvar vc-diff-added-files nil
1497 "If non-nil, diff added files by comparing them to /dev/null.")
1499 (defun vc-diff-internal (async vc-fileset rev1 rev2 &optional verbose)
1500 "Report diffs between two revisions of a fileset.
1501 Diff output goes to the *vc-diff* buffer. The function
1502 returns t if the buffer had changes, nil otherwise."
1503 (let* ((files (cadr vc-fileset))
1504 (messages (cons (format "Finding changes in %s..."
1505 (vc-delistify files))
1506 (format "No changes between %s and %s"
1507 (or rev1 "working revision")
1508 (or rev2 "workfile"))))
1509 ;; Set coding system based on the first file. It's a kluge,
1510 ;; but the only way to set it for each file included would
1511 ;; be to call the back end separately for each file.
1512 (coding-system-for-read
1513 (if files (vc-coding-system-for-diff (car files)) 'undecided)))
1514 (vc-setup-buffer "*vc-diff*")
1515 (message "%s" (car messages))
1516 ;; Many backends don't handle well the case of a file that has been
1517 ;; added but not yet committed to the repo (notably CVS and Subversion).
1518 ;; Do that work here so the backends don't have to futz with it. --ESR
1520 ;; Actually most backends (including CVS) have options to control the
1521 ;; behavior since which one is better depends on the user and on the
1522 ;; situation). Worse yet: this code does not handle the case where
1523 ;; `file' is a directory which contains added files.
1524 ;; I made it conditional on vc-diff-added-files but it should probably
1525 ;; just be removed (or copied/moved to specific backends). --Stef.
1526 (when vc-diff-added-files
1527 (let ((filtered '())
1528 process-file-side-effects)
1529 (dolist (file files)
1530 (if (or (file-directory-p file)
1531 (not (string= (vc-working-revision file) "0")))
1532 (push file filtered)
1533 ;; This file is added but not yet committed;
1534 ;; there is no repository version to diff against.
1535 (if (or rev1 rev2)
1536 (error "No revisions of %s exist" file)
1537 ;; We regard this as "changed".
1538 ;; Diff it against /dev/null.
1539 (apply 'vc-do-command "*vc-diff*"
1540 1 "diff" file
1541 (append (vc-switches nil 'diff) '("/dev/null"))))))
1542 (setq files (nreverse filtered))))
1543 (let ((vc-disable-async-diff (not async)))
1544 (vc-call-backend (car vc-fileset) 'diff files rev1 rev2 "*vc-diff*"))
1545 (set-buffer "*vc-diff*")
1546 (if (and (zerop (buffer-size))
1547 (not (get-buffer-process (current-buffer))))
1548 ;; Treat this case specially so as not to pop the buffer.
1549 (progn
1550 (message "%s" (cdr messages))
1551 nil)
1552 (diff-mode)
1553 ;; Make the *vc-diff* buffer read only, the diff-mode key
1554 ;; bindings are nicer for read only buffers. pcl-cvs does the
1555 ;; same thing.
1556 (setq buffer-read-only t)
1557 (vc-exec-after `(vc-diff-finish ,(current-buffer) ',(when verbose
1558 messages)))
1559 ;; Display the buffer, but at the end because it can change point.
1560 (pop-to-buffer (current-buffer))
1561 ;; In the async case, we return t even if there are no differences
1562 ;; because we don't know that yet.
1563 t)))
1565 (defun vc-read-revision (prompt &optional files backend default initial-input)
1566 (cond
1567 ((null files)
1568 (let ((vc-fileset (vc-deduce-fileset t))) ;FIXME: why t? --Stef
1569 (setq files (cadr vc-fileset))
1570 (setq backend (car vc-fileset))))
1571 ((null backend) (setq backend (vc-backend (car files)))))
1572 (let ((completion-table
1573 (vc-call-backend backend 'revision-completion-table files)))
1574 (if completion-table
1575 (completing-read prompt completion-table
1576 nil nil initial-input nil default)
1577 (read-string prompt initial-input nil default))))
1579 ;;;###autoload
1580 (defun vc-version-diff (files rev1 rev2)
1581 "Report diffs between revisions of the fileset in the repository history."
1582 (interactive
1583 (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: why t? --Stef
1584 (files (cadr vc-fileset))
1585 (backend (car vc-fileset))
1586 (first (car files))
1587 (rev1-default nil)
1588 (rev2-default nil))
1589 (cond
1590 ;; someday we may be able to do revision completion on non-singleton
1591 ;; filesets, but not yet.
1592 ((/= (length files) 1)
1593 nil)
1594 ;; if it's a directory, don't supply any revision default
1595 ((file-directory-p first)
1596 nil)
1597 ;; if the file is not up-to-date, use working revision as older revision
1598 ((not (vc-up-to-date-p first))
1599 (setq rev1-default (vc-working-revision first)))
1600 ;; if the file is not locked, use last and previous revisions as defaults
1602 (setq rev1-default (vc-call-backend backend 'previous-revision first
1603 (vc-working-revision first)))
1604 (when (string= rev1-default "") (setq rev1-default nil))
1605 (setq rev2-default (vc-working-revision first))))
1606 ;; construct argument list
1607 (let* ((rev1-prompt (if rev1-default
1608 (concat "Older revision (default "
1609 rev1-default "): ")
1610 "Older revision: "))
1611 (rev2-prompt (concat "Newer revision (default "
1612 (or rev2-default "current source") "): "))
1613 (rev1 (vc-read-revision rev1-prompt files backend rev1-default))
1614 (rev2 (vc-read-revision rev2-prompt files backend rev2-default)))
1615 (when (string= rev1 "") (setq rev1 nil))
1616 (when (string= rev2 "") (setq rev2 nil))
1617 (list files rev1 rev2))))
1618 ;; All that was just so we could do argument completion!
1619 (when (and (not rev1) rev2)
1620 (error "Not a valid revision range"))
1621 ;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the
1622 ;; placement rules for (interactive) don't actually leave us a choice.
1623 (vc-diff-internal t (vc-deduce-fileset t) rev1 rev2
1624 (called-interactively-p 'interactive)))
1626 ;;;###autoload
1627 (defun vc-diff (historic &optional not-urgent)
1628 "Display diffs between file revisions.
1629 Normally this compares the currently selected fileset with their
1630 working revisions. With a prefix argument HISTORIC, it reads two revision
1631 designators specifying which revisions to compare.
1633 The optional argument NOT-URGENT non-nil means it is ok to say no to
1634 saving the buffer."
1635 (interactive (list current-prefix-arg t))
1636 (if historic
1637 (call-interactively 'vc-version-diff)
1638 (when buffer-file-name (vc-buffer-sync not-urgent))
1639 (vc-diff-internal t (vc-deduce-fileset t) nil nil
1640 (called-interactively-p 'interactive))))
1642 ;;;###autoload
1643 (defun vc-root-diff (historic &optional not-urgent)
1644 "Display diffs between VC-controlled whole tree revisions.
1645 Normally, this compares the tree corresponding to the current
1646 fileset with the working revision.
1647 With a prefix argument HISTORIC, prompt for two revision
1648 designators specifying which revisions to compare.
1650 The optional argument NOT-URGENT non-nil means it is ok to say no to
1651 saving the buffer."
1652 (interactive (list current-prefix-arg t))
1653 (if historic
1654 ;; FIXME: this does not work right, `vc-version-diff' ends up
1655 ;; calling `vc-deduce-fileset' to find the files to diff, and
1656 ;; that's not what we want here, we want the diff for the VC root dir.
1657 (call-interactively 'vc-version-diff)
1658 (when buffer-file-name (vc-buffer-sync not-urgent))
1659 (let ((backend
1660 (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend)
1661 ((derived-mode-p 'dired-mode) (vc-responsible-backend default-directory))
1662 (vc-mode (vc-backend buffer-file-name))))
1663 rootdir working-revision)
1664 (unless backend
1665 (error "Buffer is not version controlled"))
1666 (setq rootdir (vc-call-backend backend 'root default-directory))
1667 (setq working-revision (vc-working-revision rootdir))
1668 ;; VC diff for the root directory produces output that is
1669 ;; relative to it. Bind default-directory to the root directory
1670 ;; here, this way the *vc-diff* buffer is setup correctly, so
1671 ;; relative file names work.
1672 (let ((default-directory rootdir))
1673 (vc-diff-internal
1674 t (list backend (list rootdir) working-revision) nil nil
1675 (called-interactively-p 'interactive))))))
1677 ;;;###autoload
1678 (defun vc-revision-other-window (rev)
1679 "Visit revision REV of the current file in another window.
1680 If the current file is named `F', the revision is named `F.~REV~'.
1681 If `F.~REV~' already exists, use it instead of checking it out again."
1682 (interactive
1683 (save-current-buffer
1684 (vc-ensure-vc-buffer)
1685 (list
1686 (vc-read-revision "Revision to visit (default is working revision): "
1687 (list buffer-file-name)))))
1688 (vc-ensure-vc-buffer)
1689 (let* ((file buffer-file-name)
1690 (revision (if (string-equal rev "")
1691 (vc-working-revision file)
1692 rev)))
1693 (switch-to-buffer-other-window (vc-find-revision file revision))))
1695 (defun vc-find-revision (file revision)
1696 "Read REVISION of FILE into a buffer and return the buffer."
1697 (let ((automatic-backup (vc-version-backup-file-name file revision))
1698 (filebuf (or (get-file-buffer file) (current-buffer)))
1699 (filename (vc-version-backup-file-name file revision 'manual)))
1700 (unless (file-exists-p filename)
1701 (if (file-exists-p automatic-backup)
1702 (rename-file automatic-backup filename nil)
1703 (message "Checking out %s..." filename)
1704 (with-current-buffer filebuf
1705 (let ((failed t))
1706 (unwind-protect
1707 (let ((coding-system-for-read 'no-conversion)
1708 (coding-system-for-write 'no-conversion))
1709 (with-temp-file filename
1710 (let ((outbuf (current-buffer)))
1711 ;; Change buffer to get local value of
1712 ;; vc-checkout-switches.
1713 (with-current-buffer filebuf
1714 (vc-call find-revision file revision outbuf))))
1715 (setq failed nil))
1716 (when (and failed (file-exists-p filename))
1717 (delete-file filename))))
1718 (vc-mode-line file))
1719 (message "Checking out %s...done" filename)))
1720 (let ((result-buf (find-file-noselect filename)))
1721 (with-current-buffer result-buf
1722 ;; Set the parent buffer so that things like
1723 ;; C-x v g, C-x v l, ... etc work.
1724 (set (make-local-variable 'vc-parent-buffer) filebuf))
1725 result-buf)))
1727 ;; Header-insertion code
1729 ;;;###autoload
1730 (defun vc-insert-headers ()
1731 "Insert headers into a file for use with a version control system.
1732 Headers desired are inserted at point, and are pulled from
1733 the variable `vc-BACKEND-header'."
1734 (interactive)
1735 (vc-ensure-vc-buffer)
1736 (save-excursion
1737 (save-restriction
1738 (widen)
1739 (when (or (not (vc-check-headers))
1740 (y-or-n-p "Version headers already exist. Insert another set? "))
1741 (let* ((delims (cdr (assq major-mode vc-comment-alist)))
1742 (comment-start-vc (or (car delims) comment-start "#"))
1743 (comment-end-vc (or (car (cdr delims)) comment-end ""))
1744 (hdsym (vc-make-backend-sym (vc-backend buffer-file-name)
1745 'header))
1746 (hdstrings (and (boundp hdsym) (symbol-value hdsym))))
1747 (dolist (s hdstrings)
1748 (insert comment-start-vc "\t" s "\t"
1749 comment-end-vc "\n"))
1750 (when vc-static-header-alist
1751 (dolist (f vc-static-header-alist)
1752 (when (string-match (car f) buffer-file-name)
1753 (insert (format (cdr f) (car hdstrings)))))))))))
1755 (defun vc-clear-headers (&optional file)
1756 "Clear all version headers in the current buffer (or FILE).
1757 The headers are reset to their non-expanded form."
1758 (let* ((filename (or file buffer-file-name))
1759 (visited (find-buffer-visiting filename))
1760 (backend (vc-backend filename)))
1761 (when (vc-find-backend-function backend 'clear-headers)
1762 (if visited
1763 (let ((context (vc-buffer-context)))
1764 ;; save-excursion may be able to relocate point and mark
1765 ;; properly. If it fails, vc-restore-buffer-context
1766 ;; will give it a second try.
1767 (save-excursion
1768 (vc-call-backend backend 'clear-headers))
1769 (vc-restore-buffer-context context))
1770 (set-buffer (find-file-noselect filename))
1771 (vc-call-backend backend 'clear-headers)
1772 (kill-buffer filename)))))
1774 (defun vc-modify-change-comment (files rev oldcomment)
1775 "Edit the comment associated with the given files and revision."
1776 ;; Less of a kluge than it looks like; log-view mode only passes
1777 ;; this function a singleton list. Arguments left in this form in
1778 ;; case the more general operation ever becomes meaningful.
1779 (let ((backend (vc-responsible-backend (car files))))
1780 (vc-start-logentry
1781 files oldcomment t
1782 "Enter a replacement change comment."
1783 "*VC-log*"
1784 (lambda () (vc-call-backend backend 'log-edit-mode))
1785 (lexical-let ((rev rev))
1786 (lambda (files comment)
1787 (vc-call-backend backend
1788 'modify-change-comment files rev comment))))))
1790 ;;;###autoload
1791 (defun vc-merge ()
1792 "Merge changes between two revisions into the current buffer's file.
1793 This asks for two revisions to merge from in the minibuffer. If the
1794 first revision is a branch number, then merge all changes from that
1795 branch. If the first revision is empty, merge news, i.e. recent changes
1796 from the current branch.
1798 See Info node `Merging'."
1799 (interactive)
1800 (vc-ensure-vc-buffer)
1801 (vc-buffer-sync)
1802 (let* ((file buffer-file-name)
1803 (backend (vc-backend file))
1804 (state (vc-state file))
1805 first-revision second-revision status)
1806 (cond
1807 ((stringp state) ;; Locking VCses only
1808 (error "File is locked by %s" state))
1809 ((not (vc-editable-p file))
1810 (if (y-or-n-p
1811 "File must be checked out for merging. Check out now? ")
1812 (vc-checkout file t)
1813 (error "Merge aborted"))))
1814 (setq first-revision
1815 (vc-read-revision
1816 (concat "Branch or revision to merge from "
1817 "(default news on current branch): ")
1818 (list file)
1819 backend))
1820 (if (string= first-revision "")
1821 (setq status (vc-call-backend backend 'merge-news file))
1822 (if (not (vc-find-backend-function backend 'merge))
1823 (error "Sorry, merging is not implemented for %s" backend)
1824 (if (not (vc-branch-p first-revision))
1825 (setq second-revision
1826 (vc-read-revision
1827 "Second revision: "
1828 (list file) backend nil
1829 ;; FIXME: This is CVS/RCS/SCCS specific.
1830 (concat (vc-branch-part first-revision) ".")))
1831 ;; We want to merge an entire branch. Set revisions
1832 ;; accordingly, so that vc-BACKEND-merge understands us.
1833 (setq second-revision first-revision)
1834 ;; first-revision must be the starting point of the branch
1835 (setq first-revision (vc-branch-part first-revision)))
1836 (setq status (vc-call-backend backend 'merge file
1837 first-revision second-revision))))
1838 (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE")))
1840 (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
1841 (vc-resynch-buffer file t (not (buffer-modified-p)))
1842 (if (zerop status) (message "Merge successful")
1843 (smerge-mode 1)
1844 (message "File contains conflicts.")))
1846 ;;;###autoload
1847 (defalias 'vc-resolve-conflicts 'smerge-ediff)
1849 ;; TODO: This is OK but maybe we could integrate it better.
1850 ;; E.g. it could be run semi-automatically (via a prompt?) when saving a file
1851 ;; that was conflicted (i.e. upon mark-resolved).
1852 ;; FIXME: should we add an "other-window" version? Or maybe we should
1853 ;; hook it inside find-file so it automatically works for
1854 ;; find-file-other-window as well. E.g. find-file could use a new
1855 ;; `default-next-file' variable for its default file (M-n), and
1856 ;; we could then set it upon mark-resolve, so C-x C-s C-x C-f M-n would
1857 ;; automatically offer the next conflicted file.
1858 (defun vc-find-conflicted-file ()
1859 "Visit the next conflicted file in the current project."
1860 (interactive)
1861 (let* ((backend (or (if buffer-file-name (vc-backend buffer-file-name))
1862 (vc-responsible-backend default-directory)
1863 (error "No VC backend")))
1864 (files (vc-call-backend backend
1865 'conflicted-files default-directory)))
1866 ;; Don't try and visit the current file.
1867 (if (equal (car files) buffer-file-name) (pop files))
1868 (if (null files)
1869 (message "No more conflicted files")
1870 (find-file (pop files))
1871 (message "%s more conflicted files after this one"
1872 (if files (length files) "No")))))
1874 ;; Named-configuration entry points
1876 (defun vc-tag-precondition (dir)
1877 "Scan the tree below DIR, looking for files not up-to-date.
1878 If any file is not up-to-date, return the name of the first such file.
1879 \(This means, neither tag creation nor retrieval is allowed.\)
1880 If one or more of the files are currently visited, return `visited'.
1881 Otherwise, return nil."
1882 (let ((status nil))
1883 (catch 'vc-locked-example
1884 (vc-file-tree-walk
1886 (lambda (f)
1887 (if (not (vc-up-to-date-p f)) (throw 'vc-locked-example f)
1888 (when (get-file-buffer f) (setq status 'visited)))))
1889 status)))
1891 ;;;###autoload
1892 (defun vc-create-tag (dir name branchp)
1893 "Descending recursively from DIR, make a tag called NAME.
1894 For each registered file, the working revision becomes part of
1895 the named configuration. If the prefix argument BRANCHP is
1896 given, the tag is made as a new branch and the files are
1897 checked out in that new branch."
1898 (interactive
1899 (list (read-file-name "Directory: " default-directory default-directory t)
1900 (read-string "New tag name: ")
1901 current-prefix-arg))
1902 (message "Making %s... " (if branchp "branch" "tag"))
1903 (when (file-directory-p dir) (setq dir (file-name-as-directory dir)))
1904 (vc-call-backend (vc-responsible-backend dir)
1905 'create-tag dir name branchp)
1906 (message "Making %s... done" (if branchp "branch" "tag")))
1908 ;;;###autoload
1909 (defun vc-retrieve-tag (dir name)
1910 "Descending recursively from DIR, retrieve the tag called NAME.
1911 If NAME is empty, it refers to the latest revisions.
1912 If locking is used for the files in DIR, then there must not be any
1913 locked files at or below DIR (but if NAME is empty, locked files are
1914 allowed and simply skipped)."
1915 (interactive
1916 (list (read-file-name "Directory: " default-directory default-directory t)
1917 (read-string "Tag name to retrieve (default latest revisions): ")))
1918 (let ((update (yes-or-no-p "Update any affected buffers? "))
1919 (msg (if (or (not name) (string= name ""))
1920 (format "Updating %s... " (abbreviate-file-name dir))
1921 (format "Retrieving tag into %s... "
1922 (abbreviate-file-name dir)))))
1923 (message "%s" msg)
1924 (vc-call-backend (vc-responsible-backend dir)
1925 'retrieve-tag dir name update)
1926 (message "%s" (concat msg "done"))))
1928 ;; Miscellaneous other entry points
1930 ;; FIXME: this should be a defcustom
1931 ;; FIXME: maybe add another choice:
1932 ;; `root-directory' (or somesuch), which would mean show a short log
1933 ;; for the root directory.
1934 (defvar vc-log-short-style '(directory)
1935 "Whether or not to show a short log.
1936 If it contains `directory' then if the fileset contains a directory show a short log.
1937 If it contains `file' then show short logs for files.
1938 Not all VC backends support short logs!")
1940 (defvar log-view-vc-backend)
1941 (defvar log-view-vc-fileset)
1943 (defun vc-print-log-setup-buttons (working-revision is-start-revision limit pl-return)
1944 (when (and limit (not (eq 'limit-unsupported pl-return))
1945 (not is-start-revision))
1946 (goto-char (point-max))
1947 (lexical-let ((working-revision working-revision)
1948 (limit limit))
1949 (widget-create 'push-button
1950 :notify (lambda (&rest ignore)
1951 (vc-print-log-internal
1952 log-view-vc-backend log-view-vc-fileset
1953 working-revision nil (* 2 limit)))
1954 :help-echo "Show the log again, and double the number of log entries shown"
1955 "Show 2X entries")
1956 (widget-insert " ")
1957 (widget-create 'push-button
1958 :notify (lambda (&rest ignore)
1959 (vc-print-log-internal
1960 log-view-vc-backend log-view-vc-fileset
1961 working-revision nil nil))
1962 :help-echo "Show the log again, showing all entries"
1963 "Show unlimited entries"))
1964 (widget-setup)))
1966 (defun vc-print-log-internal (backend files working-revision
1967 &optional is-start-revision limit)
1968 ;; Don't switch to the output buffer before running the command,
1969 ;; so that any buffer-local settings in the vc-controlled
1970 ;; buffer can be accessed by the command.
1971 (let ((dir-present nil)
1972 (vc-short-log nil)
1973 (buffer-name "*vc-change-log*")
1974 type
1975 pl-return)
1976 (dolist (file files)
1977 (when (file-directory-p file)
1978 (setq dir-present t)))
1979 (setq vc-short-log
1980 (not (null (if dir-present
1981 (memq 'directory vc-log-short-style)
1982 (memq 'file vc-log-short-style)))))
1983 (setq type (if vc-short-log 'short 'long))
1984 (lexical-let
1985 ((working-revision working-revision)
1986 (limit limit)
1987 (shortlog vc-short-log)
1988 (is-start-revision is-start-revision))
1989 (vc-log-internal-common
1990 backend buffer-name files type
1991 (lambda (bk buf type-arg files-arg)
1992 (vc-call-backend bk 'print-log files-arg buf
1993 shortlog (when is-start-revision working-revision) limit))
1994 (lambda (bk files-arg ret)
1995 (vc-print-log-setup-buttons working-revision
1996 is-start-revision limit ret))
1997 (lambda (bk)
1998 (vc-call-backend bk 'show-log-entry working-revision))))))
2000 (defvar vc-log-view-type nil
2001 "Set this to differentiate the different types of logs.")
2002 (put 'vc-log-view-type 'permanent-local t)
2004 (defun vc-log-internal-common (backend
2005 buffer-name
2006 files
2007 type
2008 backend-func
2009 setup-buttons-func
2010 goto-location-func)
2011 (let (retval)
2012 (with-current-buffer (get-buffer-create buffer-name)
2013 (set (make-local-variable 'vc-log-view-type) type))
2014 (setq retval (funcall backend-func backend buffer-name type files))
2015 (pop-to-buffer buffer-name)
2016 (let ((inhibit-read-only t))
2017 ;; log-view-mode used to be called with inhibit-read-only bound
2018 ;; to t, so let's keep doing it, just in case.
2019 (vc-call-backend backend 'log-view-mode)
2020 (set (make-local-variable 'log-view-vc-backend) backend)
2021 (set (make-local-variable 'log-view-vc-fileset) files))
2022 (vc-exec-after
2023 `(let ((inhibit-read-only t))
2024 (funcall ',setup-buttons-func ',backend ',files ',retval)
2025 (shrink-window-if-larger-than-buffer)
2026 (funcall ',goto-location-func ',backend)
2027 (setq vc-sentinel-movepoint (point))
2028 (set-buffer-modified-p nil)))))
2030 (defun vc-incoming-outgoing-internal (backend remote-location buffer-name type)
2031 (vc-log-internal-common
2032 backend buffer-name nil type
2033 (lexical-let
2034 ((remote-location remote-location))
2035 (lambda (bk buf type-arg files)
2036 (vc-call-backend bk type-arg buf remote-location)))
2037 (lambda (bk files-arg ret))
2038 (lambda (bk)
2039 (goto-char (point-min)))))
2041 ;;;###autoload
2042 (defun vc-print-log (&optional working-revision limit)
2043 "List the change log of the current fileset in a window.
2044 If WORKING-REVISION is non-nil, leave point at that revision.
2045 If LIMIT is non-nil, it should be a number specifying the maximum
2046 number of revisions to show; the default is `vc-log-show-limit'.
2048 When called interactively with a prefix argument, prompt for
2049 WORKING-REVISION and LIMIT."
2050 (interactive
2051 (cond
2052 (current-prefix-arg
2053 (let ((rev (read-from-minibuffer "Log from revision (default: last revision): " nil
2054 nil nil nil))
2055 (lim (string-to-number
2056 (read-from-minibuffer
2057 "Limit display (unlimited: 0): "
2058 (format "%s" vc-log-show-limit)
2059 nil nil nil))))
2060 (when (string= rev "") (setq rev nil))
2061 (when (<= lim 0) (setq lim nil))
2062 (list rev lim)))
2064 (list nil (when (> vc-log-show-limit 0) vc-log-show-limit)))))
2065 (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef
2066 (backend (car vc-fileset))
2067 (files (cadr vc-fileset))
2068 (working-revision (or working-revision (vc-working-revision (car files)))))
2069 (vc-print-log-internal backend files working-revision nil limit)))
2071 ;;;###autoload
2072 (defun vc-print-root-log (&optional limit)
2073 "List the change log for the current VC controlled tree in a window.
2074 If LIMIT is non-nil, it should be a number specifying the maximum
2075 number of revisions to show; the default is `vc-log-show-limit'.
2076 When called interactively with a prefix argument, prompt for LIMIT."
2077 (interactive
2078 (cond
2079 (current-prefix-arg
2080 (let ((lim (string-to-number
2081 (read-from-minibuffer
2082 "Limit display (unlimited: 0): "
2083 (format "%s" vc-log-show-limit)
2084 nil nil nil))))
2085 (when (<= lim 0) (setq lim nil))
2086 (list lim)))
2088 (list (when (> vc-log-show-limit 0) vc-log-show-limit)))))
2089 (let ((backend
2090 (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend)
2091 ((derived-mode-p 'dired-mode) (vc-responsible-backend default-directory))
2092 (vc-mode (vc-backend buffer-file-name))))
2093 rootdir working-revision)
2094 (unless backend
2095 (error "Buffer is not version controlled"))
2096 (setq rootdir (vc-call-backend backend 'root default-directory))
2097 (setq working-revision (vc-working-revision rootdir))
2098 (vc-print-log-internal backend (list rootdir) working-revision nil limit)))
2100 ;;;###autoload
2101 (defun vc-log-incoming (&optional remote-location)
2102 "Show a log of changes that will be received with a pull operation from REMOTE-LOCATION."
2103 (interactive "sRemote location (empty for default): ")
2104 (let ((backend
2105 (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend)
2106 ((derived-mode-p 'dired-mode) (vc-responsible-backend default-directory))
2107 (vc-mode (vc-backend buffer-file-name))))
2108 rootdir working-revision)
2109 (unless backend
2110 (error "Buffer is not version controlled"))
2111 (vc-incoming-outgoing-internal backend remote-location "*vc-incoming*" 'log-incoming)))
2113 ;;;###autoload
2114 (defun vc-log-outgoing (&optional remote-location)
2115 "Show a log of changes that will be sent with a push operation to REMOTE-LOCATION."
2116 (interactive "sRemote location (empty for default): ")
2117 (let ((backend
2118 (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend)
2119 ((derived-mode-p 'dired-mode) (vc-responsible-backend default-directory))
2120 (vc-mode (vc-backend buffer-file-name))))
2121 rootdir working-revision)
2122 (unless backend
2123 (error "Buffer is not version controlled"))
2124 (vc-incoming-outgoing-internal backend remote-location "*vc-outgoing*" 'log-outgoing)))
2126 ;;;###autoload
2127 (defun vc-revert ()
2128 "Revert working copies of the selected fileset to their repository contents.
2129 This asks for confirmation if the buffer contents are not identical
2130 to the working revision (except for keyword expansion)."
2131 (interactive)
2132 (let* ((vc-fileset (vc-deduce-fileset))
2133 (files (cadr vc-fileset)))
2134 ;; If any of the files is visited by the current buffer, make
2135 ;; sure buffer is saved. If the user says `no', abort since
2136 ;; we cannot show the changes and ask for confirmation to
2137 ;; discard them.
2138 (when (or (not files) (memq (buffer-file-name) files))
2139 (vc-buffer-sync nil))
2140 (dolist (file files)
2141 (let ((buf (get-file-buffer file)))
2142 (when (and buf (buffer-modified-p buf))
2143 (error "Please kill or save all modified buffers before reverting")))
2144 (when (vc-up-to-date-p file)
2145 (unless (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file))
2146 (error "Revert canceled"))))
2147 (when (vc-diff-internal vc-allow-async-revert vc-fileset nil nil)
2148 (unless (yes-or-no-p
2149 (format "Discard changes in %s? "
2150 (let ((str (vc-delistify files))
2151 (nfiles (length files)))
2152 (if (< (length str) 50)
2154 (format "%d file%s" nfiles
2155 (if (= nfiles 1) "" "s"))))))
2156 (error "Revert canceled"))
2157 (delete-windows-on "*vc-diff*")
2158 (kill-buffer "*vc-diff*"))
2159 (dolist (file files)
2160 (message "Reverting %s..." (vc-delistify files))
2161 (vc-revert-file file)
2162 (message "Reverting %s...done" (vc-delistify files)))))
2164 ;;;###autoload
2165 (defun vc-rollback ()
2166 "Roll back (remove) the most recent changeset committed to the repository.
2167 This may be either a file-level or a repository-level operation,
2168 depending on the underlying version-control system."
2169 (interactive)
2170 (let* ((vc-fileset (vc-deduce-fileset))
2171 (backend (car vc-fileset))
2172 (files (cadr vc-fileset))
2173 (granularity (vc-call-backend backend 'revision-granularity)))
2174 (unless (vc-find-backend-function backend 'rollback)
2175 (error "Rollback is not supported in %s" backend))
2176 (when (and (not (eq granularity 'repository)) (/= (length files) 1))
2177 (error "Rollback requires a singleton fileset or repository versioning"))
2178 ;; FIXME: latest-on-branch-p should take the fileset.
2179 (when (not (vc-call-backend backend 'latest-on-branch-p (car files)))
2180 (error "Rollback is only possible at the tip revision"))
2181 ;; If any of the files is visited by the current buffer, make
2182 ;; sure buffer is saved. If the user says `no', abort since
2183 ;; we cannot show the changes and ask for confirmation to
2184 ;; discard them.
2185 (when (or (not files) (memq (buffer-file-name) files))
2186 (vc-buffer-sync nil))
2187 (dolist (file files)
2188 (when (buffer-modified-p (get-file-buffer file))
2189 (error "Please kill or save all modified buffers before rollback"))
2190 (when (not (vc-up-to-date-p file))
2191 (error "Please revert all modified workfiles before rollback")))
2192 ;; Accumulate changes associated with the fileset
2193 (vc-setup-buffer "*vc-diff*")
2194 (not-modified)
2195 (message "Finding changes...")
2196 (let* ((tip (vc-working-revision (car files)))
2197 ;; FIXME: `previous-revision' should take the fileset.
2198 (previous (vc-call-backend backend 'previous-revision
2199 (car files) tip)))
2200 (vc-diff-internal nil vc-fileset previous tip))
2201 ;; Display changes
2202 (unless (yes-or-no-p "Discard these revisions? ")
2203 (error "Rollback canceled"))
2204 (delete-windows-on "*vc-diff*")
2205 (kill-buffer"*vc-diff*")
2206 ;; Do the actual reversions
2207 (message "Rolling back %s..." (vc-delistify files))
2208 (with-vc-properties
2209 files
2210 (vc-call-backend backend 'rollback files)
2211 `((vc-state . ,'up-to-date)
2212 (vc-checkout-time . , (nth 5 (file-attributes file)))
2213 (vc-working-revision . nil)))
2214 (dolist (f files) (vc-resynch-buffer f t t))
2215 (message "Rolling back %s...done" (vc-delistify files))))
2217 ;;;###autoload
2218 (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1")
2220 ;;;###autoload
2221 (defun vc-update ()
2222 "Update the current fileset's files to their tip revisions.
2223 For each one that contains no changes, and is not locked, then this simply
2224 replaces the work file with the latest revision on its branch. If the file
2225 contains changes, and the backend supports merging news, then any recent
2226 changes from the current branch are merged into the working file."
2227 (interactive)
2228 (let* ((vc-fileset (vc-deduce-fileset))
2229 (backend (car vc-fileset))
2230 (files (cadr vc-fileset)))
2231 (save-some-buffers ; save buffers visiting files
2232 nil (lambda ()
2233 (and (buffer-modified-p)
2234 (let ((file (buffer-file-name)))
2235 (and file (member file files))))))
2236 (dolist (file files)
2237 (if (vc-up-to-date-p file)
2238 (vc-checkout file nil t)
2239 (if (eq (vc-checkout-model backend (list file)) 'locking)
2240 (if (eq (vc-state file) 'edited)
2241 (error "%s"
2242 (substitute-command-keys
2243 "File is locked--type \\[vc-revert] to discard changes"))
2244 (error "Unexpected file state (%s) -- type %s"
2245 (vc-state file)
2246 (substitute-command-keys
2247 "\\[vc-next-action] to correct")))
2248 (vc-maybe-resolve-conflicts
2249 file (vc-call-backend backend 'merge-news file)))))))
2251 (defun vc-version-backup-file (file &optional rev)
2252 "Return name of backup file for revision REV of FILE.
2253 If version backups should be used for FILE, and there exists
2254 such a backup for REV or the working revision of file, return
2255 its name; otherwise return nil."
2256 (when (vc-call make-version-backups-p file)
2257 (let ((backup-file (vc-version-backup-file-name file rev)))
2258 (if (file-exists-p backup-file)
2259 backup-file
2260 ;; there is no automatic backup, but maybe the user made one manually
2261 (setq backup-file (vc-version-backup-file-name file rev 'manual))
2262 (when (file-exists-p backup-file)
2263 backup-file)))))
2265 (defun vc-revert-file (file)
2266 "Revert FILE back to the repository working revision it was based on."
2267 (with-vc-properties
2268 (list file)
2269 (let ((backup-file (vc-version-backup-file file)))
2270 (when backup-file
2271 (copy-file backup-file file 'ok-if-already-exists 'keep-date)
2272 (vc-delete-automatic-version-backups file))
2273 (vc-call revert file backup-file))
2274 `((vc-state . up-to-date)
2275 (vc-checkout-time . ,(nth 5 (file-attributes file)))))
2276 (vc-resynch-buffer file t t))
2278 ;;;###autoload
2279 (defun vc-switch-backend (file backend)
2280 "Make BACKEND the current version control system for FILE.
2281 FILE must already be registered in BACKEND. The change is not
2282 permanent, only for the current session. This function only changes
2283 VC's perspective on FILE, it does not register or unregister it.
2284 By default, this command cycles through the registered backends.
2285 To get a prompt, use a prefix argument."
2286 (interactive
2287 (list
2288 (or buffer-file-name
2289 (error "There is no version-controlled file in this buffer"))
2290 (let ((crt-bk (vc-backend buffer-file-name))
2291 (backends nil))
2292 (unless crt-bk
2293 (error "File %s is not under version control" buffer-file-name))
2294 ;; Find the registered backends.
2295 (dolist (crt vc-handled-backends)
2296 (when (and (vc-call-backend crt 'registered buffer-file-name)
2297 (not (eq crt-bk crt)))
2298 (push crt backends)))
2299 ;; Find the next backend.
2300 (let ((def (car backends))
2301 (others backends))
2302 (cond
2303 ((null others) (error "No other backend to switch to"))
2304 (current-prefix-arg
2305 (intern
2306 (upcase
2307 (completing-read
2308 (format "Switch to backend [%s]: " def)
2309 (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends)
2310 nil t nil nil (downcase (symbol-name def))))))
2311 (t def))))))
2312 (unless (eq backend (vc-backend file))
2313 (vc-file-clearprops file)
2314 (vc-file-setprop file 'vc-backend backend)
2315 ;; Force recomputation of the state
2316 (unless (vc-call-backend backend 'registered file)
2317 (vc-file-clearprops file)
2318 (error "%s is not registered in %s" file backend))
2319 (vc-mode-line file)))
2321 ;;;###autoload
2322 (defun vc-transfer-file (file new-backend)
2323 "Transfer FILE to another version control system NEW-BACKEND.
2324 If NEW-BACKEND has a higher precedence than FILE's current backend
2325 \(i.e. it comes earlier in `vc-handled-backends'), then register FILE in
2326 NEW-BACKEND, using the revision number from the current backend as the
2327 base level. If NEW-BACKEND has a lower precedence than the current
2328 backend, then commit all changes that were made under the current
2329 backend to NEW-BACKEND, and unregister FILE from the current backend.
2330 \(If FILE is not yet registered under NEW-BACKEND, register it.)"
2331 (let* ((old-backend (vc-backend file))
2332 (edited (memq (vc-state file) '(edited needs-merge)))
2333 (registered (vc-call-backend new-backend 'registered file))
2334 (move
2335 (and registered ; Never move if not registered in new-backend yet.
2336 ;; move if new-backend comes later in vc-handled-backends
2337 (or (memq new-backend (memq old-backend vc-handled-backends))
2338 (y-or-n-p "Final transfer? "))))
2339 (comment nil))
2340 (when (eq old-backend new-backend)
2341 (error "%s is the current backend of %s" new-backend file))
2342 (if registered
2343 (set-file-modes file (logior (file-modes file) 128))
2344 ;; `registered' might have switched under us.
2345 (vc-switch-backend file old-backend)
2346 (let* ((rev (vc-working-revision file))
2347 (modified-file (and edited (make-temp-file file)))
2348 (unmodified-file (and modified-file (vc-version-backup-file file))))
2349 ;; Go back to the base unmodified file.
2350 (unwind-protect
2351 (progn
2352 (when modified-file
2353 (copy-file file modified-file 'ok-if-already-exists)
2354 ;; If we have a local copy of the unmodified file, handle that
2355 ;; here and not in vc-revert-file because we don't want to
2356 ;; delete that copy -- it is still useful for OLD-BACKEND.
2357 (if unmodified-file
2358 (copy-file unmodified-file file
2359 'ok-if-already-exists 'keep-date)
2360 (when (y-or-n-p "Get base revision from repository? ")
2361 (vc-revert-file file))))
2362 (vc-call-backend new-backend 'receive-file file rev))
2363 (when modified-file
2364 (vc-switch-backend file new-backend)
2365 (unless (eq (vc-checkout-model new-backend (list file)) 'implicit)
2366 (vc-checkout file t nil))
2367 (rename-file modified-file file 'ok-if-already-exists)
2368 (vc-file-setprop file 'vc-checkout-time nil)))))
2369 (when move
2370 (vc-switch-backend file old-backend)
2371 (setq comment (vc-call-backend old-backend 'comment-history file))
2372 (vc-call-backend old-backend 'unregister file))
2373 (vc-switch-backend file new-backend)
2374 (when (or move edited)
2375 (vc-file-setprop file 'vc-state 'edited)
2376 (vc-mode-line file new-backend)
2377 (vc-checkin file new-backend nil comment (stringp comment)))))
2379 (defun vc-rename-master (oldmaster newfile templates)
2380 "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES."
2381 (let* ((dir (file-name-directory (expand-file-name oldmaster)))
2382 (newdir (or (file-name-directory newfile) ""))
2383 (newbase (file-name-nondirectory newfile))
2384 (masters
2385 ;; List of potential master files for `newfile'
2386 (mapcar
2387 (lambda (s) (vc-possible-master s newdir newbase))
2388 templates)))
2389 (when (or (file-symlink-p oldmaster)
2390 (file-symlink-p (file-name-directory oldmaster)))
2391 (error "This is unsafe in the presence of symbolic links"))
2392 (rename-file
2393 oldmaster
2394 (catch 'found
2395 ;; If possible, keep the master file in the same directory.
2396 (dolist (f masters)
2397 (when (and f (string= (file-name-directory (expand-file-name f)) dir))
2398 (throw 'found f)))
2399 ;; If not, just use the first possible place.
2400 (dolist (f masters)
2401 (and f (or (not (setq dir (file-name-directory f)))
2402 (file-directory-p dir))
2403 (throw 'found f)))
2404 (error "New file lacks a version control directory")))))
2406 ;;;###autoload
2407 (defun vc-delete-file (file)
2408 "Delete file and mark it as such in the version control system."
2409 (interactive "fVC delete file: ")
2410 (setq file (expand-file-name file))
2411 (let ((buf (get-file-buffer file))
2412 (backend (vc-backend file)))
2413 (unless backend
2414 (error "File %s is not under version control"
2415 (file-name-nondirectory file)))
2416 (unless (vc-find-backend-function backend 'delete-file)
2417 (error "Deleting files under %s is not supported in VC" backend))
2418 (when (and buf (buffer-modified-p buf))
2419 (error "Please save or undo your changes before deleting %s" file))
2420 (let ((state (vc-state file)))
2421 (when (eq state 'edited)
2422 (error "Please commit or undo your changes before deleting %s" file))
2423 (when (eq state 'conflict)
2424 (error "Please resolve the conflicts before deleting %s" file)))
2425 (unless (y-or-n-p (format "Really want to delete %s? "
2426 (file-name-nondirectory file)))
2427 (error "Abort!"))
2428 (unless (or (file-directory-p file) (null make-backup-files)
2429 (not (file-exists-p file)))
2430 (with-current-buffer (or buf (find-file-noselect file))
2431 (let ((backup-inhibited nil))
2432 (backup-buffer))))
2433 ;; Bind `default-directory' so that the command that the backend
2434 ;; runs to remove the file is invoked in the correct context.
2435 (let ((default-directory (file-name-directory file)))
2436 (vc-call-backend backend 'delete-file file))
2437 ;; If the backend hasn't deleted the file itself, let's do it for him.
2438 (when (file-exists-p file) (delete-file file))
2439 ;; Forget what VC knew about the file.
2440 (vc-file-clearprops file)
2441 ;; Make sure the buffer is deleted and the *vc-dir* buffers are
2442 ;; updated after this.
2443 (vc-resynch-buffer file nil t)))
2445 ;;;###autoload
2446 (defun vc-rename-file (old new)
2447 "Rename file OLD to NEW in both work area and repository."
2448 (interactive "fVC rename file: \nFRename to: ")
2449 ;; in CL I would have said (setq new (merge-pathnames new old))
2450 (let ((old-base (file-name-nondirectory old)))
2451 (when (and (not (string= "" old-base))
2452 (string= "" (file-name-nondirectory new)))
2453 (setq new (concat new old-base))))
2454 (let ((oldbuf (get-file-buffer old)))
2455 (when (and oldbuf (buffer-modified-p oldbuf))
2456 (error "Please save files before moving them"))
2457 (when (get-file-buffer new)
2458 (error "Already editing new file name"))
2459 (when (file-exists-p new)
2460 (error "New file already exists"))
2461 (let ((state (vc-state old)))
2462 (unless (memq state '(up-to-date edited))
2463 (error "Please %s files before moving them"
2464 (if (stringp state) "check in" "update"))))
2465 (vc-call rename-file old new)
2466 (vc-file-clearprops old)
2467 ;; Move the actual file (unless the backend did it already)
2468 (when (file-exists-p old) (rename-file old new))
2469 ;; ?? Renaming a file might change its contents due to keyword expansion.
2470 ;; We should really check out a new copy if the old copy was precisely equal
2471 ;; to some checked-in revision. However, testing for this is tricky....
2472 (when oldbuf
2473 (with-current-buffer oldbuf
2474 (let ((buffer-read-only buffer-read-only))
2475 (set-visited-file-name new))
2476 (vc-mode-line new (vc-backend new))
2477 (set-buffer-modified-p nil)))))
2479 ;;;###autoload
2480 (defun vc-update-change-log (&rest args)
2481 "Find change log file and add entries from recent version control logs.
2482 Normally, find log entries for all registered files in the default
2483 directory.
2485 With prefix arg of \\[universal-argument], only find log entries for the current buffer's file.
2487 With any numeric prefix arg, find log entries for all currently visited
2488 files that are under version control. This puts all the entries in the
2489 log for the default directory, which may not be appropriate.
2491 From a program, any ARGS are assumed to be filenames for which
2492 log entries should be gathered."
2493 (interactive
2494 (cond ((consp current-prefix-arg) ;C-u
2495 (list buffer-file-name))
2496 (current-prefix-arg ;Numeric argument.
2497 (let ((files nil)
2498 (buffers (buffer-list))
2499 file)
2500 (while buffers
2501 (setq file (buffer-file-name (car buffers)))
2502 (and file (vc-backend file)
2503 (setq files (cons file files)))
2504 (setq buffers (cdr buffers)))
2505 files))
2507 ;; Don't supply any filenames to backend; this means
2508 ;; it should find all relevant files relative to
2509 ;; the default-directory.
2510 nil)))
2511 (vc-call-backend (vc-responsible-backend default-directory)
2512 'update-changelog args))
2514 ;; functions that operate on RCS revision numbers. This code should
2515 ;; also be moved into the backends. It stays for now, however, since
2516 ;; it is used in code below.
2517 (defun vc-branch-p (rev)
2518 "Return t if REV is a branch revision."
2519 (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev))))
2521 ;;;###autoload
2522 (defun vc-branch-part (rev)
2523 "Return the branch part of a revision number REV."
2524 (let ((index (string-match "\\.[0-9]+\\'" rev)))
2525 (when index
2526 (substring rev 0 index))))
2528 (define-obsolete-function-alias
2529 'vc-default-previous-version 'vc-default-previous-revision "23.1")
2531 (defun vc-default-responsible-p (backend file)
2532 "Indicate whether BACKEND is reponsible for FILE.
2533 The default is to return nil always."
2534 nil)
2536 (defun vc-default-could-register (backend file)
2537 "Return non-nil if BACKEND could be used to register FILE.
2538 The default implementation returns t for all files."
2541 (defun vc-default-latest-on-branch-p (backend file)
2542 "Return non-nil if FILE is the latest on its branch.
2543 This default implementation always returns non-nil, which means that
2544 editing non-current revisions is not supported by default."
2547 (defun vc-default-init-revision (backend) vc-default-init-revision)
2549 (defun vc-default-find-revision (backend file rev buffer)
2550 "Provide the new `find-revision' op based on the old `checkout' op.
2551 This is only for compatibility with old backends. They should be updated
2552 to provide the `find-revision' operation instead."
2553 (let ((tmpfile (make-temp-file (expand-file-name file))))
2554 (unwind-protect
2555 (progn
2556 (vc-call-backend backend 'checkout file nil rev tmpfile)
2557 (with-current-buffer buffer
2558 (insert-file-contents-literally tmpfile)))
2559 (delete-file tmpfile))))
2561 (defun vc-default-rename-file (backend old new)
2562 (condition-case nil
2563 (add-name-to-file old new)
2564 (error (rename-file old new)))
2565 (vc-delete-file old)
2566 (with-current-buffer (find-file-noselect new)
2567 (vc-register)))
2569 (defalias 'vc-default-check-headers 'ignore)
2571 (declare-function log-edit-mode "log-edit" ())
2573 (defun vc-default-log-edit-mode (backend) (log-edit-mode))
2575 (defun vc-default-log-view-mode (backend) (log-view-mode))
2577 (defun vc-default-show-log-entry (backend rev)
2578 (with-no-warnings
2579 (log-view-goto-rev rev)))
2581 (defun vc-default-comment-history (backend file)
2582 "Return a string with all log entries stored in BACKEND for FILE."
2583 (when (vc-find-backend-function backend 'print-log)
2584 (with-current-buffer "*vc*"
2585 (vc-call-backend backend 'print-log (list file))
2586 (buffer-string))))
2588 (defun vc-default-receive-file (backend file rev)
2589 "Let BACKEND receive FILE from another version control system."
2590 (vc-call-backend backend 'register (list file) rev ""))
2592 (defun vc-default-retrieve-tag (backend dir name update)
2593 (if (string= name "")
2594 (progn
2595 (vc-file-tree-walk
2597 (lambda (f) (and
2598 (vc-up-to-date-p f)
2599 (vc-error-occurred
2600 (vc-call-backend backend 'checkout f nil "")
2601 (when update (vc-resynch-buffer f t t)))))))
2602 (let ((result (vc-tag-precondition dir)))
2603 (if (stringp result)
2604 (error "File %s is locked" result)
2605 (setq update (and (eq result 'visited) update))
2606 (vc-file-tree-walk
2608 (lambda (f) (vc-error-occurred
2609 (vc-call-backend backend 'checkout f nil name)
2610 (when update (vc-resynch-buffer f t t)))))))))
2612 (defun vc-default-revert (backend file contents-done)
2613 (unless contents-done
2614 (let ((rev (vc-working-revision file))
2615 (file-buffer (or (get-file-buffer file) (current-buffer))))
2616 (message "Checking out %s..." file)
2617 (let ((failed t)
2618 (backup-name (car (find-backup-file-name file))))
2619 (when backup-name
2620 (copy-file file backup-name 'ok-if-already-exists 'keep-date)
2621 (unless (file-writable-p file)
2622 (set-file-modes file (logior (file-modes file) 128))))
2623 (unwind-protect
2624 (let ((coding-system-for-read 'no-conversion)
2625 (coding-system-for-write 'no-conversion))
2626 (with-temp-file file
2627 (let ((outbuf (current-buffer)))
2628 ;; Change buffer to get local value of vc-checkout-switches.
2629 (with-current-buffer file-buffer
2630 (let ((default-directory (file-name-directory file)))
2631 (vc-call-backend backend 'find-revision
2632 file rev outbuf)))))
2633 (setq failed nil))
2634 (when backup-name
2635 (if failed
2636 (rename-file backup-name file 'ok-if-already-exists)
2637 (and (not vc-make-backup-files) (delete-file backup-name))))))
2638 (message "Checking out %s...done" file))))
2640 (defalias 'vc-default-revision-completion-table 'ignore)
2641 (defalias 'vc-default-mark-resolved 'ignore)
2643 (defun vc-default-dir-status-files (backend dir files default-state update-function)
2644 (funcall update-function
2645 (mapcar (lambda (file) (list file default-state)) files)))
2647 (defun vc-check-headers ()
2648 "Check if the current file has any headers in it."
2649 (interactive)
2650 (vc-call-backend (vc-backend buffer-file-name) 'check-headers))
2654 ;; These things should probably be generally available
2656 (defun vc-string-prefix-p (prefix string)
2657 (let ((lpref (length prefix)))
2658 (and (>= (length string) lpref)
2659 (eq t (compare-strings prefix nil nil string nil lpref)))))
2661 (defun vc-file-tree-walk (dirname func &rest args)
2662 "Walk recursively through DIRNAME.
2663 Invoke FUNC f ARGS on each VC-managed file f underneath it."
2664 (vc-file-tree-walk-internal (expand-file-name dirname) func args)
2665 (message "Traversing directory %s...done" dirname))
2667 (defun vc-file-tree-walk-internal (file func args)
2668 (if (not (file-directory-p file))
2669 (when (vc-backend file) (apply func file args))
2670 (message "Traversing directory %s..." (abbreviate-file-name file))
2671 (let ((dir (file-name-as-directory file)))
2672 (mapcar
2673 (lambda (f) (or
2674 (string-equal f ".")
2675 (string-equal f "..")
2676 (member f vc-directory-exclusion-list)
2677 (let ((dirf (expand-file-name f dir)))
2679 (file-symlink-p dirf) ;; Avoid possible loops.
2680 (vc-file-tree-walk-internal dirf func args)))))
2681 (directory-files dir)))))
2683 (provide 'vc)
2685 ;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6
2686 ;;; vc.el ends here