Mercurial > emacs
annotate lisp/vc.el @ 78876:6824f67c5a37
(file-name-sans-versions): Also allow `A-Z'.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 22 Sep 2007 17:52:17 +0000 |
parents | 2568254b40a4 |
children | 5b5c69b10c65 5039706521c9 |
rev | line source |
---|---|
33564
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
1 ;;; vc.el --- drive a version-control system from within Emacs |
904 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, |
75347 | 4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
904 | 5 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
6 ;; Author: FSF (see below for full credits) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
39117 | 8 ;; Keywords: tools |
904 | 9 |
56952
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
10 ;; $Id$ |
32093
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
11 |
904 | 12 ;; This file is part of GNU Emacs. |
13 | |
14 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
15 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78158
diff
changeset
|
16 ;; the Free Software Foundation; either version 3, or (at your option) |
904 | 17 ;; any later version. |
18 | |
19 ;; GNU Emacs is distributed in the hope that it will be useful, | |
20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
14169 | 25 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 26 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
27 ;; Boston, MA 02110-1301, USA. | |
904 | 28 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
29 ;;; Credits: |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
30 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
31 ;; VC was initially designed and implemented by Eric S. Raymond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
32 ;; <esr@snark.thyrsus.com>. Over the years, many people have |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
33 ;; contributed substantial amounts of work to VC. These include: |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
34 ;; Per Cederqvist <ceder@lysator.liu.se> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
35 ;; Paul Eggert <eggert@twinsun.com> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
36 ;; Sebastian Kremer <sk@thp.uni-koeln.de> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
37 ;; Martin Lorentzson <martinl@gnu.org> |
32910 | 38 ;; Dave Love <fx@gnu.org> |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
39 ;; Stefan Monnier <monnier@cs.yale.edu> |
41071 | 40 ;; J.D. Smith <jdsmith@alum.mit.edu> |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
41 ;; Andre Spiegel <spiegel@gnu.org> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
42 ;; Richard Stallman <rms@gnu.org> |
41071 | 43 ;; Thien-Thi Nguyen <ttn@gnu.org> |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
44 |
904 | 45 ;;; Commentary: |
46 | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
47 ;; This mode is fully documented in the Emacs user's manual. |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
48 ;; |
78875
2568254b40a4
Mention all supported VC backends.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78822
diff
changeset
|
49 ;; Supported version-control systems presently include CVS, RCS, GNU |
2568254b40a4
Mention all supported VC backends.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78822
diff
changeset
|
50 ;; Arch, Subversion, Bzr, Git, Mercurial, Meta-CVS, Monotone and SCCS |
2568254b40a4
Mention all supported VC backends.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78822
diff
changeset
|
51 ;; (or its free replacement, CSSC). |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
52 ;; |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
53 ;; Some features will not work with old RCS versions. Where |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
54 ;; appropriate, VC finds out which version you have, and allows or |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
55 ;; disallows those features (stealing locks, for example, works only |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
56 ;; from 5.6.2 onwards). |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
57 ;; Even initial checkins will fail if your RCS version is so old that ci |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
58 ;; doesn't understand -t-; this has been known to happen to people running |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
59 ;; NExTSTEP 3.0. |
904 | 60 ;; |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
61 ;; You can support the RCS -x option by customizing vc-rcs-master-templates. |
904 | 62 ;; |
63 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
64 ;; to be installed somewhere on Emacs's path for executables. | |
65 ;; | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
66 ;; If your site uses the ChangeLog convention supported by Emacs, the |
51369
91b1fb194872
(vc-directory-exclusion-list): Add MCVS and .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51245
diff
changeset
|
67 ;; function log-edit-comment-to-change-log could prove a useful checkin hook, |
91b1fb194872
(vc-directory-exclusion-list): Add MCVS and .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51245
diff
changeset
|
68 ;; although you might prefer to use C-c C-a (i.e. log-edit-insert-changelog) |
91b1fb194872
(vc-directory-exclusion-list): Add MCVS and .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51245
diff
changeset
|
69 ;; from the commit buffer instead or to set `log-edit-setup-invert'. |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
70 ;; |
904 | 71 ;; The vc code maintains some internal state in order to reduce expensive |
72 ;; version-control operations to a minimum. Some names are only computed | |
62610
4f2f430bf7c3
(vc-trunk-p): Add autoload cookie. The function is used in vc-rcs.el
André Spiegel <spiegel@gnu.org>
parents:
61705
diff
changeset
|
73 ;; once. If you perform version control operations with the backend while |
904 | 74 ;; vc's back is turned, or move/rename master files while vc is running, |
75 ;; vc may get seriously confused. Don't do these things! | |
76 ;; | |
77 ;; Developer's notes on some concurrency issues are included at the end of | |
78 ;; the file. | |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
79 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
80 ;; ADDING SUPPORT FOR OTHER BACKENDS |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
81 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
82 ;; VC can use arbitrary version control systems as a backend. To add |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
83 ;; support for a new backend named SYS, write a library vc-sys.el that |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
84 ;; contains functions of the form `vc-sys-...' (note that SYS is in lower |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
85 ;; case for the function and library names). VC will use that library if |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
86 ;; you put the symbol SYS somewhere into the list of |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
87 ;; `vc-handled-backends'. Then, for example, if `vc-sys-registered' |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
88 ;; returns non-nil for a file, all SYS-specific versions of VC commands |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
89 ;; will be available for that file. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
90 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
91 ;; VC keeps some per-file information in the form of properties (see |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
92 ;; vc-file-set/getprop in vc-hooks.el). The backend-specific functions |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
93 ;; do not generally need to be aware of these properties. For example, |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
94 ;; `vc-sys-workfile-version' should compute the workfile version and |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
95 ;; return it; it should not look it up in the property, and it needn't |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
96 ;; store it there either. However, if a backend-specific function does |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
97 ;; store a value in a property, that value takes precedence over any |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
98 ;; value that the generic code might want to set (check for uses of |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
99 ;; the macro `with-vc-properties' in vc.el). |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
100 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
101 ;; In the list of functions below, each identifier needs to be prepended |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
102 ;; with `vc-sys-'. Some of the functions are mandatory (marked with a |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
103 ;; `*'), others are optional (`-'). |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
104 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
105 ;; STATE-QUERYING FUNCTIONS |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
106 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
107 ;; * registered (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
108 ;; |
78085
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
109 ;; Return non-nil if FILE is registered in this backend. Both this |
78158
8dcc6f809d32
Add more info about the vc-registered function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78085
diff
changeset
|
110 ;; function as well as `state' should be careful to fail gracefully |
8dcc6f809d32
Add more info about the vc-registered function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78085
diff
changeset
|
111 ;; in the event that the backend executable is absent. It is |
8dcc6f809d32
Add more info about the vc-registered function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78085
diff
changeset
|
112 ;; preferable that this function's body is autoloaded, that way only |
8dcc6f809d32
Add more info about the vc-registered function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78085
diff
changeset
|
113 ;; calling vc-registered does not cause the backend to be loaded |
8dcc6f809d32
Add more info about the vc-registered function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78085
diff
changeset
|
114 ;; (all the vc-FOO-registered functions are called to try to find |
8dcc6f809d32
Add more info about the vc-registered function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78085
diff
changeset
|
115 ;; the controlling backend for FILE. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
116 ;; |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
117 ;; * state (file) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
118 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
119 ;; Return the current version control state of FILE. For a list of |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
120 ;; possible values, see `vc-state'. This function should do a full and |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
121 ;; reliable state computation; it is usually called immediately after |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
122 ;; C-x v v. If you want to use a faster heuristic when visiting a |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
123 ;; file, put that into `state-heuristic' below. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
124 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
125 ;; - state-heuristic (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
126 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
127 ;; If provided, this function is used to estimate the version control |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
128 ;; state of FILE at visiting time. It should be considerably faster |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
129 ;; than the implementation of `state'. For a list of possible values, |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
130 ;; see the doc string of `vc-state'. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
131 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
132 ;; - dir-state (dir) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
133 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
134 ;; If provided, this function is used to find the version control state |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
135 ;; of all files in DIR in a fast way. The function should not return |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
136 ;; anything, but rather store the files' states into the corresponding |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
137 ;; `vc-state' properties. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
138 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
139 ;; * workfile-version (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
140 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
141 ;; Return the current workfile version of FILE. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
142 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
143 ;; - latest-on-branch-p (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
144 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
145 ;; Return non-nil if the current workfile version of FILE is the latest |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
146 ;; on its branch. The default implementation always returns t, which |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
147 ;; means that working with non-current versions is not supported by |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
148 ;; default. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
149 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
150 ;; * checkout-model (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
151 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
152 ;; Indicate whether FILE needs to be "checked out" before it can be |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
153 ;; edited. See `vc-checkout-model' for a list of possible values. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
154 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
155 ;; - workfile-unchanged-p (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
156 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
157 ;; Return non-nil if FILE is unchanged from its current workfile |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
158 ;; version. This function should do a brief comparison of FILE's |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
159 ;; contents with those of the master version. If the backend does not |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
160 ;; have such a brief-comparison feature, the default implementation of |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
161 ;; this function can be used, which delegates to a full |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
162 ;; vc-BACKEND-diff. (Note that vc-BACKEND-diff must not run |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
163 ;; asynchronously in this case, see variable `vc-disable-async-diff'.) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
164 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
165 ;; - mode-line-string (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
166 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
167 ;; If provided, this function should return the VC-specific mode line |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
168 ;; string for FILE. The default implementation deals well with all |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
169 ;; states that `vc-state' can return. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
170 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
171 ;; - dired-state-info (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
172 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
173 ;; Translate the `vc-state' property of FILE into a string that can be |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
174 ;; used in a vc-dired buffer. The default implementation deals well |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
175 ;; with all states that `vc-state' can return. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
176 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
177 ;; STATE-CHANGING FUNCTIONS |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
178 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
179 ;; * register (file &optional rev comment) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
180 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
181 ;; Register FILE in this backend. Optionally, an initial revision REV |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
182 ;; and an initial description of the file, COMMENT, may be specified. |
40440
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
183 ;; The implementation should pass the value of vc-register-switches |
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
184 ;; to the backend command. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
185 ;; |
43450
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
186 ;; - init-version (file) |
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
187 ;; |
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
188 ;; The initial version to use when registering FILE if one is not |
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
189 ;; specified by the user. If not provided, the variable |
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
190 ;; vc-default-init-version is used instead. |
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
191 ;; |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
192 ;; - responsible-p (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
193 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
194 ;; Return non-nil if this backend considers itself "responsible" for |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
195 ;; FILE, which can also be a directory. This function is used to find |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
196 ;; out what backend to use for registration of new files and for things |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
197 ;; like change log generation. The default implementation always |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
198 ;; returns nil. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
199 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
200 ;; - could-register (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
201 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
202 ;; Return non-nil if FILE could be registered under this backend. The |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
203 ;; default implementation always returns t. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
204 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
205 ;; - receive-file (file rev) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
206 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
207 ;; Let this backend "receive" a file that is already registered under |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
208 ;; another backend. The default implementation simply calls `register' |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
209 ;; for FILE, but it can be overridden to do something more specific, |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
210 ;; e.g. keep revision numbers consistent or choose editing modes for |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
211 ;; FILE that resemble those of the other backend. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
212 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
213 ;; - unregister (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
214 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
215 ;; Unregister FILE from this backend. This is only needed if this |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
216 ;; backend may be used as a "more local" backend for temporary editing. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
217 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
218 ;; * checkin (file rev comment) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
219 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
220 ;; Commit changes in FILE to this backend. If REV is non-nil, that |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
221 ;; should become the new revision number. COMMENT is used as a |
40440
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
222 ;; check-in comment. The implementation should pass the value of |
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
223 ;; vc-checkin-switches to the backend command. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
224 ;; |
47796
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
225 ;; * find-version (file rev buffer) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
226 ;; |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
227 ;; Fetch revision REV of file FILE and put it into BUFFER. |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
228 ;; If REV is the empty string, fetch the head of the trunk. |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
229 ;; The implementation should pass the value of vc-checkout-switches |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
230 ;; to the backend command. |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
231 ;; |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
232 ;; * checkout (file &optional editable rev) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
233 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
234 ;; Check out revision REV of FILE into the working area. If EDITABLE |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
235 ;; is non-nil, FILE should be writable by the user and if locking is |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
236 ;; used for FILE, a lock should also be set. If REV is non-nil, that |
48964
7bba5b5ff0d2
(vc-next-action-on-file): Use t argument to vc-checkout in
André Spiegel <spiegel@gnu.org>
parents:
48142
diff
changeset
|
237 ;; is the revision to check out (default is current workfile version). |
7bba5b5ff0d2
(vc-next-action-on-file): Use t argument to vc-checkout in
André Spiegel <spiegel@gnu.org>
parents:
48142
diff
changeset
|
238 ;; If REV is t, that means to check out the head of the current branch; |
7bba5b5ff0d2
(vc-next-action-on-file): Use t argument to vc-checkout in
André Spiegel <spiegel@gnu.org>
parents:
48142
diff
changeset
|
239 ;; if it is the empty string, check out the head of the trunk. |
7bba5b5ff0d2
(vc-next-action-on-file): Use t argument to vc-checkout in
André Spiegel <spiegel@gnu.org>
parents:
48142
diff
changeset
|
240 ;; The implementation should pass the value of vc-checkout-switches |
47796
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
241 ;; to the backend command. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
242 ;; |
39000
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
243 ;; * revert (file &optional contents-done) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
244 ;; |
39000
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
245 ;; Revert FILE back to the current workfile version. If optional |
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
246 ;; arg CONTENTS-DONE is non-nil, then the contents of FILE have |
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
247 ;; already been reverted from a version backup, and this function |
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
248 ;; only needs to update the status of FILE within the backend. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
249 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
250 ;; - cancel-version (file editable) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
251 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
252 ;; Cancel the current workfile version of FILE, i.e. remove it from the |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
253 ;; master. EDITABLE non-nil means that FILE should be writable |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
254 ;; afterwards, and if locking is used for FILE, then a lock should also |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
255 ;; be set. If this function is not provided, trying to cancel a |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
256 ;; version is caught as an error. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
257 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
258 ;; - merge (file rev1 rev2) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
259 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
260 ;; Merge the changes between REV1 and REV2 into the current working file. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
261 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
262 ;; - merge-news (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
263 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
264 ;; Merge recent changes from the current branch into FILE. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
265 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
266 ;; - steal-lock (file &optional version) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
267 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
268 ;; Steal any lock on the current workfile version of FILE, or on |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
269 ;; VERSION if that is provided. This function is only needed if |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
270 ;; locking is used for files under this backend, and if files can |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
271 ;; indeed be locked by other users. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
272 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
273 ;; HISTORY FUNCTIONS |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
274 ;; |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
275 ;; * print-log (file &optional buffer) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
276 ;; |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
277 ;; Insert the revision log of FILE into BUFFER, or the *vc* buffer |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
278 ;; if BUFFER is nil. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
279 ;; |
78085
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
280 ;; - log-view-mode () |
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
281 ;; |
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
282 ;; Mode to use for the output of print-log. This defaults to |
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
283 ;; `log-view-mode' and is expected to be changed (if at all) to a derived |
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
284 ;; mode of `log-view-mode'. |
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
285 ;; |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
286 ;; - show-log-entry (version) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
287 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
288 ;; If provided, search the log entry for VERSION in the current buffer, |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
289 ;; and make sure it is displayed in the buffer's window. The default |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
290 ;; implementation of this function works for RCS-style logs. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
291 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
292 ;; - wash-log (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
293 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
294 ;; Remove all non-comment information from the output of print-log. The |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
295 ;; default implementation of this function works for RCS-style logs. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
296 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
297 ;; - logentry-check () |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
298 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
299 ;; If defined, this function is run to find out whether the user |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
300 ;; entered a valid log entry for check-in. The log entry is in the |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
301 ;; current buffer, and if it is not a valid one, the function should |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
302 ;; throw an error. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
303 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
304 ;; - comment-history (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
305 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
306 ;; Return a string containing all log entries that were made for FILE. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
307 ;; This is used for transferring a file from one backend to another, |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
308 ;; retaining comment information. The default implementation of this |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
309 ;; function does this by calling print-log and then wash-log, and |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
310 ;; returning the resulting buffer contents as a string. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
311 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
312 ;; - update-changelog (files) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
313 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
314 ;; Using recent log entries, create ChangeLog entries for FILES, or for |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
315 ;; all files at or below the default-directory if FILES is nil. The |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
316 ;; default implementation runs rcs2log, which handles RCS- and |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
317 ;; CVS-style logs. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
318 ;; |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
319 ;; * diff (file &optional rev1 rev2 buffer) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
320 ;; |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
321 ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
322 ;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
323 ;; from REV1 to REV2. If REV1 is nil, use the current workfile |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
324 ;; version (as found in the repository) as the older version; if |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
325 ;; REV2 is nil, use the current workfile contents as the newer |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
326 ;; version. This function should pass the value of (vc-switches |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
327 ;; BACKEND 'diff) to the backend command. It should return a status |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
328 ;; of either 0 (no differences found), or 1 (either non-empty diff |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
329 ;; or the diff is run asynchronously). |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
330 ;; |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
331 ;; - revision-completion-table (file) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
332 ;; |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
333 ;; Return a completion table for existing revisions of FILE. |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
334 ;; The default is to not use any completion table. |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
335 ;; |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
336 ;; - diff-tree (dir &optional rev1 rev2) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
337 ;; |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
338 ;; Insert the diff for all files at and below DIR into the *vc-diff* |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
339 ;; buffer. The meaning of REV1 and REV2 is the same as for |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
340 ;; vc-BACKEND-diff. The default implementation does an explicit tree |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
341 ;; walk, calling vc-BACKEND-diff for each individual file. |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
342 ;; |
58321
f398ebfc07e2
Update annotation-related comments.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57906
diff
changeset
|
343 ;; - annotate-command (file buf &optional rev) |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
344 ;; |
58321
f398ebfc07e2
Update annotation-related comments.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57906
diff
changeset
|
345 ;; If this function is provided, it should produce an annotated display |
f398ebfc07e2
Update annotation-related comments.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57906
diff
changeset
|
346 ;; of FILE in BUF, relative to version REV. Annotation means each line |
f398ebfc07e2
Update annotation-related comments.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57906
diff
changeset
|
347 ;; of FILE displayed is prefixed with version information associated with |
f398ebfc07e2
Update annotation-related comments.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57906
diff
changeset
|
348 ;; its addition (deleted lines leave no history) and that the text of the |
f398ebfc07e2
Update annotation-related comments.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57906
diff
changeset
|
349 ;; file is fontified according to age. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
350 ;; |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
351 ;; - annotate-time () |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
352 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
353 ;; Only required if `annotate-command' is defined for the backend. |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
354 ;; Return the time of the next line of annotation at or after point, |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
355 ;; as a floating point fractional number of days. The helper |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
356 ;; function `vc-annotate-convert-time' may be useful for converting |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
357 ;; multi-part times as returned by `current-time' and `encode-time' |
42205 | 358 ;; to this format. Return nil if no more lines of annotation appear |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
359 ;; in the buffer. You can safely assume that point is placed at the |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
360 ;; beginning of each line, starting at `point-min'. The buffer that |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
361 ;; point is placed in is the Annotate output, as defined by the |
57114
deddb5e7acc3
(annotate-time): Document point handling.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56952
diff
changeset
|
362 ;; relevant backend. This function also affects how much of the line |
deddb5e7acc3
(annotate-time): Document point handling.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56952
diff
changeset
|
363 ;; is fontified; where it leaves point is where fontification begins. |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
364 ;; |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
365 ;; - annotate-current-time () |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
366 ;; |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
367 ;; Only required if `annotate-command' is defined for the backend, |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
368 ;; AND you'd like the current time considered to be anything besides |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
369 ;; (vs-annotate-convert-time (current-time)) -- i.e. the current |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
370 ;; time with hours, minutes, and seconds included. Probably safe to |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
371 ;; ignore. Return the current-time, in units of fractional days. |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
372 ;; |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
373 ;; - annotate-extract-revision-at-line () |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
374 ;; |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
375 ;; Only required if `annotate-command' is defined for the backend. |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
376 ;; Invoked from a buffer in vc-annotate-mode, return the revision |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
377 ;; corresponding to the current line, or nil if there is no revision |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
378 ;; corresponding to the current line. |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
379 ;; |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
380 ;; SNAPSHOT SYSTEM |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
381 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
382 ;; - create-snapshot (dir name branchp) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
383 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
384 ;; Take a snapshot of the current state of files under DIR and name it |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
385 ;; NAME. This should make sure that files are up-to-date before |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
386 ;; proceeding with the action. DIR can also be a file and if BRANCHP |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
387 ;; is specified, NAME should be created as a branch and DIR should be |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
388 ;; checked out under this new branch. The default implementation does |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
389 ;; not support branches but does a sanity check, a tree traversal and |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
390 ;; for each file calls `assign-name'. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
391 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
392 ;; - assign-name (file name) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
393 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
394 ;; Give name NAME to the current version of FILE, assuming it is |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
395 ;; up-to-date. Only used by the default version of `create-snapshot'. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
396 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
397 ;; - retrieve-snapshot (dir name update) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
398 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
399 ;; Retrieve a named snapshot of all registered files at or below DIR. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
400 ;; If UPDATE is non-nil, then update buffers of any files in the |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
401 ;; snapshot that are currently visited. The default implementation |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
402 ;; does a sanity check whether there aren't any uncommitted changes at |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
403 ;; or below DIR, and then performs a tree walk, using the `checkout' |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
404 ;; function to retrieve the corresponding versions. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
405 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
406 ;; MISCELLANEOUS |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
407 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
408 ;; - make-version-backups-p (file) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
409 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
410 ;; Return non-nil if unmodified repository versions of FILE should be |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
411 ;; backed up locally. If this is done, VC can perform `diff' and |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
412 ;; `revert' operations itself, without calling the backend system. The |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
413 ;; default implementation always returns nil. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
414 ;; |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
415 ;; - repository-hostname (dirname) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
416 ;; |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
417 ;; Return the hostname that the backend will have to contact |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
418 ;; in order to operate on a file in DIRNAME. If the return value |
56952
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
419 ;; is nil, it means that the repository is local. |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
420 ;; This function is used in `vc-stay-local-p' which backends can use |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
421 ;; for their convenience. |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
422 ;; |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
423 ;; - previous-version (file rev) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
424 ;; |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
425 ;; Return the version number that precedes REV for FILE, or nil if no such |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
426 ;; version exists. |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
427 ;; |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
428 ;; - next-version (file rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
429 ;; |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
430 ;; Return the version number that follows REV for FILE, or nil if no such |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
431 ;; version exists. |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
432 ;; |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
433 ;; - check-headers () |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
434 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
435 ;; Return non-nil if the current buffer contains any version headers. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
436 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
437 ;; - clear-headers () |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
438 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
439 ;; In the current buffer, reset all version headers to their unexpanded |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
440 ;; form. This function should be provided if the state-querying code |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
441 ;; for this backend uses the version headers to determine the state of |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
442 ;; a file. This function will then be called whenever VC changes the |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
443 ;; version control state in such a way that the headers would give |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
444 ;; wrong information. |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
445 ;; |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
446 ;; - delete-file (file) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
447 ;; |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
448 ;; Delete FILE and mark it as deleted in the repository. If this |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
449 ;; function is not provided, the command `vc-delete-file' will |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
450 ;; signal an error. |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
451 ;; |
35199
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
452 ;; - rename-file (old new) |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
453 ;; |
aa38d1de35cb
Added documentation for backend interface.
André Spiegel <spiegel@gnu.org>
parents:
35131
diff
changeset
|
454 ;; Rename file OLD to NEW, both in the working area and in the |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
455 ;; repository. If this function is not provided, the renaming |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
456 ;; will be done by (vc-delete-file old) and (vc-register new). |
51627
1329f6a6c949
(vc-rename-file): Fix typo.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51369
diff
changeset
|
457 ;; |
54398
2decd50569f3
Document new find-file-hook operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53874
diff
changeset
|
458 ;; - find-file-hook () |
2decd50569f3
Document new find-file-hook operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53874
diff
changeset
|
459 ;; |
54530
b217df9a35e0
Document new backend operation `find-file-not-found-hook'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54463
diff
changeset
|
460 ;; Operation called in current buffer when opening a file. This can |
54398
2decd50569f3
Document new find-file-hook operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53874
diff
changeset
|
461 ;; be used by the backend to setup some local variables it might need. |
54530
b217df9a35e0
Document new backend operation `find-file-not-found-hook'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54463
diff
changeset
|
462 ; |
b217df9a35e0
Document new backend operation `find-file-not-found-hook'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54463
diff
changeset
|
463 ;; - find-file-not-found-hook () |
b217df9a35e0
Document new backend operation `find-file-not-found-hook'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54463
diff
changeset
|
464 ;; |
b217df9a35e0
Document new backend operation `find-file-not-found-hook'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54463
diff
changeset
|
465 ;; Operation called in current buffer when opening a non-existing file. |
b217df9a35e0
Document new backend operation `find-file-not-found-hook'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54463
diff
changeset
|
466 ;; By default, this asks the user if she wants to check out the file. |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
467 ;; |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
468 ;; - extra-menu () |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
469 ;; |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
470 ;; Return a menu keymap, the items in the keymap will appear at the |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
471 ;; end of the Version Control menu. The goal is to allow backends |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
472 ;; to specify extra menu items that appear in the VC menu. This way |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
473 ;; you can provide menu entries for functionality that is specific |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
474 ;; to your backend and which does not map to any of the VC generic |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78599
diff
changeset
|
475 ;; concepts. |
904 | 476 |
477 ;;; Code: | |
478 | |
479 (require 'vc-hooks) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
480 (require 'ring) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
481 (eval-when-compile |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
482 (require 'cl) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
483 (require 'compile) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
484 (require 'dired) ; for dired-map-over-marks macro |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
485 (require 'dired-aux)) ; for dired-kill-{line,tree} |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
486 |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
487 (if (not (assoc 'vc-parent-buffer minor-mode-alist)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
488 (setq minor-mode-alist |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
489 (cons '(vc-parent-buffer vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
490 minor-mode-alist))) |
904 | 491 |
492 ;; General customization | |
493 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
494 (defgroup vc nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
495 "Version-control system in Emacs." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
496 :group 'tools) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
497 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
498 (defcustom vc-suppress-confirm nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
499 "If non-nil, treat user as expert; suppress yes-no prompts on some things." |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
500 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
501 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
502 |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
503 (defcustom vc-delete-logbuf-window t |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
504 "If non-nil, delete the *VC-log* buffer and window after each logical action. |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
505 If nil, bury that buffer instead. |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
506 This is most useful if you have multiple windows on a frame and would like to |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
507 preserve the setting." |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
508 :type 'boolean |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
509 :group 'vc) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
510 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
511 (defcustom vc-initial-comment nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
512 "If non-nil, prompt for initial comment when a file is registered." |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
513 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
514 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
515 |
20988
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
516 (defcustom vc-default-init-version "1.1" |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
517 "A string used as the default version number when a new file is registered. |
43450
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
518 This can be overridden by giving a prefix argument to \\[vc-register]. This |
2b50b9c69fde
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42548
diff
changeset
|
519 can also be overridden by a particular VC backend." |
20988
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
520 :type 'string |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21560
diff
changeset
|
521 :group 'vc |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21560
diff
changeset
|
522 :version "20.3") |
20988
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
523 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
524 (defcustom vc-command-messages nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
525 "If non-nil, display run messages from back-end commands." |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
526 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
527 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
528 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
529 (defcustom vc-checkin-switches nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
530 "A string or list of strings specifying extra switches for checkin. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
531 These are passed to the checkin program by \\[vc-checkin]." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
532 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
533 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
534 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
535 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
536 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
537 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
538 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
539 (defcustom vc-checkout-switches nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
540 "A string or list of strings specifying extra switches for checkout. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
541 These are passed to the checkout program by \\[vc-checkout]." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
542 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
543 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
544 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
545 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
546 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
547 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
548 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
549 (defcustom vc-register-switches nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
550 "A string or list of strings; extra switches for registering a file. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
551 These are passed to the checkin program by \\[vc-register]." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
552 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
553 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
554 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
555 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
556 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
557 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
558 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
559 (defcustom vc-dired-listing-switches "-al" |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
560 "Switches passed to `ls' for vc-dired. MUST contain the `l' option." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
561 :type 'string |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
562 :group 'vc |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
563 :version "21.1") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
564 |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
565 (defcustom vc-dired-recurse t |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
566 "If non-nil, show directory trees recursively in VC Dired." |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
567 :type 'boolean |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
568 :group 'vc |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
569 :version "20.3") |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
570 |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
571 (defcustom vc-dired-terse-display t |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
572 "If non-nil, show only locked files in VC Dired." |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
573 :type 'boolean |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
574 :group 'vc |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
575 :version "20.3") |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
576 |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
577 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
578 ".git" ".hg" "{arch}") |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
579 "List of directory names to be ignored when walking directory trees." |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
580 :type '(repeat string) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
581 :group 'vc) |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
582 |
35820
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
583 (defcustom vc-diff-switches nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
584 "A string or list of strings specifying switches for diff under VC. |
40181
55d912b5d0cc
(vc-diff-switches): Doc rewritten.
André Spiegel <spiegel@gnu.org>
parents:
40170
diff
changeset
|
585 When running diff under a given BACKEND, VC concatenates the values of |
55d912b5d0cc
(vc-diff-switches): Doc rewritten.
André Spiegel <spiegel@gnu.org>
parents:
40170
diff
changeset
|
586 `diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to |
55d912b5d0cc
(vc-diff-switches): Doc rewritten.
André Spiegel <spiegel@gnu.org>
parents:
40170
diff
changeset
|
587 get the switches for that command. Thus, `vc-diff-switches' should |
55d912b5d0cc
(vc-diff-switches): Doc rewritten.
André Spiegel <spiegel@gnu.org>
parents:
40170
diff
changeset
|
588 contain switches that are specific to version control, but not |
55d912b5d0cc
(vc-diff-switches): Doc rewritten.
André Spiegel <spiegel@gnu.org>
parents:
40170
diff
changeset
|
589 specific to any particular backend." |
35820
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
590 :type '(choice (const :tag "None" nil) |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
591 (string :tag "Argument String") |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
592 (repeat :tag "Argument List" |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
593 :value ("") |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
594 string)) |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
595 :group 'vc |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
596 :version "21.1") |
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
597 |
71446
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
598 (defcustom vc-diff-knows-L nil |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
599 "*Indicates whether diff understands the -L option. |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
600 The value is either `yes', `no', or nil. If it is nil, VC tries |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
601 to use -L and sets this variable to remember whether it worked." |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
602 :type '(choice (const :tag "Work out" nil) (const yes) (const no)) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
603 :group 'vc) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
604 |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
605 (defcustom vc-allow-async-revert nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
606 "Specifies whether the diff during \\[vc-revert-buffer] may be asynchronous. |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
607 Enabling this option means that you can confirm a revert operation even |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
608 if the local changes in the file have not been found and displayed yet." |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
609 :type '(choice (const :tag "No" nil) |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
610 (const :tag "Yes" t)) |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
611 :group 'vc |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59442
diff
changeset
|
612 :version "22.1") |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
613 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
614 ;;;###autoload |
38606
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
615 (defcustom vc-checkout-hook nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
616 "Normal hook (list of functions) run after checking out a file. |
38606
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
617 See `run-hooks'." |
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
618 :type 'hook |
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
619 :group 'vc |
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
620 :version "21.1") |
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
621 |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
622 (defcustom vc-annotate-display-mode 'fullscale |
41071 | 623 "Which mode to color the output of \\[vc-annotate] with by default." |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
624 :type '(choice (const :tag "By Color Map Range" nil) |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
625 (const :tag "Scale to Oldest" scale) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
626 (const :tag "Scale Oldest->Newest" fullscale) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
627 (number :tag "Specify Fractional Number of Days" |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
628 :value "20.5")) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
629 :group 'vc) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
630 |
38606
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
631 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
632 (defcustom vc-checkin-hook nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
633 "Normal hook (list of functions) run after a checkin is done. |
51369
91b1fb194872
(vc-directory-exclusion-list): Add MCVS and .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51245
diff
changeset
|
634 See also `log-edit-done-hook'." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
635 :type 'hook |
51369
91b1fb194872
(vc-directory-exclusion-list): Add MCVS and .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51245
diff
changeset
|
636 :options '(log-edit-comment-to-change-log) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
637 :group 'vc) |
2705
b4587e7ff4e5
(diff-switches): Define var here as well as in diff.el.
Richard M. Stallman <rms@gnu.org>
parents:
2692
diff
changeset
|
638 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
639 ;;;###autoload |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
640 (defcustom vc-before-checkin-hook nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
641 "Normal hook (list of functions) run before a file is checked in. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
642 See `run-hooks'." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
643 :type 'hook |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
644 :group 'vc) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
645 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
646 (defcustom vc-logentry-check-hook nil |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
647 "Normal hook run by `vc-backend-logentry-check'. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
648 Use this to impose your own rules on the entry in addition to any the |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
649 version control backend imposes itself." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
650 :type 'hook |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
651 :group 'vc) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
652 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
653 ;; Annotate customization |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
654 (defcustom vc-annotate-color-map |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
655 (if (and (tty-display-color-p) (<= (display-color-cells) 8)) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
656 ;; A custom sorted TTY colormap |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
657 (let* ((colors |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
658 (sort |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
659 (delq nil |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
660 (mapcar (lambda (x) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
661 (if (not (or |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
662 (string-equal (car x) "white") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
663 (string-equal (car x) "black") )) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
664 (car x))) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
665 (tty-color-alist))) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
666 (lambda (a b) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
667 (cond |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
668 ((or (string-equal a "red") (string-equal b "blue")) t) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
669 ((or (string-equal b "red") (string-equal a "blue")) nil) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
670 ((string-equal a "yellow") t) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
671 ((string-equal b "yellow") nil) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
672 ((string-equal a "cyan") t) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
673 ((string-equal b "cyan") nil) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
674 ((string-equal a "green") t) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
675 ((string-equal b "green") nil) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
676 ((string-equal a "magenta") t) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
677 ((string-equal b "magenta") nil) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
678 (t (string< a b)))))) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
679 (date 20.) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
680 (delta (/ (- 360. date) (1- (length colors))))) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
681 (mapcar (lambda (x) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
682 (prog1 |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
683 (cons date x) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
684 (setq date (+ date delta)))) colors)) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
685 ;; Normal colormap: hue stepped from 0-240deg, value=1., saturation=0.75 |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
686 '(( 20. . "#FF3F3F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
687 ( 40. . "#FF6C3F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
688 ( 60. . "#FF993F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
689 ( 80. . "#FFC63F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
690 (100. . "#FFF33F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
691 (120. . "#DDFF3F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
692 (140. . "#B0FF3F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
693 (160. . "#83FF3F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
694 (180. . "#56FF3F") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
695 (200. . "#3FFF56") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
696 (220. . "#3FFF83") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
697 (240. . "#3FFFB0") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
698 (260. . "#3FFFDD") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
699 (280. . "#3FF3FF") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
700 (300. . "#3FC6FF") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
701 (320. . "#3F99FF") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
702 (340. . "#3F6CFF") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
703 (360. . "#3F3FFF"))) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
704 "Association list of age versus color, for \\[vc-annotate]. |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
705 Ages are given in units of fractional days. Default is eighteen |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
706 steps using a twenty day increment, from red to blue. For TTY |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
707 displays with 8 or fewer colors, the default is red to blue with |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
708 all other colors between (excluding black and white)." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
709 :type 'alist |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
710 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
711 |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
712 (defcustom vc-annotate-very-old-color "#3F3FFF" |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
713 "Color for lines older than the current color range in \\[vc-annotate]]." |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
714 :type 'string |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
715 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
716 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
717 (defcustom vc-annotate-background "black" |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
718 "Background color for \\[vc-annotate]. |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
719 Default color is used if nil." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
720 :type 'string |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
721 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
722 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
723 (defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
724 "Menu elements for the mode-specific menu of VC-Annotate mode. |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
725 List of factors, used to expand/compress the time scale. See `vc-annotate'." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
726 :type '(repeat number) |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
727 :group 'vc) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
728 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
729 (defvar vc-annotate-mode-map |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
730 (let ((m (make-sparse-keymap))) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
731 (define-key m "A" 'vc-annotate-revision-previous-to-line) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
732 (define-key m "D" 'vc-annotate-show-diff-revision-at-line) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
733 (define-key m "J" 'vc-annotate-revision-at-line) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
734 (define-key m "L" 'vc-annotate-show-log-revision-at-line) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
735 (define-key m "N" 'vc-annotate-next-version) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
736 (define-key m "P" 'vc-annotate-prev-version) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
737 (define-key m "W" 'vc-annotate-workfile-version) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
738 m) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
739 "Local keymap used for VC-Annotate mode.") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
740 |
904 | 741 ;; Header-insertion hair |
742 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
743 (defcustom vc-static-header-alist |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
744 '(("\\.c\\'" . |
904 | 745 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
746 "*Associate static header string templates with file types. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
747 A \%s in the template is replaced with the first string associated with |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
748 the file's version control type in `vc-header-alist'." |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
749 :type '(repeat (cons :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
750 (regexp :tag "File Type") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
751 (string :tag "Header String"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
752 :group 'vc) |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
753 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
754 (defcustom vc-comment-alist |
904 | 755 '((nroff-mode ".\\\"" "")) |
41071 | 756 "*Special comment delimiters for generating VC headers. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
757 Add an entry in this list if you need to override the normal `comment-start' |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
758 and `comment-end' variables. This will only be necessary if the mode language |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
759 is sensitive to blank lines." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
760 :type '(repeat (list :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
761 (symbol :tag "Mode") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
762 (string :tag "Comment Start") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
763 (string :tag "Comment End"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
764 :group 'vc) |
904 | 765 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
766 (defcustom vc-checkout-carefully (= (user-uid) 0) |
49619
b48f8839a782
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
Juanma Barranquero <lekktu@gmail.com>
parents:
49597
diff
changeset
|
767 "*Non-nil means be extra-careful in checkout. |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
768 Verify that the file really is not locked |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
769 and that its contents match what the master file says." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
770 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
771 :group 'vc) |
49619
b48f8839a782
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
Juanma Barranquero <lekktu@gmail.com>
parents:
49597
diff
changeset
|
772 (make-obsolete-variable 'vc-checkout-carefully |
b48f8839a782
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
Juanma Barranquero <lekktu@gmail.com>
parents:
49597
diff
changeset
|
773 "the corresponding checks are always done now." |
b48f8839a782
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
Juanma Barranquero <lekktu@gmail.com>
parents:
49597
diff
changeset
|
774 "21.1") |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
775 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
776 |
904 | 777 ;; Variables the user doesn't need to know about. |
778 (defvar vc-log-operation nil) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
779 (defvar vc-log-after-operation-hook nil) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
780 |
8350 | 781 ;; In a log entry buffer, this is a local variable |
782 ;; that points to the buffer for which it was made | |
783 ;; (either a file, or a VC dired buffer). | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
784 (defvar vc-parent-buffer nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
785 (put 'vc-parent-buffer 'permanent-local t) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
786 (defvar vc-parent-buffer-name nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
787 (put 'vc-parent-buffer-name 'permanent-local t) |
904 | 788 |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
789 (defvar vc-disable-async-diff nil |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
790 "VC sets this to t locally to disable some async diff operations. |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
791 Backends that offer asynchronous diffs should respect this variable |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
792 in their implementation of vc-BACKEND-diff.") |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
793 |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
794 (defvar vc-log-file) |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
795 (defvar vc-log-version) |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
796 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
797 (defvar vc-dired-mode nil) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
798 (make-variable-buffer-local 'vc-dired-mode) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
799 |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
800 ;; functions that operate on RCS revision numbers. This code should |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
801 ;; also be moved into the backends. It stays for now, however, since |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
802 ;; it is used in code below. |
62610
4f2f430bf7c3
(vc-trunk-p): Add autoload cookie. The function is used in vc-rcs.el
André Spiegel <spiegel@gnu.org>
parents:
61705
diff
changeset
|
803 ;;;###autoload |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
804 (defun vc-trunk-p (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
805 "Return t if REV is a revision on the trunk." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
806 (not (eq nil (string-match "\\`[0-9]+\\.[0-9]+\\'" rev)))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
807 |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
808 (defun vc-branch-p (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
809 "Return t if REV is a branch revision." |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
810 (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
811 |
43744
5c8c45f534eb
(vc-branch-part): Add autoload cookie. This function can
Gerd Moellmann <gerd@gnu.org>
parents:
43725
diff
changeset
|
812 ;;;###autoload |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
813 (defun vc-branch-part (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
814 "Return the branch part of a revision number REV." |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
815 (let ((index (string-match "\\.[0-9]+\\'" rev))) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
816 (if index |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
817 (substring rev 0 index)))) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
818 |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
819 (defun vc-minor-part (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
820 "Return the minor version number of a revision number REV." |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
821 (string-match "[0-9]+\\'" rev) |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
822 (substring rev (match-beginning 0) (match-end 0))) |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
823 |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
824 (defun vc-default-previous-version (backend file rev) |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
825 "Return the version number immediately preceding REV for FILE, |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
826 or nil if there is no previous version. This default |
67578
f8a3e13c32d7
(vc-default-previous-version, vc-default-next-version)
Richard M. Stallman <rms@gnu.org>
parents:
67574
diff
changeset
|
827 implementation works for MAJOR.MINOR-style version numbers as |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
828 used by RCS and CVS." |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
829 (let ((branch (vc-branch-part rev)) |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
830 (minor-num (string-to-number (vc-minor-part rev)))) |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
831 (when branch |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
832 (if (> minor-num 1) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
833 ;; version does probably not start a branch or release |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
834 (concat branch "." (number-to-string (1- minor-num))) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
835 (if (vc-trunk-p rev) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
836 ;; we are at the beginning of the trunk -- |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
837 ;; don't know anything to return here |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
838 nil |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
839 ;; we are at the beginning of a branch -- |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
840 ;; return version of starting point |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
841 (vc-branch-part branch)))))) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
842 |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
843 (defun vc-default-next-version (backend file rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
844 "Return the version number immediately following REV for FILE, |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
845 or nil if there is no next version. This default implementation |
67578
f8a3e13c32d7
(vc-default-previous-version, vc-default-next-version)
Richard M. Stallman <rms@gnu.org>
parents:
67574
diff
changeset
|
846 works for MAJOR.MINOR-style version numbers as used by RCS |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
847 and CVS." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
848 (when (not (string= rev (vc-workfile-version file))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
849 (let ((branch (vc-branch-part rev)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
850 (minor-num (string-to-number (vc-minor-part rev)))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
851 (concat branch "." (number-to-string (1+ minor-num)))))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
852 |
904 | 853 ;; File property caching |
854 | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
855 (defun vc-clear-context () |
51064
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
856 "Clear all cached file properties." |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
857 (interactive) |
51064
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
858 (fillarray vc-file-prop-obarray 0)) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
859 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
860 (defmacro with-vc-properties (file form settings) |
41071 | 861 "Execute FORM, then maybe set per-file properties for FILE. |
862 SETTINGS is an association list of property/value pairs. After | |
863 executing FORM, set those properties from SETTINGS that have not yet | |
864 been updated to their corresponding values." | |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
865 (declare (debug t)) |
41395
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
866 `(let ((vc-touched-properties (list t))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
867 ,form |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
868 (mapcar (lambda (setting) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
869 (let ((property (car setting))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
870 (unless (memq property vc-touched-properties) |
41395
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
871 (put (intern ,file vc-file-prop-obarray) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
872 property (cdr setting))))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
873 ,settings))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
874 |
904 | 875 ;; Random helper functions |
876 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
877 (defsubst vc-editable-p (file) |
41071 | 878 "Return non-nil if FILE can be edited." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
879 (or (eq (vc-checkout-model file) 'implicit) |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
880 (memq (vc-state file) '(edited needs-merge)))) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
881 |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
882 ;; Two macros for elisp programming |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
883 ;;;###autoload |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
884 (defmacro with-vc-file (file comment &rest body) |
41071 | 885 "Check out a writable copy of FILE if necessary, then execute BODY. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
886 Check in FILE with COMMENT (a string) after BODY has been executed. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
887 FILE is passed through `expand-file-name'; BODY executed within |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
888 `save-excursion'. If FILE is not under version control, or locked by |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
889 somebody else, signal error." |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
890 (declare (debug t) (indent 2)) |
41395
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
891 (let ((filevar (make-symbol "file"))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
892 `(let ((,filevar (expand-file-name ,file))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
893 (or (vc-backend ,filevar) |
53874
978c77351d66
(with-vc-file): Fix unsafe uses of error.
Andreas Schwab <schwab@suse.de>
parents:
53839
diff
changeset
|
894 (error "File not under version control: `%s'" file)) |
41395
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
895 (unless (vc-editable-p ,filevar) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
896 (let ((state (vc-state ,filevar))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
897 (if (stringp state) |
53874
978c77351d66
(with-vc-file): Fix unsafe uses of error.
Andreas Schwab <schwab@suse.de>
parents:
53839
diff
changeset
|
898 (error "`%s' is locking `%s'" state ,filevar) |
41395
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
899 (vc-checkout ,filevar t)))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
900 (save-excursion |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
901 ,@body) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
902 (vc-checkin ,filevar nil ,comment)))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
903 |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
904 ;;;###autoload |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
905 (defmacro edit-vc-file (file comment &rest body) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
906 "Edit FILE under version control, executing body. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
907 Checkin with COMMENT after executing BODY. |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
908 This macro uses `with-vc-file', passing args to it. |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
909 However, before executing BODY, find FILE, and after BODY, save buffer." |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
910 (declare (debug t) (indent 2)) |
41395
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
911 (let ((filevar (make-symbol "file"))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
912 `(let ((,filevar (expand-file-name ,file))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
913 (with-vc-file |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
914 ,filevar ,comment |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
915 (set-buffer (find-file-noselect ,filevar)) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
916 ,@body |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
917 (save-buffer))))) |
0abfca935c80
(with-vc-properties): Don't bind `filename' locally.
André Spiegel <spiegel@gnu.org>
parents:
41071
diff
changeset
|
918 |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
919 (defun vc-ensure-vc-buffer () |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
920 "Make sure that the current buffer visits a version-controlled file." |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
921 (if vc-dired-mode |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
922 (set-buffer (find-file-noselect (dired-get-filename))) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
923 (while vc-parent-buffer |
69943
7d69833e0c1a
(vc-ensure-vc-buffer): Only change current-buffer, not the window config.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69939
diff
changeset
|
924 (set-buffer vc-parent-buffer)) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
925 (if (not buffer-file-name) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
926 (error "Buffer %s is not associated with a file" (buffer-name)) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
927 (if (not (vc-backend buffer-file-name)) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
928 (error "File %s is not under version control" buffer-file-name))))) |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
929 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
930 (defun vc-process-filter (p s) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
931 "An alternative output filter for async process P. |
71228
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
932 One difference with the default filter is that this inserts S after markers. |
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
933 Another is that undo information is not kept." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
934 (with-current-buffer (process-buffer p) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
935 (save-excursion |
71228
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
936 (let ((buffer-undo-list t) |
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
937 (inhibit-read-only t)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
938 (goto-char (process-mark p)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
939 (insert s) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
940 (set-marker (process-mark p) (point)))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
941 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
942 (defun vc-setup-buffer (&optional buf) |
41071 | 943 "Prepare BUF for executing a VC command and make it current. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
944 BUF defaults to \"*vc*\", can be a string and will be created if necessary." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
945 (unless buf (setq buf "*vc*")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
946 (let ((camefrom (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
947 (olddir default-directory)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
948 (set-buffer (get-buffer-create buf)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
949 (kill-all-local-variables) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
950 (set (make-local-variable 'vc-parent-buffer) camefrom) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
951 (set (make-local-variable 'vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
952 (concat " from " (buffer-name camefrom))) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
953 (setq default-directory olddir) |
71228
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
954 (let ((buffer-undo-list t) |
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
955 (inhibit-read-only t)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
956 (erase-buffer)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
957 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
958 (defun vc-exec-after (code) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
959 "Eval CODE when the current buffer's process is done. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
960 If the current buffer has no process, just evaluate CODE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
961 Else, add CODE to the process' sentinel." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
962 (let ((proc (get-buffer-process (current-buffer)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
963 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
964 ;; If there's no background process, just execute the code. |
71791
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
965 ;; We used to explicitly call delete-process on exited processes, |
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
966 ;; but this led to timing problems causing process output to be |
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
967 ;; lost. Terminated processes get deleted automatically |
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
968 ;; anyway. -- cyd |
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
969 ((or (null proc) (eq (process-status proc) 'exit)) |
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
970 (eval code)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
971 ;; If a process is running, add CODE to the sentinel |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
972 ((eq (process-status proc) 'run) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
973 (let ((sentinel (process-sentinel proc))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
974 (set-process-sentinel proc |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
975 `(lambda (p s) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
976 (with-current-buffer ',(current-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
977 (goto-char (process-mark p)) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
978 ,@(append (cdr (cdr (cdr ;strip off `with-current-buffer buf |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
979 ; (goto-char...)' |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
980 (car (cdr (cdr ;strip off `lambda (p s)' |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
981 sentinel)))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
982 (list `(vc-exec-after ',code)))))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
983 (t (error "Unexpected process state")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
984 nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
985 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
986 (defvar vc-post-command-functions nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
987 "Hook run at the end of `vc-do-command'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
988 Each function is called inside the buffer in which the command was run |
41071 | 989 and is passed 3 arguments: the COMMAND, the FILE and the FLAGS.") |
1674
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
990 |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
991 (defvar w32-quote-process-args) |
38442
086300440396
(vc-do-command): Autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38374
diff
changeset
|
992 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
993 (defun vc-do-command (buffer okstatus command file &rest flags) |
41071 | 994 "Execute a VC command, notifying user and checking for errors. |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
995 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
996 current buffer if BUFFER is t. If the destination buffer is not |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
997 already current, set it up properly and erase it. The command is |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
998 considered successful if its exit status does not exceed OKSTATUS (if |
67578
f8a3e13c32d7
(vc-default-previous-version, vc-default-next-version)
Richard M. Stallman <rms@gnu.org>
parents:
67574
diff
changeset
|
999 OKSTATUS is nil, that means to ignore error status, if it is `async', that |
67552
91dadacfc1d5
(vc-do-command): Add a new value t for okstatus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66569
diff
changeset
|
1000 means not to wait for termination of the subprocess; if it is t it means to |
91dadacfc1d5
(vc-do-command): Add a new value t for okstatus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66569
diff
changeset
|
1001 ignore all execution errors). FILE is the |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1002 name of the working file (may also be nil, to execute commands that |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1003 don't expect a file name). If an optional list of FLAGS is present, |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1004 that is inserted into the command line before the filename." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1005 (and file (setq file (expand-file-name file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1006 (if vc-command-messages |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1007 (message "Running %s on %s..." command file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1008 (save-current-buffer |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1009 (unless (or (eq buffer t) |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1010 (and (stringp buffer) |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1011 (string= (buffer-name) buffer)) |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1012 (eq buffer (current-buffer))) |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1013 (vc-setup-buffer buffer)) |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1014 (let ((squeezed (remq nil flags)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1015 (inhibit-read-only t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1016 (status 0)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1017 (when file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1018 ;; FIXME: file-relative-name can return a bogus result because |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1019 ;; it doesn't look at the actual file-system to see if symlinks |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1020 ;; come into play. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1021 (setq squeezed (append squeezed (list (file-relative-name file))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1022 (let ((exec-path (append vc-path exec-path)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1023 ;; Add vc-path to PATH for the execution of this command. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1024 (process-environment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1025 (cons (concat "PATH=" (getenv "PATH") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1026 path-separator |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1027 (mapconcat 'identity vc-path path-separator)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1028 process-environment)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1029 (w32-quote-process-args t)) |
60289
68f16372ee5a
(vc-do-command): Don't run command asynchronously when
Andreas Schwab <schwab@suse.de>
parents:
59996
diff
changeset
|
1030 (if (and (eq okstatus 'async) (file-remote-p default-directory)) |
68f16372ee5a
(vc-do-command): Don't run command asynchronously when
Andreas Schwab <schwab@suse.de>
parents:
59996
diff
changeset
|
1031 ;; start-process does not support remote execution |
68f16372ee5a
(vc-do-command): Don't run command asynchronously when
Andreas Schwab <schwab@suse.de>
parents:
59996
diff
changeset
|
1032 (setq okstatus nil)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1033 (if (eq okstatus 'async) |
61093
27c2765e06c8
(vc-do-command): Use a pipe for async processes, so password
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60289
diff
changeset
|
1034 (let ((proc |
27c2765e06c8
(vc-do-command): Use a pipe for async processes, so password
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60289
diff
changeset
|
1035 (let ((process-connection-type nil)) |
27c2765e06c8
(vc-do-command): Use a pipe for async processes, so password
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60289
diff
changeset
|
1036 (apply 'start-process command (current-buffer) command |
27c2765e06c8
(vc-do-command): Use a pipe for async processes, so password
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60289
diff
changeset
|
1037 squeezed)))) |
33553
840460ecad6f
(vc-do-command): In the asynchronous case, output messages only if the
André Spiegel <spiegel@gnu.org>
parents:
33548
diff
changeset
|
1038 (unless (active-minibuffer-window) |
840460ecad6f
(vc-do-command): In the asynchronous case, output messages only if the
André Spiegel <spiegel@gnu.org>
parents:
33548
diff
changeset
|
1039 (message "Running %s in the background..." command)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1040 ;;(set-process-sentinel proc (lambda (p msg) (delete-process p))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1041 (set-process-filter proc 'vc-process-filter) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1042 (vc-exec-after |
33553
840460ecad6f
(vc-do-command): In the asynchronous case, output messages only if the
André Spiegel <spiegel@gnu.org>
parents:
33548
diff
changeset
|
1043 `(unless (active-minibuffer-window) |
840460ecad6f
(vc-do-command): In the asynchronous case, output messages only if the
André Spiegel <spiegel@gnu.org>
parents:
33548
diff
changeset
|
1044 (message "Running %s in the background... done" ',command)))) |
71228
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
1045 (let ((buffer-undo-list t)) |
4d648a3d282d
(vc-process-filter): Inhibit undo
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70007
diff
changeset
|
1046 (setq status (apply 'process-file command nil t nil squeezed))) |
67552
91dadacfc1d5
(vc-do-command): Add a new value t for okstatus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66569
diff
changeset
|
1047 (when (and (not (eq t okstatus)) |
91dadacfc1d5
(vc-do-command): Add a new value t for okstatus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66569
diff
changeset
|
1048 (or (not (integerp status)) |
91dadacfc1d5
(vc-do-command): Add a new value t for okstatus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66569
diff
changeset
|
1049 (and okstatus (< okstatus status)))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1050 (pop-to-buffer (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1051 (goto-char (point-min)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1052 (shrink-window-if-larger-than-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1053 (error "Running %s...FAILED (%s)" command |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1054 (if (integerp status) (format "status %d" status) status)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1055 (if vc-command-messages |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1056 (message "Running %s...OK" command))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1057 (vc-exec-after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1058 `(run-hook-with-args 'vc-post-command-functions ',command ',file ',flags)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1059 status))) |
904 | 1060 |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1061 (defun vc-position-context (posn) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1062 "Save a bit of the text around POSN in the current buffer. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1063 Used to help us find the corresponding position again later |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1064 if markers are destroyed or corrupted." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1065 ;; A lot of this was shamelessly lifted from Sebastian Kremer's |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1066 ;; rcs.el mode. |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1067 (list posn |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1068 (buffer-size) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1069 (buffer-substring posn |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1070 (min (point-max) (+ posn 100))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1071 |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1072 (defun vc-find-position-by-context (context) |
41071 | 1073 "Return the position of CONTEXT in the current buffer. |
1074 If CONTEXT cannot be found, return nil." | |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1075 (let ((context-string (nth 2 context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1076 (if (equal "" context-string) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1077 (point-max) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1078 (save-excursion |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1079 (let ((diff (- (nth 1 context) (buffer-size)))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1080 (if (< diff 0) (setq diff (- diff))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1081 (goto-char (nth 0 context)) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1082 (if (or (search-forward context-string nil t) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1083 ;; Can't use search-backward since the match may continue |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1084 ;; after point. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1085 (progn (goto-char (- (point) diff (length context-string))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1086 ;; goto-char doesn't signal an error at |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1087 ;; beginning of buffer like backward-char would |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1088 (search-forward context-string nil t))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1089 ;; to beginning of OSTRING |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1090 (- (point) (length context-string)))))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1091 |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1092 (defun vc-context-matches-p (posn context) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1093 "Return t if POSN matches CONTEXT, nil otherwise." |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1094 (let* ((context-string (nth 2 context)) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1095 (len (length context-string)) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1096 (end (+ posn len))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1097 (if (> end (1+ (buffer-size))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1098 nil |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1099 (string= context-string (buffer-substring posn end))))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1100 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1101 (defun vc-buffer-context () |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1102 "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE). |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1103 Used by `vc-restore-buffer-context' to later restore the context." |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1104 (let ((point-context (vc-position-context (point))) |
2041
ccb75415543a
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
1905
diff
changeset
|
1105 ;; Use mark-marker to avoid confusion in transient-mark-mode. |
ccb75415543a
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
1905
diff
changeset
|
1106 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer)) |
ccb75415543a
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
1905
diff
changeset
|
1107 (vc-position-context (mark-marker)))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
1108 ;; Make the right thing happen in transient-mark-mode. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
1109 (mark-active nil) |
56952
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1110 ;; The new compilation code does not use compilation-error-list any |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1111 ;; more, so the code below is now ineffective and might as well |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1112 ;; be disabled. -- Stef |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1113 ;; ;; We may want to reparse the compilation buffer after revert |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1114 ;; (reparse (and (boundp 'compilation-error-list) ;compile loaded |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1115 ;; ;; Construct a list; each elt is nil or a buffer |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78359
diff
changeset
|
1116 ;; ;; if that buffer is a compilation output buffer |
56952
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1117 ;; ;; that contains markers into the current buffer. |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1118 ;; (save-current-buffer |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1119 ;; (mapcar (lambda (buffer) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1120 ;; (set-buffer buffer) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1121 ;; (let ((errors (or |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1122 ;; compilation-old-error-list |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1123 ;; compilation-error-list)) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1124 ;; (buffer-error-marked-p nil)) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1125 ;; (while (and (consp errors) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1126 ;; (not buffer-error-marked-p)) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1127 ;; (and (markerp (cdr (car errors))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1128 ;; (eq buffer |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1129 ;; (marker-buffer |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1130 ;; (cdr (car errors)))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1131 ;; (setq buffer-error-marked-p t)) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1132 ;; (setq errors (cdr errors))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1133 ;; (if buffer-error-marked-p buffer))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1134 ;; (buffer-list))))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1135 (reparse nil)) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1136 (list point-context mark-context reparse))) |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1137 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1138 (defun vc-restore-buffer-context (context) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1139 "Restore point/mark, and reparse any affected compilation buffers. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1140 CONTEXT is that which `vc-buffer-context' returns." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1141 (let ((point-context (nth 0 context)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1142 (mark-context (nth 1 context)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1143 (reparse (nth 2 context))) |
56952
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1144 ;; The new compilation code does not use compilation-error-list any |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1145 ;; more, so the code below is now ineffective and might as well |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1146 ;; be disabled. -- Stef |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1147 ;; ;; Reparse affected compilation buffers. |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1148 ;; (while reparse |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1149 ;; (if (car reparse) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1150 ;; (with-current-buffer (car reparse) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1151 ;; (let ((compilation-last-buffer (current-buffer)) ;select buffer |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1152 ;; ;; Record the position in the compilation buffer of |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1153 ;; ;; the last error next-error went to. |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1154 ;; (error-pos (marker-position |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1155 ;; (car (car-safe compilation-error-list))))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1156 ;; ;; Reparse the error messages as far as they were parsed before. |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1157 ;; (compile-reinitialize-errors '(4) compilation-parsing-end) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1158 ;; ;; Move the pointer up to find the error we were at before |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1159 ;; ;; reparsing. Now next-error should properly go to the next one. |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1160 ;; (while (and compilation-error-list |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1161 ;; (/= error-pos (car (car compilation-error-list)))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1162 ;; (setq compilation-error-list (cdr compilation-error-list)))))) |
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
1163 ;; (setq reparse (cdr reparse))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1164 |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1165 ;; if necessary, restore point and mark |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1166 (if (not (vc-context-matches-p (point) point-context)) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1167 (let ((new-point (vc-find-position-by-context point-context))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1168 (if new-point (goto-char new-point)))) |
21212
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
1169 (and mark-active |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
1170 mark-context |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
1171 (not (vc-context-matches-p (mark) mark-context)) |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
1172 (let ((new-mark (vc-find-position-by-context mark-context))) |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
1173 (if new-mark (set-mark new-mark)))))) |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
1174 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1175 (defun vc-revert-buffer1 (&optional arg no-confirm) |
41071 | 1176 "Revert buffer, keeping point and mark where user expects them. |
1177 Try to be clever in the face of changes due to expanded version control | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1178 key words. This is important for typeahead to work as expected. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1179 ARG and NO-CONFIRM are passed on to `revert-buffer'." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1180 (interactive "P") |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1181 (widen) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1182 (let ((context (vc-buffer-context))) |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1183 ;; Use save-excursion here, because it may be able to restore point |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1184 ;; and mark properly even in cases where vc-restore-buffer-context |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1185 ;; would fail. However, save-excursion might also get it wrong -- |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1186 ;; in this case, vc-restore-buffer-context gives it a second try. |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1187 (save-excursion |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1188 ;; t means don't call normal-mode; |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1189 ;; that's to preserve various minor modes. |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1190 (revert-buffer arg no-confirm t)) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1191 (vc-restore-buffer-context context))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1192 |
904 | 1193 |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1194 (defun vc-buffer-sync (&optional not-urgent) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1195 "Make sure the current buffer and its working file are in sync. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1196 NOT-URGENT means it is ok to continue if the user says not to save." |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
1197 (if (buffer-modified-p) |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1198 (if (or vc-suppress-confirm |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1199 (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name)))) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1200 (save-buffer) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1201 (unless not-urgent |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1202 (error "Aborted"))))) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1203 |
36395
20a768ca0cf8
(vc-default-workfile-unchanged-p, vc-default-latest-on-branch-p): Add
André Spiegel <spiegel@gnu.org>
parents:
35830
diff
changeset
|
1204 (defun vc-default-latest-on-branch-p (backend file) |
41071 | 1205 "Return non-nil if FILE is the latest on its branch. |
1206 This default implementation always returns non-nil, which means that | |
1207 editing non-current versions is not supported by default." | |
35131
9dcb897992b9
(vc-default-latest-on-branch-p): New function, replaces constant
André Spiegel <spiegel@gnu.org>
parents:
33634
diff
changeset
|
1208 t) |
9dcb897992b9
(vc-default-latest-on-branch-p): New function, replaces constant
André Spiegel <spiegel@gnu.org>
parents:
33634
diff
changeset
|
1209 |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1210 (defun vc-next-action-on-file (file verbose &optional comment) |
41071 | 1211 "Do The Right Thing for a given FILE under version control. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1212 If COMMENT is specified, it will be used as an admin or checkin comment. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1213 If VERBOSE is non-nil, query the user rather than using default parameters." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1214 (let ((visited (get-file-buffer file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1215 state version) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1216 (when visited |
46623
9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
André Spiegel <spiegel@gnu.org>
parents:
46541
diff
changeset
|
1217 (if vc-dired-mode |
9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
André Spiegel <spiegel@gnu.org>
parents:
46541
diff
changeset
|
1218 (switch-to-buffer-other-window visited) |
9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
André Spiegel <spiegel@gnu.org>
parents:
46541
diff
changeset
|
1219 (set-buffer visited)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1220 ;; Check relation of buffer and file, and make sure |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1221 ;; user knows what he's doing. First, finding the file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1222 ;; will check whether the file on disk is newer. |
46623
9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
André Spiegel <spiegel@gnu.org>
parents:
46541
diff
changeset
|
1223 ;; Ignore buffer-read-only during this test, and |
9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
André Spiegel <spiegel@gnu.org>
parents:
46541
diff
changeset
|
1224 ;; preserve find-file-literally. |
46454
386acc7f6c4d
(vc-next-action-on-file): Ignore buffer-read-only while comparing to
André Spiegel <spiegel@gnu.org>
parents:
43744
diff
changeset
|
1225 (let ((buffer-read-only (not (file-writable-p file)))) |
46623
9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
André Spiegel <spiegel@gnu.org>
parents:
46541
diff
changeset
|
1226 (find-file-noselect file nil find-file-literally)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1227 (if (not (verify-visited-file-modtime (current-buffer))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1228 (if (yes-or-no-p "Replace file on disk with buffer contents? ") |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
1229 (write-file buffer-file-name) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1230 (error "Aborted")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1231 ;; Now, check if we have unsaved changes. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1232 (vc-buffer-sync t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1233 (if (buffer-modified-p) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1234 (or (y-or-n-p "Operate on disk file, keeping modified buffer? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1235 (error "Aborted"))))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1236 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1237 ;; Do the right thing |
32069
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1238 (if (not (vc-registered file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1239 (vc-register verbose comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1240 (vc-recompute-state file) |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1241 (if visited (vc-mode-line file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1242 (setq state (vc-state file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1243 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1244 ;; up-to-date |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1245 ((or (eq state 'up-to-date) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1246 (and verbose (eq state 'needs-patch))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1247 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1248 (verbose |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1249 ;; go to a different version |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
1250 (setq version |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1251 (read-string "Branch, version, or backend to move to: ")) |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
1252 (let ((vsym (intern-soft (upcase version)))) |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1253 (if (member vsym vc-handled-backends) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1254 (vc-transfer-file file vsym) |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
1255 (vc-checkout file (eq (vc-checkout-model file) 'implicit) |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1256 version)))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1257 ((not (eq (vc-checkout-model file) 'implicit)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1258 ;; check the file out |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1259 (vc-checkout file t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1260 (t |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1261 ;; do nothing |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1262 (message "%s is up-to-date" file)))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1263 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1264 ;; Abnormal: edited but read-only |
37544
94c0503d3f2d
(vc-next-action-on-file): Only force buffer+file to writable
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36710
diff
changeset
|
1265 ((and visited (eq state 'edited) |
94c0503d3f2d
(vc-next-action-on-file): Only force buffer+file to writable
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36710
diff
changeset
|
1266 buffer-read-only (not (file-writable-p file))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1267 ;; Make the file+buffer read-write. If the user really wanted to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1268 ;; commit, he'll get a chance to do that next time around, anyway. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1269 (message "File is edited but read-only; making it writable") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1270 (set-file-modes buffer-file-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1271 (logior (file-modes buffer-file-name) 128)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1272 (toggle-read-only -1)) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1273 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1274 ;; edited |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1275 ((eq state 'edited) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1276 (cond |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1277 ;; For files with locking, if the file does not contain |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1278 ;; any changes, just let go of the lock, i.e. revert. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1279 ((and (not (eq (vc-checkout-model file) 'implicit)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1280 (vc-workfile-unchanged-p file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1281 ;; If buffer is modified, that means the user just |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1282 ;; said no to saving it; in that case, don't revert, |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1283 ;; because the user might intend to save after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1284 ;; finishing the log entry. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1285 (not (and visited (buffer-modified-p)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1286 ;; DO NOT revert the file without asking the user! |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1287 (if (not visited) (find-file-other-window file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1288 (if (yes-or-no-p "Revert to master version? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1289 (vc-revert-buffer))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1290 (t ;; normal action |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1291 (if (not verbose) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1292 (vc-checkin file nil comment) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1293 (setq version (read-string "New version or backend: ")) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1294 (let ((vsym (intern (upcase version)))) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1295 (if (member vsym vc-handled-backends) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1296 (vc-transfer-file file vsym) |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1297 (vc-checkin file version comment))))))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1298 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1299 ;; locked by somebody else |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1300 ((stringp state) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1301 (if comment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1302 (error "Sorry, you can't steal the lock on %s this way" |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1303 (file-name-nondirectory file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1304 (vc-steal-lock file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1305 (if verbose (read-string "Version to steal: ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1306 (vc-workfile-version file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1307 state)) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1308 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1309 ;; needs-patch |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1310 ((eq state 'needs-patch) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1311 (if (yes-or-no-p (format |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1312 "%s is not up-to-date. Get latest version? " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1313 (file-name-nondirectory file))) |
48964
7bba5b5ff0d2
(vc-next-action-on-file): Use t argument to vc-checkout in
André Spiegel <spiegel@gnu.org>
parents:
48142
diff
changeset
|
1314 (vc-checkout file (eq (vc-checkout-model file) 'implicit) t) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1315 (if (and (not (eq (vc-checkout-model file) 'implicit)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1316 (yes-or-no-p "Lock this version? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1317 (vc-checkout file t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1318 (error "Aborted")))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1319 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1320 ;; needs-merge |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1321 ((eq state 'needs-merge) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1322 (if (yes-or-no-p (format |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1323 "%s is not up-to-date. Merge in changes now? " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1324 (file-name-nondirectory file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1325 (vc-maybe-resolve-conflicts file (vc-call merge-news file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1326 (error "Aborted"))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1327 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1328 ;; unlocked-changes |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1329 ((eq state 'unlocked-changes) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1330 (if (not visited) (find-file-other-window file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1331 (if (save-window-excursion |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1332 (vc-version-diff file (vc-workfile-version file) nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1333 (goto-char (point-min)) |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
1334 (let ((inhibit-read-only t)) |
41561
cfae9c0a0035
(vc-next-action-on-file): Use insert instead of insert-string.
Pavel Janík <Pavel@Janik.cz>
parents:
41556
diff
changeset
|
1335 (insert |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
1336 (format "Changes to %s since last lock:\n\n" file))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1337 (not (beep)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1338 (yes-or-no-p (concat "File has unlocked changes. " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1339 "Claim lock retaining changes? "))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1340 (progn (vc-call steal-lock file) |
46454
386acc7f6c4d
(vc-next-action-on-file): Ignore buffer-read-only while comparing to
André Spiegel <spiegel@gnu.org>
parents:
43744
diff
changeset
|
1341 (clear-visited-file-modtime) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1342 ;; Must clear any headers here because they wouldn't |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1343 ;; show that the file is locked now. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1344 (vc-clear-headers file) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
1345 (write-file buffer-file-name) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1346 (vc-mode-line file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1347 (if (not (yes-or-no-p |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1348 "Revert to checked-in version, instead? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1349 (error "Checkout aborted") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1350 (vc-revert-buffer1 t t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1351 (vc-checkout file t)))))))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1352 |
23792
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1353 (defvar vc-dired-window-configuration) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1354 |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1355 (defun vc-next-action-dired (file rev comment) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1356 "Call `vc-next-action-on-file' on all the marked files. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1357 Ignores FILE and REV, but passes on COMMENT." |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1358 (let ((dired-buffer (current-buffer))) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1359 (dired-map-over-marks |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1360 (let ((file (dired-get-filename))) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1361 (message "Processing %s..." file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1362 (vc-next-action-on-file file nil comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1363 (set-buffer dired-buffer) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1364 (set-window-configuration vc-dired-window-configuration) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1365 (message "Processing %s...done" file)) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1366 nil t)) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1367 (dired-move-to-filename)) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1368 |
927 | 1369 ;; Here's the major entry point. |
904 | 1370 |
927 | 1371 ;;;###autoload |
904 | 1372 (defun vc-next-action (verbose) |
41071 | 1373 "Do the next logical version control operation on the current file. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1374 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1375 If you call this from within a VC dired buffer with no files marked, |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1376 it will operate on the file in the current line. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1377 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1378 If you call this from within a VC dired buffer, and one or more |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1379 files are marked, it will accept a log message and then operate on |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1380 each one. The log message will be used as a comment for any register |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1381 or checkin operations, but ignored when doing checkouts. Attempted |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1382 lock steals will raise an error. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1383 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1384 A prefix argument lets you specify the version number to use. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1385 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1386 For RCS and SCCS files: |
904 | 1387 If the file is not already registered, this registers it for version |
21517
4d5cd99a3d51
(vc-next-action-on-file): Don't check out after registering. This is
André Spiegel <spiegel@gnu.org>
parents:
21448
diff
changeset
|
1388 control. |
904 | 1389 If the file is registered and not locked by anyone, this checks out |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
1390 a writable and locked file ready for editing. |
904 | 1391 If the file is checked out and locked by the calling user, this |
1392 first checks to see if the file has changed since checkout. If not, | |
1393 it performs a revert. | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1394 If the file has been changed, this pops up a buffer for entry |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1395 of a log message; when the message has been entered, it checks in the |
904 | 1396 resulting changes along with the log message as change commentary. If |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
1397 the variable `vc-keep-workfiles' is non-nil (which is its default), a |
904 | 1398 read-only copy of the changed file is left in place afterwards. |
1399 If the file is registered and locked by someone else, you are given | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1400 the option to steal the lock. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1401 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1402 For CVS files: |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1403 If the file is not already registered, this registers it for version |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1404 control. This does a \"cvs add\", but no \"cvs commit\". |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1405 If the file is added but not committed, it is committed. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1406 If your working file is changed, but the repository file is |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1407 unchanged, this pops up a buffer for entry of a log message; when the |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1408 message has been entered, it checks in the resulting changes along |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1409 with the logmessage as change commentary. A writable file is retained. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1410 If the repository file is changed, you are asked if you want to |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1411 merge in the changes into your working copy." |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1412 |
904 | 1413 (interactive "P") |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1414 (catch 'nogo |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1415 (if vc-dired-mode |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1416 (let ((files (dired-get-marked-files))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1417 (set (make-local-variable 'vc-dired-window-configuration) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1418 (current-window-configuration)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1419 (if (string= "" |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1420 (mapconcat |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1421 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1422 (if (not (vc-up-to-date-p f)) "@" "")) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1423 files "")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1424 (vc-next-action-dired nil nil "dummy") |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1425 (vc-start-entry nil nil nil nil |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1426 "Enter a change comment for the marked files." |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1427 'vc-next-action-dired)) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1428 (throw 'nogo nil))) |
21448
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1429 (while vc-parent-buffer |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1430 (pop-to-buffer vc-parent-buffer)) |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1431 (if buffer-file-name |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1432 (vc-next-action-on-file buffer-file-name verbose) |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1433 (error "Buffer %s is not associated with a file" (buffer-name))))) |
904 | 1434 |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
1435 ;; These functions help the vc-next-action entry point |
904 | 1436 |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
1437 (defun vc-default-init-version (backend) vc-default-init-version) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
1438 |
927 | 1439 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1440 (defun vc-register (&optional set-version comment) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1441 "Register the current file into a version control system. |
31520
f9d2d484e1e2
* vc-sccs.el (vc-sccs-register):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31435
diff
changeset
|
1442 With prefix argument SET-VERSION, allow user to specify initial version |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1443 level. If COMMENT is present, use that as an initial comment. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1444 |
31520
f9d2d484e1e2
* vc-sccs.el (vc-sccs-register):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31435
diff
changeset
|
1445 The version control system to use is found by cycling through the list |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1446 `vc-handled-backends'. The first backend in that list which declares |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1447 itself responsible for the file (usually because other files in that |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1448 directory are already registered under that backend) will be used to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1449 register the file. If no backend declares itself responsible, the |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1450 first backend that could register the file is used." |
904 | 1451 (interactive "P") |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1452 (unless buffer-file-name (error "No visited file")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1453 (when (vc-backend buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1454 (if (vc-registered buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1455 (error "This file is already registered") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1456 (unless (y-or-n-p "Previous master file has vanished. Make a new one? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1457 (error "Aborted")))) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1458 ;; Watch out for new buffers of size 0: the corresponding file |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1459 ;; does not exist yet, even though buffer-modified-p is nil. |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1460 (if (and (not (buffer-modified-p)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1461 (zerop (buffer-size)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1462 (not (file-exists-p buffer-file-name))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1463 (set-buffer-modified-p t)) |
904 | 1464 (vc-buffer-sync) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1465 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1466 (vc-start-entry buffer-file-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1467 (if set-version |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1468 (read-string (format "Initial version level for %s: " |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
1469 (buffer-name))) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
1470 (vc-call-backend (vc-responsible-backend buffer-file-name) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
1471 'init-version)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1472 (or comment (not vc-initial-comment)) |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1473 nil |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1474 "Enter initial comment." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1475 (lambda (file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1476 (message "Registering %s... " file) |
32069
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1477 (let ((backend (vc-responsible-backend file t))) |
31520
f9d2d484e1e2
* vc-sccs.el (vc-sccs-register):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31435
diff
changeset
|
1478 (vc-file-clearprops file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1479 (vc-call-backend backend 'register file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1480 (vc-file-setprop file 'vc-backend backend) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1481 (unless vc-make-backup-files |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1482 (make-local-variable 'backup-inhibited) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1483 (setq backup-inhibited t))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1484 (message "Registering %s... done" file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1485 |
32069
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1486 |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1487 (defun vc-responsible-backend (file &optional register) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1488 "Return the name of a backend system that is responsible for FILE. |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1489 The optional argument REGISTER means that a backend suitable for |
32069
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1490 registration should be found. |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1491 |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1492 If REGISTER is nil, then if FILE is already registered, return the |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1493 backend of FILE. If FILE is not registered, or a directory, then the |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1494 first backend in `vc-handled-backends' that declares itself |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1495 responsible for FILE is returned. If no backend declares itself |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1496 responsible, return the first backend. |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
1497 |
32069
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1498 If REGISTER is non-nil, return the first responsible backend under |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1499 which FILE is not yet registered. If there is no such backend, return |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1500 the first backend under which FILE is not yet registered, but could |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1501 be registered." |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1502 (if (not vc-handled-backends) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1503 (error "No handled backends")) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1504 (or (and (not (file-directory-p file)) (not register) (vc-backend file)) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1505 (catch 'found |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1506 ;; First try: find a responsible backend. If this is for registration, |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1507 ;; it must be a backend under which FILE is not yet registered. |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1508 (dolist (backend vc-handled-backends) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1509 (and (or (not register) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1510 (not (vc-call-backend backend 'registered file))) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1511 (vc-call-backend backend 'responsible-p file) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1512 (throw 'found backend))) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1513 ;; no responsible backend |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1514 (if (not register) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1515 ;; if this is not for registration, the first backend must do |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1516 (car vc-handled-backends) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1517 ;; for registration, we need to find a new backend that |
32069
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1518 ;; could register FILE |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1519 (dolist (backend vc-handled-backends) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1520 (and (not (vc-call-backend backend 'registered file)) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1521 (vc-call-backend backend 'could-register file) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1522 (throw 'found backend))) |
4b577e4fc758
(vc-responsible-backend): Undo the previous change in the argument
André Spiegel <spiegel@gnu.org>
parents:
32059
diff
changeset
|
1523 (error "No backend that could register"))))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1524 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1525 (defun vc-default-responsible-p (backend file) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1526 "Indicate whether BACKEND is reponsible for FILE. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1527 The default is to return nil always." |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1528 nil) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1529 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1530 (defun vc-default-could-register (backend file) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1531 "Return non-nil if BACKEND could be used to register FILE. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1532 The default implementation returns t for all files." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1533 t) |
904 | 1534 |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
1535 (defun vc-resynch-window (file &optional keep noquery) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1536 "If FILE is in the current buffer, either revert or unvisit it. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1537 The choice between revert (to see expanded keywords) and unvisit depends on |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1538 `vc-keep-workfiles'. NOQUERY if non-nil inhibits confirmation for |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1539 reverting. NOQUERY should be t *only* if it is known the only |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1540 difference between the buffer and the file is due to version control |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1541 rather than user editing!" |
904 | 1542 (and (string= buffer-file-name file) |
1543 (if keep | |
1544 (progn | |
1905
494dd05d460c
* files.el (revert-buffer): Reverse the sense of the first
Jim Blandy <jimb@redhat.com>
parents:
1674
diff
changeset
|
1545 (vc-revert-buffer1 t noquery) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1546 ;; TODO: Adjusting view mode might no longer be necessary |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1547 ;; after RMS change to files.el of 1999-08-08. Investigate |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1548 ;; this when we install the new VC. |
20602
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1549 (and view-read-only |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1550 (if (file-writable-p file) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1551 (and view-mode |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1552 (let ((view-old-buffer-read-only nil)) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1553 (view-mode-exit))) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1554 (and (not view-mode) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1555 (not (eq (get major-mode 'mode-class) 'special)) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1556 (view-mode-enter)))) |
904 | 1557 (vc-mode-line buffer-file-name)) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
1558 (kill-buffer (current-buffer))))) |
904 | 1559 |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1560 (defun vc-resynch-buffer (file &optional keep noquery) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1561 "If FILE is currently visited, resynch its buffer." |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1562 (if (string= buffer-file-name file) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1563 (vc-resynch-window file keep noquery) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1564 (let ((buffer (get-file-buffer file))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1565 (if buffer |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1566 (with-current-buffer buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1567 (vc-resynch-window file keep noquery))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1568 (vc-dired-resynch-file file)) |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1569 |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1570 (defun vc-start-entry (file rev comment initial-contents msg action &optional after-hook) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1571 "Accept a comment for an operation on FILE revision REV. |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1572 If COMMENT is nil, pop up a VC-log buffer, emit MSG, and set the |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1573 action on close to ACTION. If COMMENT is a string and |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1574 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1575 contents of the log entry buffer. If COMMENT is a string and |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1576 INITIAL-CONTENTS is nil, do action immediately as if the user had |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1577 entered COMMENT. If COMMENT is t, also do action immediately with an |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1578 empty comment. Remember the file's buffer in `vc-parent-buffer' |
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1579 \(current one if no file). AFTER-HOOK specifies the local value |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1580 for vc-log-operation-hook." |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1581 (let ((parent (or (and file (get-file-buffer file)) (current-buffer)))) |
17274
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1582 (if vc-before-checkin-hook |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1583 (if file |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1584 (with-current-buffer parent |
17274
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1585 (run-hooks 'vc-before-checkin-hook)) |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1586 (run-hooks 'vc-before-checkin-hook))) |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1587 (if (and comment (not initial-contents)) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1588 (set-buffer (get-buffer-create "*VC-log*")) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1589 (pop-to-buffer (get-buffer-create "*VC-log*"))) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1590 (set (make-local-variable 'vc-parent-buffer) parent) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1591 (set (make-local-variable 'vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1592 (concat " from " (buffer-name vc-parent-buffer))) |
12393
7d4615a12286
(vc-start-entry): Prevent lossage when doing a mass checkin from
Richard M. Stallman <rms@gnu.org>
parents:
12365
diff
changeset
|
1593 (if file (vc-mode-line file)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1594 (vc-log-edit file) |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1595 (make-local-variable 'vc-log-after-operation-hook) |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1596 (if after-hook |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1597 (setq vc-log-after-operation-hook after-hook)) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1598 (setq vc-log-operation action) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1599 (setq vc-log-version rev) |
32930
470147903e33
(vc-start-entry): Only erase the buffer if comment is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32910
diff
changeset
|
1600 (when comment |
470147903e33
(vc-start-entry): Only erase the buffer if comment is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32910
diff
changeset
|
1601 (erase-buffer) |
470147903e33
(vc-start-entry): Only erase the buffer if comment is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32910
diff
changeset
|
1602 (when (stringp comment) (insert comment))) |
470147903e33
(vc-start-entry): Only erase the buffer if comment is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32910
diff
changeset
|
1603 (if (or (not comment) initial-contents) |
470147903e33
(vc-start-entry): Only erase the buffer if comment is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32910
diff
changeset
|
1604 (message "%s Type C-c C-c when done" msg) |
470147903e33
(vc-start-entry): Only erase the buffer if comment is set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32910
diff
changeset
|
1605 (vc-finish-logentry (eq comment t))))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1606 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1607 (defun vc-checkout (file &optional writable rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1608 "Retrieve a copy of the revision REV of FILE. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1609 If WRITABLE is non-nil, make sure the retrieved file is writable. |
38608 | 1610 REV defaults to the latest revision. |
1611 | |
1612 After check-out, runs the normal hook `vc-checkout-hook'." | |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
1613 (and writable |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
1614 (not rev) |
32748
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
1615 (vc-call make-version-backups-p file) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
1616 (vc-up-to-date-p file) |
32748
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
1617 (vc-make-version-backup file)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1618 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1619 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1620 (condition-case err |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1621 (vc-call checkout file writable rev) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1622 (file-error |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1623 ;; Maybe the backend is not installed ;-( |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1624 (when writable |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1625 (let ((buf (get-file-buffer file))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1626 (when buf (with-current-buffer buf (toggle-read-only -1))))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1627 (signal (car err) (cdr err)))) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1628 `((vc-state . ,(if (or (eq (vc-checkout-model file) 'implicit) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1629 (not writable)) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1630 (if (vc-call latest-on-branch-p file) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1631 'up-to-date |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1632 'needs-patch) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1633 'edited)) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1634 (vc-checkout-time . ,(nth 5 (file-attributes file))))) |
38606
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
1635 (vc-resynch-buffer file t t) |
32e167f31eb6
(vc-checkout-hook): New hook.
André Spiegel <spiegel@gnu.org>
parents:
38595
diff
changeset
|
1636 (run-hooks 'vc-checkout-hook)) |
904 | 1637 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1638 (defun vc-steal-lock (file rev owner) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1639 "Steal the lock on FILE." |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1640 (let (file-description) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1641 (if rev |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1642 (setq file-description (format "%s:%s" file rev)) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1643 (setq file-description file)) |
18265
ffe9754664a2
(vc-steal-lock): Use yes-or-no-p for confirmation.
Richard M. Stallman <rms@gnu.org>
parents:
18246
diff
changeset
|
1644 (if (not (yes-or-no-p (format "Steal the lock on %s from %s? " |
ffe9754664a2
(vc-steal-lock): Use yes-or-no-p for confirmation.
Richard M. Stallman <rms@gnu.org>
parents:
18246
diff
changeset
|
1645 file-description owner))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1646 (error "Steal canceled")) |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1647 (message "Stealing lock on %s..." file) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1648 (with-vc-properties |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1649 file |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1650 (vc-call steal-lock file rev) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1651 `((vc-state . edited))) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1652 (vc-resynch-buffer file t t) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1653 (message "Stealing lock on %s...done" file) |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1654 ;; Write mail after actually stealing, because if the stealing |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1655 ;; goes wrong, we don't want to send any mail. |
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1656 (compose-mail owner (format "Stolen lock on %s" file-description)) |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1657 (setq default-directory (expand-file-name "~/")) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1658 (goto-char (point-max)) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1659 (insert |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1660 (format "I stole the lock on %s, " file-description) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1661 (current-time-string) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1662 ".\n") |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1663 (message "Please explain why you stole the lock. Type C-c C-c when done."))) |
904 | 1664 |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1665 (defun vc-checkin (file &optional rev comment initial-contents) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1666 "Check in FILE. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1667 The optional argument REV may be a string specifying the new version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1668 level (if nil increment the current level). COMMENT is a comment |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1669 string; if omitted, a buffer is popped up to accept a comment. If |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1670 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial contents |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1671 of the log entry buffer. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1672 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1673 If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1674 that the version control system supports this mode of operation. |
20967 | 1675 |
1676 Runs the normal hook `vc-checkin-hook'." | |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1677 (vc-start-entry |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1678 file rev comment initial-contents |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1679 "Enter a change comment." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1680 (lambda (file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1681 (message "Checking in %s..." file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1682 ;; "This log message intentionally left almost blank". |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1683 ;; RCS 5.7 gripes about white-space-only comments too. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1684 (or (and comment (string-match "[^\t\n ]" comment)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1685 (setq comment "*** empty log message ***")) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1686 (with-vc-properties |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1687 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1688 ;; Change buffers to get local value of vc-checkin-switches. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1689 (with-current-buffer (or (get-file-buffer file) (current-buffer)) |
39427
900ad37906a7
(vc-checkin): Use vc-delete-automatic-version-backups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39388
diff
changeset
|
1690 (progn |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
1691 (vc-call checkin file rev comment) |
39427
900ad37906a7
(vc-checkin): Use vc-delete-automatic-version-backups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39388
diff
changeset
|
1692 (vc-delete-automatic-version-backups file))) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1693 `((vc-state . up-to-date) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1694 (vc-checkout-time . ,(nth 5 (file-attributes file))) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
1695 (vc-workfile-version . nil))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1696 (message "Checking in %s...done" file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1697 'vc-checkin-hook)) |
904 | 1698 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1699 (defun vc-finish-logentry (&optional nocomment) |
41071 | 1700 "Complete the operation implied by the current log entry. |
1701 Use the contents of the current buffer as a check-in or registration | |
1702 comment. If the optional arg NOCOMMENT is non-nil, then don't check | |
51064
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
1703 the buffer contents as a comment." |
904 | 1704 (interactive) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1705 ;; Check and record the comment, if any. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1706 (unless nocomment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1707 ;; Comment too long? |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1708 (vc-call-backend (or (and vc-log-file (vc-backend vc-log-file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1709 (vc-responsible-backend default-directory)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1710 'logentry-check) |
51064
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
1711 (run-hooks 'vc-logentry-check-hook)) |
5428
e66b058ec9f6
(vc-finish-logentry): Sync the buffer in case the user modified it while
Paul Eggert <eggert@twinsun.com>
parents:
5338
diff
changeset
|
1712 ;; Sync parent buffer in case the user modified it while editing the comment. |
8349
a61f6295ee0e
(vc-next-action): Even in 1-file case, get its name from FILES.
Richard M. Stallman <rms@gnu.org>
parents:
8290
diff
changeset
|
1713 ;; But not if it is a vc-dired buffer. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1714 (with-current-buffer vc-parent-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1715 (or vc-dired-mode (vc-buffer-sync))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1716 (if (not vc-log-operation) (error "No log operation is pending")) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1717 ;; save the parameters held in buffer-local variables |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1718 (let ((log-operation vc-log-operation) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1719 (log-file vc-log-file) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1720 (log-version vc-log-version) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1721 (log-entry (buffer-string)) |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1722 (after-hook vc-log-after-operation-hook) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1723 (tmp-vc-parent-buffer vc-parent-buffer)) |
8237
189d7c4eaf68
(vc-finish-logentry): Use the value of vc-log-after-operation-hook of
Richard M. Stallman <rms@gnu.org>
parents:
8159
diff
changeset
|
1724 (pop-to-buffer vc-parent-buffer) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1725 ;; OK, do it to it |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1726 (save-excursion |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1727 (funcall log-operation |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1728 log-file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1729 log-version |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1730 log-entry)) |
20661
e3498221274f
(vc-finish-logentry): Move killing the log buffer after
Karl Heuer <kwzh@gnu.org>
parents:
20602
diff
changeset
|
1731 ;; Remove checkin window (after the checkin so that if that fails |
e3498221274f
(vc-finish-logentry): Move killing the log buffer after
Karl Heuer <kwzh@gnu.org>
parents:
20602
diff
changeset
|
1732 ;; we don't zap the *VC-log* buffer and the typing therein). |
e3498221274f
(vc-finish-logentry): Move killing the log buffer after
Karl Heuer <kwzh@gnu.org>
parents:
20602
diff
changeset
|
1733 (let ((logbuf (get-buffer "*VC-log*"))) |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1734 (cond ((and logbuf vc-delete-logbuf-window) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1735 (delete-windows-on logbuf (selected-frame)) |
22721 | 1736 ;; Kill buffer and delete any other dedicated windows/frames. |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1737 (kill-buffer logbuf)) |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1738 (logbuf (pop-to-buffer "*VC-log*") |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1739 (bury-buffer) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1740 (pop-to-buffer tmp-vc-parent-buffer)))) |
8237
189d7c4eaf68
(vc-finish-logentry): Use the value of vc-log-after-operation-hook of
Richard M. Stallman <rms@gnu.org>
parents:
8159
diff
changeset
|
1741 ;; Now make sure we see the expanded headers |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
1742 (if log-file |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1743 (vc-resynch-buffer log-file vc-keep-workfiles t)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1744 (if vc-dired-mode |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
1745 (dired-move-to-filename)) |
17101
436e2bd4efcc
(vc-log-mode): New optional arg FILE. Set vc-log-file here.
Karl Heuer <kwzh@gnu.org>
parents:
16993
diff
changeset
|
1746 (run-hooks after-hook 'vc-finish-logentry-hook))) |
904 | 1747 |
1748 ;; Code for access to the comment ring | |
1749 | |
1750 ;; Additional entry points for examining version histories | |
1751 | |
927 | 1752 ;;;###autoload |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1753 (defun vc-diff (historic &optional not-urgent) |
2667
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
1754 "Display diffs between file versions. |
41071 | 1755 Normally this compares the current file and buffer with the most |
1756 recent checked in version of that file. This uses no arguments. With | |
1757 a prefix argument HISTORIC, it reads the file name to use and two | |
1758 version designators specifying which versions to compare. The | |
1759 optional argument NOT-URGENT non-nil means it is ok to say no to | |
1760 saving the buffer." | |
14376
eb8910a353fc
(vc-diff): Make NOT-URGENT default to t.
Richard M. Stallman <rms@gnu.org>
parents:
14297
diff
changeset
|
1761 (interactive (list current-prefix-arg t)) |
904 | 1762 (if historic |
1763 (call-interactively 'vc-version-diff) | |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1764 (vc-ensure-vc-buffer) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1765 (let ((file buffer-file-name)) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1766 (vc-buffer-sync not-urgent) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1767 (if (vc-workfile-unchanged-p buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1768 (message "No changes to %s since latest version" file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1769 (vc-version-diff file nil nil))))) |
904 | 1770 |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1771 (defun vc-default-revision-completion-table (backend file) nil) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1772 |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1773 (defun vc-version-diff (file rev1 rev2) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1774 "List the differences between FILE's versions REV1 and REV2. |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1775 If REV1 is empty or nil it means to use the current workfile version; |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1776 REV2 empty or nil means the current file contents. FILE may also be |
41071 | 1777 a directory, in that case, generate diffs between the correponding |
1778 versions of all registered files in or below it." | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1779 (interactive |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1780 (let* ((file (expand-file-name |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1781 (read-file-name (if buffer-file-name |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1782 "File or dir to diff (default visited file): " |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1783 "File or dir to diff: ") |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1784 default-directory buffer-file-name t))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1785 (rev1-default nil) (rev2-default nil) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1786 (completion-table (vc-call revision-completion-table file))) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1787 ;; compute default versions based on the file state |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1788 (cond |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1789 ;; if it's a directory, don't supply any version default |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1790 ((file-directory-p file) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1791 nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1792 ;; if the file is not up-to-date, use current version as older version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1793 ((not (vc-up-to-date-p file)) |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1794 (setq rev1-default (vc-workfile-version file))) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1795 ;; if the file is not locked, use last and previous version as default |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1796 (t |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1797 (setq rev1-default (vc-call previous-version file |
42548
1cf3624d80ac
(vc-branch-part): Return nil if there's no `.'
André Spiegel <spiegel@gnu.org>
parents:
42205
diff
changeset
|
1798 (vc-workfile-version file))) |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1799 (if (string= rev1-default "") (setq rev1-default nil)) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1800 (setq rev2-default (vc-workfile-version file)))) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1801 ;; construct argument list |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1802 (let* ((rev1-prompt (if rev1-default |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1803 (concat "Older version (default " |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1804 rev1-default "): ") |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1805 "Older version: ")) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1806 (rev2-prompt (concat "Newer version (default " |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1807 (or rev2-default "current source") "): ")) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1808 (rev1 (if completion-table |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1809 (completing-read rev1-prompt completion-table |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1810 nil nil nil nil rev1-default) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1811 (read-string rev1-prompt nil nil rev1-default))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1812 (rev2 (if completion-table |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1813 (completing-read rev2-prompt completion-table |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1814 nil nil nil nil rev2-default) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1815 (read-string rev2-prompt nil nil rev2-default)))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1816 (list file rev1 rev2)))) |
904 | 1817 (if (file-directory-p file) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
1818 ;; recursive directory diff |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1819 (progn |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1820 (vc-setup-buffer "*vc-diff*") |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1821 (if (string-equal rev1 "") (setq rev1 nil)) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1822 (if (string-equal rev2 "") (setq rev2 nil)) |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1823 (let ((inhibit-read-only t)) |
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1824 (insert "Diffs between " |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1825 (or rev1 "last version checked in") |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1826 " and " |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1827 (or rev2 "current workfile(s)") |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1828 ":\n\n")) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1829 (let ((dir (file-name-as-directory file))) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1830 (vc-call-backend (vc-responsible-backend dir) |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1831 'diff-tree dir rev1 rev2)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1832 (vc-exec-after `(let ((inhibit-read-only t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1833 (insert "\nEnd of diffs.\n")))) |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
1834 ;; Single file diff. It is important that the vc-controlled buffer |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
1835 ;; is still current at this time, because any local settings in that |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
1836 ;; buffer should affect the diff command. |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1837 (vc-diff-internal file rev1 rev2)) |
36710
66e9d0506b71
(vc-do-command): If the destination buffer is already current, don't
André Spiegel <spiegel@gnu.org>
parents:
36395
diff
changeset
|
1838 (set-buffer "*vc-diff*") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1839 (if (and (zerop (buffer-size)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1840 (not (get-buffer-process (current-buffer)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1841 (progn |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1842 (if rev1 |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1843 (if rev2 |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1844 (message "No changes to %s between %s and %s" file rev1 rev2) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1845 (message "No changes to %s since %s" file rev1)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1846 (message "No changes to %s since latest version" file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1847 nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1848 (pop-to-buffer (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1849 ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1850 ;; not available. Work around that. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1851 (if (require 'diff-mode nil t) (diff-mode)) |
33564
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
1852 (vc-exec-after '(let ((inhibit-read-only t)) |
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
1853 (if (eq (buffer-size) 0) |
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
1854 (insert "No differences found.\n")) |
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
1855 (goto-char (point-min)) |
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
1856 (shrink-window-if-larger-than-buffer))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1857 t)) |
904 | 1858 |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1859 (defun vc-diff-label (file file-rev rev) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1860 (concat (file-relative-name file) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1861 (format-time-string "\t%d %b %Y %T %z\t" |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1862 (nth 5 (file-attributes file-rev))) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1863 rev)) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1864 |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1865 (defun vc-diff-internal (file rev1 rev2) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1866 "Run diff to compare FILE's revisions REV1 and REV2. |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
1867 Diff output goes to the *vc-diff* buffer. The exit status of the diff |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
1868 command is returned. |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1869 |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1870 This function takes care to set up a proper coding system for diff output. |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1871 If both revisions are available as local files, then it also does not |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1872 actually call the backend, but performs a local diff." |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1873 (if (or (not rev1) (string-equal rev1 "")) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1874 (setq rev1 (vc-workfile-version file))) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1875 (if (string-equal rev2 "") |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1876 (setq rev2 nil)) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1877 (let ((file-rev1 (vc-version-backup-file file rev1)) |
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1878 (file-rev2 (if (not rev2) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1879 file |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1880 (vc-version-backup-file file rev2))) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1881 (coding-system-for-read (vc-coding-system-for-diff file))) |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1882 (if (and file-rev1 file-rev2) |
71446
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1883 (let ((status |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1884 (if (eq vc-diff-knows-L 'no) |
71632
4257c62a5b2a
(vc-diff-internal): Fix prev change.
André Spiegel <spiegel@gnu.org>
parents:
71446
diff
changeset
|
1885 (apply 'vc-do-command "*vc-diff*" 1 "diff" nil |
71446
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1886 (append (vc-switches nil 'diff) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1887 (list (file-relative-name file-rev1) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1888 (file-relative-name file-rev2)))) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1889 (apply 'vc-do-command "*vc-diff*" 2 "diff" nil |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1890 (append (vc-switches nil 'diff) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1891 ;; Provide explicit labels like RCS or |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1892 ;; CVS would do so diff-mode refers to |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1893 ;; `file' rather than to `file-rev1' |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1894 ;; when trying to find/apply/undo |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1895 ;; hunks. |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1896 (list "-L" (vc-diff-label file file-rev1 rev1) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1897 "-L" (vc-diff-label file file-rev2 rev2) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1898 (file-relative-name file-rev1) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1899 (file-relative-name file-rev2))))))) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1900 (if (eq status 2) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1901 (if (not vc-diff-knows-L) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1902 (setq vc-diff-knows-L 'no |
71632
4257c62a5b2a
(vc-diff-internal): Fix prev change.
André Spiegel <spiegel@gnu.org>
parents:
71446
diff
changeset
|
1903 status (apply 'vc-do-command "*vc-diff*" 1 "diff" nil |
71446
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1904 (append |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1905 (vc-switches nil 'diff) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1906 (list (file-relative-name file-rev1) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1907 (file-relative-name file-rev2))))) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1908 (error "diff failed")) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1909 (if (not vc-diff-knows-L) (setq vc-diff-knows-L 'yes))) |
b0324f716b87
(vc-diff-knows-L): New variable.
André Spiegel <spiegel@gnu.org>
parents:
71228
diff
changeset
|
1910 status) |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1911 (vc-call diff file rev1 rev2)))) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1912 |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1913 (defun vc-switches (backend op) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1914 (let ((switches |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1915 (or (if backend |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1916 (let ((sym (vc-make-backend-sym |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1917 backend (intern (concat (symbol-name op) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1918 "-switches"))))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1919 (if (boundp sym) (symbol-value sym)))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1920 (let ((sym (intern (format "vc-%s-switches" (symbol-name op))))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1921 (if (boundp sym) (symbol-value sym))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1922 (cond |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1923 ((eq op 'diff) diff-switches))))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1924 (if (stringp switches) (list switches) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1925 ;; If not a list, return nil. |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1926 ;; This is so we can set vc-diff-switches to t to override |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1927 ;; any switches in diff-switches. |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1928 (if (listp switches) switches)))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
1929 |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
1930 ;; Old def for compatibility with Emacs-21.[123]. |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
1931 (defmacro vc-diff-switches-list (backend) `(vc-switches ',backend 'diff)) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59442
diff
changeset
|
1932 (make-obsolete 'vc-diff-switches-list 'vc-switches "22.1") |
35820
3cfa6e077b83
(vc-diff-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
35199
diff
changeset
|
1933 |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1934 (defun vc-default-diff-tree (backend dir rev1 rev2) |
41071 | 1935 "List differences for all registered files at and below DIR. |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1936 The meaning of REV1 and REV2 is the same as for `vc-version-diff'." |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
1937 ;; This implementation does an explicit tree walk, and calls |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1938 ;; vc-BACKEND-diff directly for each file. An optimization |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1939 ;; would be to use `vc-diff-internal', so that diffs can be local, |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1940 ;; and to call it only for files that are actually changed. |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1941 ;; However, this is expensive for some backends, and so it is left |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1942 ;; to backend-specific implementations. |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1943 (setq default-directory dir) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1944 (vc-file-tree-walk |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1945 default-directory |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1946 (lambda (f) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1947 (vc-exec-after |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
1948 `(let ((coding-system-for-read (vc-coding-system-for-diff ',f))) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1949 (message "Looking at %s" ',f) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
1950 (vc-call-backend ',(vc-backend f) |
54618
7cd50dab9d3d
(vc-version-diff, vc-default-diff-tree): Change `rel' -> `rev'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54586
diff
changeset
|
1951 'diff ',f ',rev1 ',rev2)))))) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1952 |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1953 (defun vc-coding-system-for-diff (file) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1954 "Return the coding system for reading diff output for FILE." |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1955 (or coding-system-for-read |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
1956 ;; if we already have this file open, |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1957 ;; use the buffer's coding system |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1958 (let ((buf (find-buffer-visiting file))) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1959 (if buf (with-current-buffer buf |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1960 buffer-file-coding-system))) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1961 ;; otherwise, try to find one based on the file name |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
1962 (car (find-operation-coding-system 'insert-file-contents file)) |
40124
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1963 ;; and a final fallback |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1964 'undecided)) |
9031427edfa3
(vc-diff-internal, vc-coding-system-for-diff, vc-default-diff-tree):
André Spiegel <spiegel@gnu.org>
parents:
39427
diff
changeset
|
1965 |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1966 ;;;###autoload |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1967 (defun vc-version-other-window (rev) |
41071 | 1968 "Visit version REV of the current file in another window. |
1969 If the current file is named `F', the version is named `F.~REV~'. | |
1970 If `F.~REV~' already exists, use it instead of checking it out again." | |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1971 (interactive |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1972 (save-current-buffer |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1973 (vc-ensure-vc-buffer) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1974 (let ((completion-table |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1975 (vc-call revision-completion-table buffer-file-name)) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1976 (prompt "Version to visit (default is workfile version): ")) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1977 (list |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1978 (if completion-table |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1979 (completing-read prompt completion-table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
1980 (read-string prompt)))))) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1981 (vc-ensure-vc-buffer) |
32888
78063b725d3f
(vc-version-other-window): Bind `file'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32748
diff
changeset
|
1982 (let* ((file buffer-file-name) |
78063b725d3f
(vc-version-other-window): Bind `file'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32748
diff
changeset
|
1983 (version (if (string-equal rev "") |
78063b725d3f
(vc-version-other-window): Bind `file'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32748
diff
changeset
|
1984 (vc-workfile-version file) |
41556
678f91af978a
(vc-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41395
diff
changeset
|
1985 rev))) |
678f91af978a
(vc-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41395
diff
changeset
|
1986 (switch-to-buffer-other-window (vc-find-version file version)))) |
678f91af978a
(vc-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41395
diff
changeset
|
1987 |
678f91af978a
(vc-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41395
diff
changeset
|
1988 (defun vc-find-version (file version) |
678f91af978a
(vc-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41395
diff
changeset
|
1989 "Read VERSION of FILE into a buffer and return the buffer." |
678f91af978a
(vc-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41395
diff
changeset
|
1990 (let ((automatic-backup (vc-version-backup-file-name file version)) |
47796
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1991 (filebuf (or (get-file-buffer file) (current-buffer))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1992 (filename (vc-version-backup-file-name file version 'manual))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1993 (unless (file-exists-p filename) |
32748
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
1994 (if (file-exists-p automatic-backup) |
47796
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1995 (rename-file automatic-backup filename nil) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1996 (message "Checking out %s..." filename) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1997 (with-current-buffer filebuf |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1998 (let ((failed t)) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
1999 (unwind-protect |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2000 (let ((coding-system-for-read 'no-conversion) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2001 (coding-system-for-write 'no-conversion)) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2002 (with-temp-file filename |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2003 (let ((outbuf (current-buffer))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2004 ;; Change buffer to get local value of |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2005 ;; vc-checkout-switches. |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2006 (with-current-buffer filebuf |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2007 (vc-call find-version file version outbuf)))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2008 (setq failed nil)) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2009 (if (and failed (file-exists-p filename)) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2010 (delete-file filename)))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2011 (vc-mode-line file)) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2012 (message "Checking out %s...done" filename))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2013 (find-file-noselect filename))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2014 |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2015 (defun vc-default-find-version (backend file rev buffer) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2016 "Provide the new `find-version' op based on the old `checkout' op. |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2017 This is only for compatibility with old backends. They should be updated |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2018 to provide the `find-version' operation instead." |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2019 (let ((tmpfile (make-temp-file (expand-file-name file)))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2020 (unwind-protect |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2021 (progn |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2022 (vc-call-backend backend 'checkout file nil rev tmpfile) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2023 (with-current-buffer buffer |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2024 (insert-file-contents-literally tmpfile))) |
cf312195338d
(vc-find-version): Use the new backend op `find-version'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47781
diff
changeset
|
2025 (delete-file tmpfile)))) |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
2026 |
904 | 2027 ;; Header-insertion code |
2028 | |
927 | 2029 ;;;###autoload |
904 | 2030 (defun vc-insert-headers () |
41071 | 2031 "Insert headers into a file for use with a version control system. |
23235 | 2032 Headers desired are inserted at point, and are pulled from |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2033 the variable `vc-BACKEND-header'." |
904 | 2034 (interactive) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2035 (vc-ensure-vc-buffer) |
904 | 2036 (save-excursion |
2037 (save-restriction | |
2038 (widen) | |
2039 (if (or (not (vc-check-headers)) | |
3227
b2e2fcc4fb24
(vc-steal-lock, vc-insert-headers): Fix question whitespace.
Richard M. Stallman <rms@gnu.org>
parents:
2968
diff
changeset
|
2040 (y-or-n-p "Version headers already exist. Insert another set? ")) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2041 (let* ((delims (cdr (assq major-mode vc-comment-alist))) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2042 (comment-start-vc (or (car delims) comment-start "#")) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2043 (comment-end-vc (or (car (cdr delims)) comment-end "")) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2044 (hdsym (vc-make-backend-sym (vc-backend buffer-file-name) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2045 'header)) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2046 (hdstrings (and (boundp hdsym) (symbol-value hdsym)))) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2047 (dolist (s hdstrings) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2048 (insert comment-start-vc "\t" s "\t" |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2049 comment-end-vc "\n")) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2050 (if vc-static-header-alist |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2051 (dolist (f vc-static-header-alist) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2052 (if (string-match (car f) buffer-file-name) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
2053 (insert (format (cdr f) (car hdstrings))))))))))) |
904 | 2054 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2055 (defun vc-clear-headers (&optional file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2056 "Clear all version headers in the current buffer (or FILE). |
41071 | 2057 The headers are reset to their non-expanded form." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2058 (let* ((filename (or file buffer-file-name)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2059 (visited (find-buffer-visiting filename)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2060 (backend (vc-backend filename))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2061 (when (vc-find-backend-function backend 'clear-headers) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2062 (if visited |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2063 (let ((context (vc-buffer-context))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2064 ;; save-excursion may be able to relocate point and mark |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2065 ;; properly. If it fails, vc-restore-buffer-context |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2066 ;; will give it a second try. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2067 (save-excursion |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2068 (vc-call-backend backend 'clear-headers)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2069 (vc-restore-buffer-context context)) |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2070 (set-buffer (find-file-noselect filename)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2071 (vc-call-backend backend 'clear-headers) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2072 (kill-buffer filename))))) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
2073 |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2074 ;;;###autoload |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2075 (defun vc-merge () |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2076 "Merge changes between two versions into the current buffer's file. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2077 This asks for two versions to merge from in the minibuffer. If the |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2078 first version is a branch number, then merge all changes from that |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2079 branch. If the first version is empty, merge news, i.e. recent changes |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2080 from the current branch. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2081 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2082 See Info node `Merging'." |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2083 (interactive) |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
2084 (vc-ensure-vc-buffer) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
2085 (vc-buffer-sync) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
2086 (let* ((file buffer-file-name) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
2087 (backend (vc-backend file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2088 (state (vc-state file)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2089 first-version second-version status) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2090 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2091 ((stringp state) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2092 (error "File is locked by %s" state)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2093 ((not (vc-editable-p file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2094 (if (y-or-n-p |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2095 "File must be checked out for merging. Check out now? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2096 (vc-checkout file t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2097 (error "Merge aborted")))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
2098 (setq first-version |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2099 (read-string (concat "Branch or version to merge from " |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65582
diff
changeset
|
2100 "(default news on current branch): "))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2101 (if (string= first-version "") |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2102 (if (not (vc-find-backend-function backend 'merge-news)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2103 (error "Sorry, merging news is not implemented for %s" backend) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2104 (setq status (vc-call merge-news file))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2105 (if (not (vc-find-backend-function backend 'merge)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2106 (error "Sorry, merging is not implemented for %s" backend) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2107 (if (not (vc-branch-p first-version)) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
2108 (setq second-version |
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
2109 (read-string "Second version: " |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2110 (concat (vc-branch-part first-version) "."))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2111 ;; We want to merge an entire branch. Set versions |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2112 ;; accordingly, so that vc-BACKEND-merge understands us. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2113 (setq second-version first-version) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2114 ;; first-version must be the starting point of the branch |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2115 (setq first-version (vc-branch-part first-version))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2116 (setq status (vc-call merge file first-version second-version)))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2117 (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE"))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2118 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2119 (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2120 (vc-resynch-buffer file t (not (buffer-modified-p))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2121 (if (zerop status) (message "Merge successful") |
47765
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
2122 (smerge-mode 1) |
54586
c3043c1faed3
(vc-maybe-resolve-conflicts): Don't prompt the user.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54562
diff
changeset
|
2123 (message "File contains conflicts."))) |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
2124 |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
2125 ;;;###autoload |
47781
79bdd88fb006
(vc-resolve-conflicts); Typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47780
diff
changeset
|
2126 (defalias 'vc-resolve-conflicts 'smerge-ediff) |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
2127 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2128 ;; The VC directory major mode. Coopt Dired for this. |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
2129 ;; All VC commands get mapped into logical equivalents. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
2130 |
23792
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
2131 (defvar vc-dired-switches) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
2132 (defvar vc-dired-terse-mode) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
2133 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2134 (defvar vc-dired-mode-map |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2135 (let ((map (make-sparse-keymap)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2136 (vmap (make-sparse-keymap))) |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
2137 (define-key map "\C-xv" vmap) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2138 (define-key map "v" vmap) |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
2139 (set-keymap-parent vmap vc-prefix-map) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2140 (define-key vmap "t" 'vc-dired-toggle-terse-mode) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2141 map)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2142 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2143 (define-derived-mode vc-dired-mode dired-mode "Dired under VC" |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2144 "The major mode used in VC directory buffers. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2145 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2146 It works like Dired, but lists only files under version control, with |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2147 the current VC state of each file being indicated in the place of the |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2148 file's link count, owner, group and size. Subdirectories are also |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2149 listed, and you may insert them into the buffer as desired, like in |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2150 Dired. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2151 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2152 All Dired commands operate normally, with the exception of `v', which |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2153 is redefined as the version control prefix, so that you can type |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2154 `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2155 the file named in the current Dired buffer line. `vv' invokes |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2156 `vc-next-action' on this file, or on all files currently marked. |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2157 There is a special command, `*l', to mark all files currently locked." |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2158 ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2159 ;; We do it here because dired might not be loaded yet |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2160 ;; when vc-dired-mode-map is initialized. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2161 (set-keymap-parent vc-dired-mode-map dired-mode-map) |
21370
e8224143df73
(vc-dired-mode): Make dired-after-readin-hook a local hook, not a local variable.
André Spiegel <spiegel@gnu.org>
parents:
21368
diff
changeset
|
2162 (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) |
66325
fda96ff4c7e5
* files.el (directory-listing-before-filename-regexp): New
Michael Albinus <michael.albinus@gmx.de>
parents:
65689
diff
changeset
|
2163 ;; The following is slightly modified from files.el, |
48139
ae2a3a67e382
(vc-dired-move): Adapt dired-move-to-filename-regexp to its current
André Spiegel <spiegel@gnu.org>
parents:
47881
diff
changeset
|
2164 ;; because file lines look a bit different in vc-dired-mode |
ae2a3a67e382
(vc-dired-move): Adapt dired-move-to-filename-regexp to its current
André Spiegel <spiegel@gnu.org>
parents:
47881
diff
changeset
|
2165 ;; (the column before the date does not end in a digit). |
66425
3dcbac116732
* vc.el (vc-dired-mode): Extend comment for binding of
Michael Albinus <michael.albinus@gmx.de>
parents:
66325
diff
changeset
|
2166 ;; albinus: It should be done in the original declaration. Problem |
3dcbac116732
* vc.el (vc-dired-mode): Extend comment for binding of
Michael Albinus <michael.albinus@gmx.de>
parents:
66325
diff
changeset
|
2167 ;; is the optional empty state-info; otherwise ")" would be good |
3dcbac116732
* vc.el (vc-dired-mode): Extend comment for binding of
Michael Albinus <michael.albinus@gmx.de>
parents:
66325
diff
changeset
|
2168 ;; enough as delimeter. |
66325
fda96ff4c7e5
* files.el (directory-listing-before-filename-regexp): New
Michael Albinus <michael.albinus@gmx.de>
parents:
65689
diff
changeset
|
2169 (set (make-local-variable 'directory-listing-before-filename-regexp) |
48139
ae2a3a67e382
(vc-dired-move): Adapt dired-move-to-filename-regexp to its current
André Spiegel <spiegel@gnu.org>
parents:
47881
diff
changeset
|
2170 (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)") |
48142
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2171 ;; In some locales, month abbreviations are as short as 2 letters, |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2172 ;; and they can be followed by ".". |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2173 (month (concat l l "+\\.?")) |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2174 (s " ") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2175 (yyyy "[0-9][0-9][0-9][0-9]") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2176 (dd "[ 0-3][0-9]") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2177 (HH:MM "[ 0-2][0-9]:[0-5][0-9]") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2178 (seconds "[0-6][0-9]\\([.,][0-9]+\\)?") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2179 (zone "[-+][0-2][0-9][0-5][0-9]") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2180 (iso-mm-dd "[01][0-9]-[0-3][0-9]") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2181 (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?")) |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2182 (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2183 "\\|" yyyy "-" iso-mm-dd "\\)")) |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2184 (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)" |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2185 s "+" |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2186 "\\(" HH:MM "\\|" yyyy "\\)")) |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2187 (western-comma (concat month s "+" dd "," s "+" yyyy)) |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2188 ;; Japanese MS-Windows ls-lisp has one-digit months, and |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2189 ;; omits the Kanji characters after month and day-of-month. |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2190 (mm "[ 0-1]?[0-9]") |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2191 (japanese |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2192 (concat mm l "?" s dd l "?" s "+" |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2193 "\\(" HH:MM "\\|" yyyy l "?" "\\)"))) |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2194 ;; the .* below ensures that we find the last match on a line |
48139
ae2a3a67e382
(vc-dired-move): Adapt dired-move-to-filename-regexp to its current
André Spiegel <spiegel@gnu.org>
parents:
47881
diff
changeset
|
2195 (concat ".*" s |
48142
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2196 "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)" |
9f0d9f099b64
Add comment to prev change.
André Spiegel <spiegel@gnu.org>
parents:
48139
diff
changeset
|
2197 s "+"))) |
22356
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
2198 (and (boundp 'vc-dired-switches) |
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
2199 vc-dired-switches |
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
2200 (set (make-local-variable 'dired-actual-switches) |
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
2201 vc-dired-switches)) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2202 (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2203 (setq vc-dired-mode t)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2204 |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2205 (defun vc-dired-toggle-terse-mode () |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2206 "Toggle terse display in VC Dired." |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2207 (interactive) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2208 (if (not vc-dired-mode) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2209 nil |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2210 (setq vc-dired-terse-mode (not vc-dired-terse-mode)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2211 (if vc-dired-terse-mode |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2212 (vc-dired-hook) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2213 (revert-buffer)))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2214 |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2215 (defun vc-dired-mark-locked () |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2216 "Mark all files currently locked." |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2217 (interactive) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2218 (dired-mark-if (let ((f (dired-get-filename nil t))) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2219 (and f |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2220 (not (file-directory-p f)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2221 (not (vc-up-to-date-p f)))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2222 "locked file")) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2223 |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2224 (define-key vc-dired-mode-map "*l" 'vc-dired-mark-locked) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2225 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2226 (defun vc-default-dired-state-info (backend file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2227 (let ((state (vc-state file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2228 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2229 ((stringp state) (concat "(" state ")")) |
68384
1d4de26bcb1f
(vc-default-dired-state-info): Pass FILE to vc-user-login-name.
André Spiegel <spiegel@gnu.org>
parents:
67885
diff
changeset
|
2230 ((eq state 'edited) (concat "(" (vc-user-login-name file) ")")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2231 ((eq state 'needs-merge) "(merge)") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2232 ((eq state 'needs-patch) "(patch)") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2233 ((eq state 'unlocked-changes) "(stale)")))) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2234 |
47842
f7c7cc74fde2
(vc-dired-reformat-line): As a temporary fix, remove all text
André Spiegel <spiegel@gnu.org>
parents:
47796
diff
changeset
|
2235 (defun vc-dired-reformat-line (vc-info) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2236 "Reformat a directory-listing line. |
47842
f7c7cc74fde2
(vc-dired-reformat-line): As a temporary fix, remove all text
André Spiegel <spiegel@gnu.org>
parents:
47796
diff
changeset
|
2237 Replace various columns with version control information, VC-INFO. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2238 This code, like dired, assumes UNIX -l format." |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2239 (beginning-of-line) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2240 (when (re-search-forward |
47881
2a95bf2d8eaf
(vc-dired-reformat-line): Simplified. Handles text properties
André Spiegel <spiegel@gnu.org>
parents:
47842
diff
changeset
|
2241 ;; Match link count, owner, group, size. Group may be missing, |
2a95bf2d8eaf
(vc-dired-reformat-line): Simplified. Handles text properties
André Spiegel <spiegel@gnu.org>
parents:
47842
diff
changeset
|
2242 ;; and only the size is present in OS/2 -l format. |
2a95bf2d8eaf
(vc-dired-reformat-line): Simplified. Handles text properties
André Spiegel <spiegel@gnu.org>
parents:
47842
diff
changeset
|
2243 "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) " |
2a95bf2d8eaf
(vc-dired-reformat-line): Simplified. Handles text properties
André Spiegel <spiegel@gnu.org>
parents:
47842
diff
changeset
|
2244 (line-end-position) t) |
2a95bf2d8eaf
(vc-dired-reformat-line): Simplified. Handles text properties
André Spiegel <spiegel@gnu.org>
parents:
47842
diff
changeset
|
2245 (replace-match (substring (concat vc-info " ") 0 10) |
2a95bf2d8eaf
(vc-dired-reformat-line): Simplified. Handles text properties
André Spiegel <spiegel@gnu.org>
parents:
47842
diff
changeset
|
2246 t t nil 1))) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
2247 |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2248 (defun vc-dired-hook () |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2249 "Reformat the listing according to version control. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2250 Called by dired after any portion of a vc-dired buffer has been read in." |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2251 (message "Getting version information... ") |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2252 (let (subdir filename (buffer-read-only nil)) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2253 (goto-char (point-min)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2254 (while (not (eobp)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2255 (cond |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2256 ;; subdir header line |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2257 ((setq subdir (dired-get-subdir)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2258 ;; if the backend supports it, get the state |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2259 ;; of all files in this directory at once |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2260 (let ((backend (vc-responsible-backend subdir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2261 (if (vc-find-backend-function backend 'dir-state) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2262 (vc-call-backend backend 'dir-state subdir))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2263 (forward-line 1) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2264 ;; erase (but don't remove) the "total" line |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2265 (delete-region (point) (line-end-position)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2266 (beginning-of-line) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2267 (forward-line 1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2268 ;; file line |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2269 ((setq filename (dired-get-filename nil t)) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2270 (cond |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2271 ;; subdir |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2272 ((file-directory-p filename) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2273 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2274 ((member (file-name-nondirectory filename) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2275 vc-directory-exclusion-list) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2276 (let ((pos (point))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2277 (dired-kill-tree filename) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2278 (goto-char pos) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2279 (dired-kill-line))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2280 (vc-dired-terse-mode |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2281 ;; Don't show directories in terse mode. Don't use |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2282 ;; dired-kill-line to remove it, because in recursive listings, |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2283 ;; that would remove the directory contents as well. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2284 (delete-region (line-beginning-position) |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2285 (progn (forward-line 1) (point)))) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2286 ((string-match "\\`\\.\\.?\\'" (file-name-nondirectory filename)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2287 (dired-kill-line)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2288 (t |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2289 (vc-dired-reformat-line nil) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2290 (forward-line 1)))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2291 ;; ordinary file |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2292 ((and (vc-backend filename) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2293 (not (and vc-dired-terse-mode |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2294 (vc-up-to-date-p filename)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2295 (vc-dired-reformat-line (vc-call dired-state-info filename)) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2296 (forward-line 1)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2297 (t |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2298 (dired-kill-line)))) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2299 ;; any other line |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2300 (t (forward-line 1)))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2301 (vc-dired-purge)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2302 (message "Getting version information... done") |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2303 (save-restriction |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2304 (widen) |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2305 (cond ((eq (count-lines (point-min) (point-max)) 1) |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2306 (goto-char (point-min)) |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
2307 (message "No files locked under %s" default-directory))))) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2308 |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2309 (defun vc-dired-purge () |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2310 "Remove empty subdirs." |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2311 (goto-char (point-min)) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2312 (while (dired-get-subdir) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2313 (forward-line 2) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2314 (if (dired-get-filename nil t) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2315 (if (not (dired-next-subdir 1 t)) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2316 (goto-char (point-max))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2317 (forward-line -2) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2318 (if (not (string= (dired-current-directory) default-directory)) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2319 (dired-do-kill-lines t "") |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2320 ;; We cannot remove the top level directory. |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2321 ;; Just make it look a little nicer. |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2322 (forward-line 1) |
53283
019243f7a304
(vc-dired-purge): Avoid error from `kill-line'.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
52401
diff
changeset
|
2323 (or (eobp) (kill-line)) |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2324 (if (not (dired-next-subdir 1 t)) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2325 (goto-char (point-max)))))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2326 (goto-char (point-min))) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2327 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2328 (defun vc-dired-buffers-for-dir (dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2329 "Return a list of all vc-dired buffers that currently display DIR." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2330 (let (result) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2331 ;; Check whether dired is loaded. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2332 (when (fboundp 'dired-buffers-for-dir) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2333 (mapcar (lambda (buffer) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2334 (with-current-buffer buffer |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2335 (if vc-dired-mode |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2336 (setq result (append result (list buffer)))))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2337 (dired-buffers-for-dir dir))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2338 result)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2339 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2340 (defun vc-dired-resynch-file (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2341 "Update the entries for FILE in any VC Dired buffers that list it." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2342 (let ((buffers (vc-dired-buffers-for-dir (file-name-directory file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2343 (when buffers |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2344 (mapcar (lambda (buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2345 (with-current-buffer buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2346 (if (dired-goto-file file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2347 ;; bind vc-dired-terse-mode to nil so that |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2348 ;; files won't vanish when they are checked in |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2349 (let ((vc-dired-terse-mode nil)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2350 (dired-do-redisplay 1))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2351 buffers)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2352 |
927 | 2353 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2354 (defun vc-directory (dir read-switches) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2355 "Create a buffer in VC Dired Mode for directory DIR. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2356 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2357 See Info node `VC Dired Mode'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2358 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2359 With prefix arg READ-SWITCHES, specify a value to override |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2360 `dired-listing-switches' when generating the listing." |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2361 (interactive "DDired under VC (directory): \nP") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2362 (let ((vc-dired-switches (concat vc-dired-listing-switches |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2363 (if vc-dired-recurse "R" "")))) |
65405
ae5763b55d33
(vc-directory, vc-update-change-log): Throw an error on the attempt to
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
2364 (if (eq (string-match tramp-file-name-regexp dir) 0) |
ae5763b55d33
(vc-directory, vc-update-change-log): Throw an error on the attempt to
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
2365 (error "Sorry, vc-directory does not work over Tramp")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2366 (if read-switches |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2367 (setq vc-dired-switches |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2368 (read-string "Dired listing switches: " |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
2369 vc-dired-switches))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2370 (require 'dired) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2371 (require 'dired-aux) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2372 (switch-to-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2373 (dired-internal-noselect (expand-file-name (file-name-as-directory dir)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2374 vc-dired-switches |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
2375 'vc-dired-mode)))) |
10475
2d9590603a06
Revert Jan 15 and Jan 5 changes.
Richard M. Stallman <rms@gnu.org>
parents:
10431
diff
changeset
|
2376 |
904 | 2377 |
2378 ;; Named-configuration entry points | |
2379 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2380 (defun vc-snapshot-precondition (dir) |
41071 | 2381 "Scan the tree below DIR, looking for files not up-to-date. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2382 If any file is not up-to-date, return the name of the first such file. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2383 \(This means, neither snapshot creation nor retrieval is allowed.\) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2384 If one or more of the files are currently visited, return `visited'. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2385 Otherwise, return nil." |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
2386 (let ((status nil)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
2387 (catch 'vc-locked-example |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
2388 (vc-file-tree-walk |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2389 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2390 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2391 (if (not (vc-up-to-date-p f)) (throw 'vc-locked-example f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2392 (if (get-file-buffer f) (setq status 'visited))))) |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
2393 status))) |
904 | 2394 |
927 | 2395 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2396 (defun vc-create-snapshot (dir name branchp) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2397 "Descending recursively from DIR, make a snapshot called NAME. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2398 For each registered file, the version level of its latest version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2399 becomes part of the named configuration. If the prefix argument |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2400 BRANCHP is given, the snapshot is made as a new branch and the files |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2401 are checked out in that new branch." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2402 (interactive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2403 (list (read-file-name "Directory: " default-directory default-directory t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2404 (read-string "New snapshot name: ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2405 current-prefix-arg)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2406 (message "Making %s... " (if branchp "branch" "snapshot")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2407 (if (file-directory-p dir) (setq dir (file-name-as-directory dir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2408 (vc-call-backend (vc-responsible-backend dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2409 'create-snapshot dir name branchp) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2410 (message "Making %s... done" (if branchp "branch" "snapshot"))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2411 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2412 (defun vc-default-create-snapshot (backend dir name branchp) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2413 (when branchp |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2414 (error "VC backend %s does not support module branches" backend)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2415 (let ((result (vc-snapshot-precondition dir))) |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
2416 (if (stringp result) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2417 (error "File %s is not up-to-date" result) |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
2418 (vc-file-tree-walk |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2419 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2420 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2421 (vc-call assign-name f name)))))) |
904 | 2422 |
927 | 2423 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2424 (defun vc-retrieve-snapshot (dir name) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2425 "Descending recursively from DIR, retrieve the snapshot called NAME. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2426 If NAME is empty, it refers to the latest versions. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2427 If locking is used for the files in DIR, then there must not be any |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2428 locked files at or below DIR (but if NAME is empty, locked files are |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2429 allowed and simply skipped)." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2430 (interactive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2431 (list (read-file-name "Directory: " default-directory default-directory t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2432 (read-string "Snapshot name to retrieve (default latest versions): "))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2433 (let ((update (yes-or-no-p "Update any affected buffers? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2434 (msg (if (or (not name) (string= name "")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2435 (format "Updating %s... " (abbreviate-file-name dir)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2436 (format "Retrieving snapshot into %s... " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2437 (abbreviate-file-name dir))))) |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65405
diff
changeset
|
2438 (message "%s" msg) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2439 (vc-call-backend (vc-responsible-backend dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2440 'retrieve-snapshot dir name update) |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65405
diff
changeset
|
2441 (message "%s" (concat msg "done")))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2442 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2443 (defun vc-default-retrieve-snapshot (backend dir name update) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2444 (if (string= name "") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2445 (progn |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2446 (vc-file-tree-walk |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2447 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2448 (lambda (f) (and |
51064
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
2449 (vc-up-to-date-p f) |
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
2450 (vc-error-occurred |
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
2451 (vc-call checkout f nil "") |
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
2452 (if update (vc-resynch-buffer f t t))))))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2453 (let ((result (vc-snapshot-precondition dir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2454 (if (stringp result) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2455 (error "File %s is locked" result) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2456 (setq update (and (eq result 'visited) update)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2457 (vc-file-tree-walk |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2458 dir |
37544
94c0503d3f2d
(vc-next-action-on-file): Only force buffer+file to writable
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36710
diff
changeset
|
2459 (lambda (f) (vc-error-occurred |
51064
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
2460 (vc-call checkout f nil name) |
f2383fb5260e
(vc-log-mode-map, vc-maximum-comment-ring-size)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50926
diff
changeset
|
2461 (if update (vc-resynch-buffer f t t))))))))) |
904 | 2462 |
2463 ;; Miscellaneous other entry points | |
2464 | |
927 | 2465 ;;;###autoload |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
2466 (defun vc-print-log (&optional focus-rev) |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
2467 "List the change log of the current buffer in a window. |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
2468 If FOCUS-REV is non-nil, leave the point at that revision." |
904 | 2469 (interactive) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2470 (vc-ensure-vc-buffer) |
54562
f52b856dbc77
(vc-print-log): Undo prev change, use new function vc-arg-list from
André Spiegel <spiegel@gnu.org>
parents:
54553
diff
changeset
|
2471 (let ((file buffer-file-name)) |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
2472 (or focus-rev (setq focus-rev (vc-workfile-version file))) |
54553
c862ab7552a4
(vc-print-log): backend-function may be a byte-compiled object, not a lambda
Sam Steingold <sds@gnu.org>
parents:
54530
diff
changeset
|
2473 ;; Don't switch to the output buffer before running the command, |
c862ab7552a4
(vc-print-log): backend-function may be a byte-compiled object, not a lambda
Sam Steingold <sds@gnu.org>
parents:
54530
diff
changeset
|
2474 ;; so that any buffer-local settings in the vc-controlled |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
2475 ;; buffer can be accessed by the command. |
54784
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2476 (condition-case err |
54463
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
2477 (progn |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
2478 (vc-call print-log file "*vc-change-log*") |
4598019c5c85
Add new optional BUFFER argument to vc-BACKEND-print-log and
André Spiegel <spiegel@gnu.org>
parents:
54398
diff
changeset
|
2479 (set-buffer "*vc-change-log*")) |
54784
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2480 (wrong-number-of-arguments |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2481 ;; If this error came from the above call to print-log, try again |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2482 ;; without the optional buffer argument (for backward compatibility). |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2483 ;; Otherwise, resignal. |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2484 (if (or (not (eq (cadr err) |
55100
6c3a528ee0ca
(vc-print-log): Fix code that handles wrong-number-of-arguments in backend
Juanma Barranquero <lekktu@gmail.com>
parents:
54911
diff
changeset
|
2485 (indirect-function |
6c3a528ee0ca
(vc-print-log): Fix code that handles wrong-number-of-arguments in backend
Juanma Barranquero <lekktu@gmail.com>
parents:
54911
diff
changeset
|
2486 (vc-find-backend-function (vc-backend file) |
54784
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2487 'print-log)))) |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2488 (not (eq (caddr err) 2))) |
55100
6c3a528ee0ca
(vc-print-log): Fix code that handles wrong-number-of-arguments in backend
Juanma Barranquero <lekktu@gmail.com>
parents:
54911
diff
changeset
|
2489 (signal (car err) (cdr err)) |
54784
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2490 ;; for backward compatibility |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2491 (vc-call print-log file) |
494d96bf5f98
(vc-print-log): Use condition-case to check for backward
André Spiegel <spiegel@gnu.org>
parents:
54618
diff
changeset
|
2492 (set-buffer "*vc*")))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2493 (pop-to-buffer (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2494 (vc-exec-after |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
2495 `(let ((inhibit-read-only t)) |
78085
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
2496 (vc-call-backend ',(vc-backend file) 'log-view-mode) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2497 (goto-char (point-max)) (forward-line -1) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2498 (while (looking-at "=*\n") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2499 (delete-char (- (match-end 0) (match-beginning 0))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2500 (forward-line -1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2501 (goto-char (point-min)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2502 (if (looking-at "[\b\t\n\v\f\r ]+") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2503 (delete-char (- (match-end 0) (match-beginning 0)))) |
71791
6d32f7f6fd3a
* vc.el (vc-exec-after): Don't delete process manually.
Chong Yidong <cyd@stupidchicken.com>
parents:
71632
diff
changeset
|
2504 ;; (shrink-window-if-larger-than-buffer) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2505 ;; move point to the log entry for the current version |
47748
12d99d7af574
(vc-print-log): Unconditionally use `show-log-entry'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47227
diff
changeset
|
2506 (vc-call-backend ',(vc-backend file) |
12d99d7af574
(vc-print-log): Unconditionally use `show-log-entry'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47227
diff
changeset
|
2507 'show-log-entry |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
2508 ',focus-rev) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
2509 (set-buffer-modified-p nil))))) |
904 | 2510 |
78085
a861d80cf88c
* log-view.el (log-view-font-lock-keywords): Use `eval' to consult the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
2511 (defun vc-default-log-view-mode (backend) (log-view-mode)) |
47760
15d0c5379959
(vc-default-show-log-entry): Fix typo.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47748
diff
changeset
|
2512 (defun vc-default-show-log-entry (backend rev) |
51696
ca4a1b3128f7
(vc-default-show-log-entry): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
51627
diff
changeset
|
2513 (with-no-warnings |
ca4a1b3128f7
(vc-default-show-log-entry): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents:
51627
diff
changeset
|
2514 (log-view-goto-rev rev))) |
47748
12d99d7af574
(vc-print-log): Unconditionally use `show-log-entry'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47227
diff
changeset
|
2515 |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2516 (defun vc-default-comment-history (backend file) |
41071 | 2517 "Return a string with all log entries stored in BACKEND for FILE." |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2518 (if (vc-find-backend-function backend 'print-log) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
2519 (with-current-buffer "*vc*" |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2520 (vc-call print-log file) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2521 (vc-call wash-log file) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2522 (buffer-string)))) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2523 |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2524 (defun vc-default-wash-log (backend file) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2525 "Remove all non-comment information from log output. |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2526 This default implementation works for RCS logs; backends should override |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2527 it if their logs are not in RCS format." |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2528 (let ((separator (concat "^-+\nrevision [0-9.]+\ndate: .*\n" |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2529 "\\(branches: .*;\n\\)?" |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2530 "\\(\\*\\*\\* empty log message \\*\\*\\*\n\\)?"))) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2531 (goto-char (point-max)) (forward-line -1) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2532 (while (looking-at "=*\n") |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2533 (delete-char (- (match-end 0) (match-beginning 0))) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2534 (forward-line -1)) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2535 (goto-char (point-min)) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2536 (if (looking-at "[\b\t\n\v\f\r ]+") |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2537 (delete-char (- (match-end 0) (match-beginning 0)))) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2538 (goto-char (point-min)) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2539 (re-search-forward separator nil t) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2540 (delete-region (point-min) (point)) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2541 (while (re-search-forward separator nil t) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2542 (delete-region (match-beginning 0) (match-end 0))))) |
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2543 |
927 | 2544 ;;;###autoload |
904 | 2545 (defun vc-revert-buffer () |
41071 | 2546 "Revert the current buffer's file to the version it was based on. |
952 | 2547 This asks for confirmation if the buffer contents are not identical |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2548 to that version. This function does not automatically pick up newer |
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2549 changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so." |
904 | 2550 (interactive) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2551 (vc-ensure-vc-buffer) |
43584
15030afab27a
(vc-revert-buffer): If the buffer is not saved, prompt the user to do
André Spiegel <spiegel@gnu.org>
parents:
43532
diff
changeset
|
2552 ;; Make sure buffer is saved. If the user says `no', abort since |
15030afab27a
(vc-revert-buffer): If the buffer is not saved, prompt the user to do
André Spiegel <spiegel@gnu.org>
parents:
43532
diff
changeset
|
2553 ;; we cannot show the changes and ask for confirmation to discard them. |
15030afab27a
(vc-revert-buffer): If the buffer is not saved, prompt the user to do
André Spiegel <spiegel@gnu.org>
parents:
43532
diff
changeset
|
2554 (vc-buffer-sync nil) |
904 | 2555 (let ((file buffer-file-name) |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
2556 ;; This operation should always ask for confirmation. |
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
2557 (vc-suppress-confirm nil) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2558 (obuf (current-buffer)) |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2559 status) |
33548
714a4c4917cd
(vc-revert-buffer): Ask for confirmation if file seems up-to-date.
André Spiegel <spiegel@gnu.org>
parents:
33546
diff
changeset
|
2560 (if (vc-up-to-date-p file) |
714a4c4917cd
(vc-revert-buffer): Ask for confirmation if file seems up-to-date.
André Spiegel <spiegel@gnu.org>
parents:
33546
diff
changeset
|
2561 (unless (yes-or-no-p "File seems up-to-date. Revert anyway? ") |
714a4c4917cd
(vc-revert-buffer): Ask for confirmation if file seems up-to-date.
André Spiegel <spiegel@gnu.org>
parents:
33546
diff
changeset
|
2562 (error "Revert canceled"))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2563 (unless (vc-workfile-unchanged-p file) |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
2564 (message "Finding changes...") |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2565 ;; vc-diff selects the new window, which is not what we want: |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2566 ;; if the new window is on another frame, that'd require the user |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2567 ;; moving her mouse to answer the yes-or-no-p question. |
59442
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
2568 (let* ((vc-disable-async-diff (not vc-allow-async-revert)) |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
2569 (win (save-selected-window |
37d47d9bf8b1
(vc-allow-async-revert): New user option.
André Spiegel <spiegel@gnu.org>
parents:
59011
diff
changeset
|
2570 (setq status (vc-diff nil t)) (selected-window)))) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2571 (vc-exec-after `(message nil)) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2572 (when status |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2573 (unwind-protect |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2574 (unless (yes-or-no-p "Discard changes? ") |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2575 (error "Revert canceled")) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2576 (select-window win) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2577 (if (one-window-p t) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2578 (if (window-dedicated-p (selected-window)) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2579 (make-frame-invisible)) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2580 (delete-window)))))) |
21329
58dc75416c30
(vc-revert-buffer): Rewrote handling of vc-diff buffer,
André Spiegel <spiegel@gnu.org>
parents:
21325
diff
changeset
|
2581 (set-buffer obuf) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2582 ;; Do the reverting |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2583 (message "Reverting %s..." file) |
32093
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2584 (vc-revert-file file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2585 (message "Reverting %s...done" file))) |
904 | 2586 |
43586
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2587 ;;;###autoload |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2588 (defun vc-update () |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2589 "Update the current buffer's file to the latest version on its branch. |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2590 If the file contains no changes, and is not locked, then this simply replaces |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2591 the working file with the latest version on its branch. If the file contains |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2592 changes, and the backend supports merging news, then any recent changes from |
43586
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2593 the current branch are merged into the working file." |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2594 (interactive) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2595 (vc-ensure-vc-buffer) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2596 (vc-buffer-sync nil) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2597 (let ((file buffer-file-name)) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2598 (if (vc-up-to-date-p file) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2599 (vc-checkout file nil "") |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2600 (if (eq (vc-checkout-model file) 'locking) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2601 (if (eq (vc-state file) 'edited) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2602 (error |
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2603 (substitute-command-keys |
43586
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2604 "File is locked--type \\[vc-revert-buffer] to discard changes")) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2605 (error |
43586
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2606 (substitute-command-keys |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2607 "Unexpected file state (%s)--type \\[vc-next-action] to correct") |
43586
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2608 (vc-state file))) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2609 (if (not (vc-find-backend-function (vc-backend file) 'merge-news)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48964
diff
changeset
|
2610 (error "Sorry, merging news is not implemented for %s" |
43586
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2611 (vc-backend file)) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2612 (vc-call merge-news file) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2613 (vc-resynch-window file t t)))))) |
62c8a228bc1f
(vc-update): New function.
André Spiegel <spiegel@gnu.org>
parents:
43584
diff
changeset
|
2614 |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2615 (defun vc-version-backup-file (file &optional rev) |
33564
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
2616 "Return name of backup file for revision REV of FILE. |
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
2617 If version backups should be used for FILE, and there exists |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2618 such a backup for REV or the current workfile version of file, |
33564
d8c822512b62
(vc-version-diff): Bind inhibit-read-only when inserting text.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33562
diff
changeset
|
2619 return its name; otherwise return nil." |
32748
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2620 (when (vc-call make-version-backups-p file) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2621 (let ((backup-file (vc-version-backup-file-name file rev))) |
32748
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2622 (if (file-exists-p backup-file) |
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2623 backup-file |
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2624 ;; there is no automatic backup, but maybe the user made one manually |
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2625 (setq backup-file (vc-version-backup-file-name file rev 'manual)) |
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2626 (if (file-exists-p backup-file) |
e2cb0aef151a
(vc-checkout): Added `-p' suffix in call to vc-make-version-backups-p;
André Spiegel <spiegel@gnu.org>
parents:
32344
diff
changeset
|
2627 backup-file))))) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2628 |
67574
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2629 (defun vc-default-revert (backend file contents-done) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2630 (unless contents-done |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2631 (let ((rev (vc-workfile-version file)) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2632 (file-buffer (or (get-file-buffer file) (current-buffer)))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2633 (message "Checking out %s..." file) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2634 (let ((failed t) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2635 (backup-name (car (find-backup-file-name file)))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2636 (when backup-name |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2637 (copy-file file backup-name 'ok-if-already-exists 'keep-date) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2638 (unless (file-writable-p file) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2639 (set-file-modes file (logior (file-modes file) 128)))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2640 (unwind-protect |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2641 (let ((coding-system-for-read 'no-conversion) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2642 (coding-system-for-write 'no-conversion)) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2643 (with-temp-file file |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2644 (let ((outbuf (current-buffer))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2645 ;; Change buffer to get local value of vc-checkout-switches. |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2646 (with-current-buffer file-buffer |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2647 (let ((default-directory (file-name-directory file))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2648 (vc-call find-version file rev outbuf))))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2649 (setq failed nil)) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2650 (when backup-name |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2651 (if failed |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2652 (rename-file backup-name file 'ok-if-already-exists) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2653 (and (not vc-make-backup-files) (delete-file backup-name)))))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2654 (message "Checking out %s...done" file)))) |
9c4c9e375003
(vc-default-revert): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67552
diff
changeset
|
2655 |
32093
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2656 (defun vc-revert-file (file) |
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2657 "Revert FILE back to the version it was based on." |
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2658 (with-vc-properties |
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2659 file |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2660 (let ((backup-file (vc-version-backup-file file))) |
39000
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
2661 (when backup-file |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2662 (copy-file backup-file file 'ok-if-already-exists 'keep-date) |
39000
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
2663 (vc-delete-automatic-version-backups file)) |
60cf6aee9fd1
(vc-revert-file): Call the backend even if the FILE's
André Spiegel <spiegel@gnu.org>
parents:
38726
diff
changeset
|
2664 (vc-call revert file backup-file)) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2665 `((vc-state . up-to-date) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2666 (vc-checkout-time . ,(nth 5 (file-attributes file))))) |
32093
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2667 (vc-resynch-buffer file t t)) |
5c36fa51ee96
(vc-revert-file): New function.
André Spiegel <spiegel@gnu.org>
parents:
32069
diff
changeset
|
2668 |
927 | 2669 ;;;###autoload |
904 | 2670 (defun vc-cancel-version (norevert) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2671 "Get rid of most recently checked in version of this file. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2672 A prefix argument NOREVERT means do not revert the buffer afterwards." |
904 | 2673 (interactive "P") |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2674 (vc-ensure-vc-buffer) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2675 (let* ((file buffer-file-name) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2676 (backend (vc-backend file)) |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2677 (target (vc-workfile-version file))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2678 (cond |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2679 ((not (vc-find-backend-function backend 'cancel-version)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2680 (error "Sorry, canceling versions is not supported under %s" backend)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2681 ((not (vc-call latest-on-branch-p file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2682 (error "This is not the latest version; VC cannot cancel it")) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2683 ((not (vc-up-to-date-p file)) |
53874
978c77351d66
(with-vc-file): Fix unsafe uses of error.
Andreas Schwab <schwab@suse.de>
parents:
53839
diff
changeset
|
2684 (error "%s" (substitute-command-keys "File is not up to date; use \\[vc-revert-buffer] to discard changes")))) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
2685 (if (null (yes-or-no-p (format "Remove version %s from master? " target))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2686 (error "Aborted") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2687 (setq norevert (or norevert (not |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2688 (yes-or-no-p "Revert buffer to most recent remaining version? ")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2689 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2690 (message "Removing last change from %s..." file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2691 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2692 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2693 (vc-call cancel-version file norevert) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2694 `((vc-state . ,(if norevert 'edited 'up-to-date)) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
2695 (vc-checkout-time . ,(if norevert |
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
2696 0 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2697 (nth 5 (file-attributes file)))) |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2698 (vc-workfile-version . nil))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2699 (message "Removing last change from %s...done" file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2700 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2701 (cond |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2702 (norevert ;; clear version headers and mark the buffer modified |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2703 (set-visited-file-name file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2704 (when (not vc-make-backup-files) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2705 ;; inhibit backup for this buffer |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2706 (make-local-variable 'backup-inhibited) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2707 (setq backup-inhibited t)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2708 (setq buffer-read-only nil) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2709 (vc-clear-headers) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2710 (vc-mode-line file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2711 (vc-dired-resynch-file file)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2712 (t ;; revert buffer to file on disk |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2713 (vc-resynch-buffer file t t))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2714 (message "Version %s has been removed from the master" target)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2715 |
38595
396f97177ef1
(vc-switch-backend): Fix autoload cookie.
Gerd Moellmann <gerd@gnu.org>
parents:
38442
diff
changeset
|
2716 ;;;###autoload |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2717 (defun vc-switch-backend (file backend) |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2718 "Make BACKEND the current version control system for FILE. |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2719 FILE must already be registered in BACKEND. The change is not |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2720 permanent, only for the current session. This function only changes |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2721 VC's perspective on FILE, it does not register or unregister it. |
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2722 By default, this command cycles through the registered backends. |
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2723 To get a prompt, use a prefix argument." |
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2724 (interactive |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2725 (list |
66549
13a55a7627fd
(vc-switch-backend): Better error message if the buffer is not visiting a
André Spiegel <spiegel@gnu.org>
parents:
66425
diff
changeset
|
2726 (or buffer-file-name |
13a55a7627fd
(vc-switch-backend): Better error message if the buffer is not visiting a
André Spiegel <spiegel@gnu.org>
parents:
66425
diff
changeset
|
2727 (error "There is no version-controlled file in this buffer")) |
32058
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2728 (let ((backend (vc-backend buffer-file-name)) |
4196f89984ce
* vc.el (vc-editable-p): Minor optimization.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32054
diff
changeset
|
2729 (backends nil)) |
73445
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2730 (unwind-protect |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2731 (progn |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2732 (unless backend |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2733 (error "File %s is not under version control" buffer-file-name)) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2734 ;; Find the registered backends. |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2735 (dolist (backend vc-handled-backends) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2736 (when (vc-call-backend backend 'registered buffer-file-name) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2737 (push backend backends))) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2738 ;; Find the next backend. |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2739 (let ((def (car (delq backend |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2740 (append (memq backend backends) backends)))) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2741 (others (delete backend backends))) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2742 (cond |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2743 ((null others) (error "No other backend to switch to")) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2744 (current-prefix-arg |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2745 (intern |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2746 (upcase |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2747 (completing-read |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2748 (format "Switch to backend [%s]: " def) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2749 (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2750 nil t nil nil (downcase (symbol-name def)))))) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2751 (t def)))) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2752 ;; Calling the `registered' method can mess up the file |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2753 ;; properties, so we want to revert them to what they were. |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2754 (if (and backend (delete backend backends)) |
59e895845146
(vc-switch-backend): Try to be more careful with unwanted
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
71791
diff
changeset
|
2755 (vc-call-backend backend 'registered buffer-file-name)))))) |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2756 (unless (eq backend (vc-backend file)) |
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2757 (vc-file-clearprops file) |
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2758 (vc-file-setprop file 'vc-backend backend) |
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2759 ;; Force recomputation of the state |
32189
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2760 (unless (vc-call-backend backend 'registered file) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2761 (vc-file-clearprops file) |
921a2e8fa97e
(with-vc-properties): Use conses rather than length-2 lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32126
diff
changeset
|
2762 (error "%s is not registered in %s" file backend)) |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2763 (vc-mode-line file))) |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2764 |
38726
2dddcf515155
(vc-transfer-file): Fix malformed autoload cookie.
Gerd Moellmann <gerd@gnu.org>
parents:
38608
diff
changeset
|
2765 ;;;###autoload |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2766 (defun vc-transfer-file (file new-backend) |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2767 "Transfer FILE to another version control system NEW-BACKEND. |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2768 If NEW-BACKEND has a higher precedence than FILE's current backend |
32059
13e0fdf65e3c
(with-vc-file, vc-next-action-on-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32058
diff
changeset
|
2769 \(i.e. it comes earlier in `vc-handled-backends'), then register FILE in |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2770 NEW-BACKEND, using the version number from the current backend as the |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2771 base level. If NEW-BACKEND has a lower precedence than the current |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2772 backend, then commit all changes that were made under the current |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2773 backend to NEW-BACKEND, and unregister FILE from the current backend. |
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2774 \(If FILE is not yet registered under NEW-BACKEND, register it.)" |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2775 (let* ((old-backend (vc-backend file)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2776 (edited (memq (vc-state file) '(edited needs-merge))) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2777 (registered (vc-call-backend new-backend 'registered file)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2778 (move |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2779 (and registered ; Never move if not registered in new-backend yet. |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2780 ;; move if new-backend comes later in vc-handled-backends |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2781 (or (memq new-backend (memq old-backend vc-handled-backends)) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2782 (y-or-n-p "Final transfer? ")))) |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2783 (comment nil)) |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2784 (if (eq old-backend new-backend) |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2785 (error "%s is the current backend of %s" new-backend file)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2786 (if registered |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2787 (set-file-modes file (logior (file-modes file) 128)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2788 ;; `registered' might have switched under us. |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2789 (vc-switch-backend file old-backend) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2790 (let* ((rev (vc-workfile-version file)) |
43725
60a9d71aad02
(vc-transfer-file): Use `make-temp-file' instead of `make-temp-name'.
André Spiegel <spiegel@gnu.org>
parents:
43586
diff
changeset
|
2791 (modified-file (and edited (make-temp-file file))) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2792 (unmodified-file (and modified-file (vc-version-backup-file file)))) |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2793 ;; Go back to the base unmodified file. |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2794 (unwind-protect |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2795 (progn |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2796 (when modified-file |
43725
60a9d71aad02
(vc-transfer-file): Use `make-temp-file' instead of `make-temp-name'.
André Spiegel <spiegel@gnu.org>
parents:
43586
diff
changeset
|
2797 (copy-file file modified-file 'ok-if-already-exists) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2798 ;; If we have a local copy of the unmodified file, handle that |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2799 ;; here and not in vc-revert-file because we don't want to |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2800 ;; delete that copy -- it is still useful for OLD-BACKEND. |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2801 (if unmodified-file |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2802 (copy-file unmodified-file file |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2803 'ok-if-already-exists 'keep-date) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2804 (if (y-or-n-p "Get base version from master? ") |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2805 (vc-revert-file file)))) |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2806 (vc-call-backend new-backend 'receive-file file rev)) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2807 (when modified-file |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2808 (vc-switch-backend file new-backend) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2809 (unless (eq (vc-checkout-model file) 'implicit) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2810 (vc-checkout file t nil)) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2811 (rename-file modified-file file 'ok-if-already-exists) |
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2812 (vc-file-setprop file 'vc-checkout-time nil))))) |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2813 (when move |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2814 (vc-switch-backend file old-backend) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2815 (setq comment (vc-call comment-history file)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2816 (vc-call unregister file)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2817 (vc-switch-backend file new-backend) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2818 (when (or move edited) |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2819 (vc-file-setprop file 'vc-state 'edited) |
32126
3aab429d3c8a
(vc-revert-buffer): Handle empty diff properly.
André Spiegel <spiegel@gnu.org>
parents:
32097
diff
changeset
|
2820 (vc-mode-line file) |
32054
fef29341db1c
(vc-next-action-on-file): Update mode line only if file is visited.
André Spiegel <spiegel@gnu.org>
parents:
31836
diff
changeset
|
2821 (vc-checkin file nil comment (stringp comment))))) |
31810
495ca3bd372d
(vc-index-of, vc-transfer-file, vc-default-receive-file): New functions.
André Spiegel <spiegel@gnu.org>
parents:
31718
diff
changeset
|
2822 |
32097
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2823 (defun vc-default-unregister (backend file) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2824 "Default implementation of `vc-unregister', signals an error." |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2825 (error "Unregistering files is not supported for %s" backend)) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2826 |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2827 (defun vc-default-receive-file (backend file rev) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2828 "Let BACKEND receive FILE from another version control system." |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2829 (vc-call-backend backend 'register file rev "")) |
adf341c172af
(vc-transfer-file, vc-default-receive-file): Rewritten to factorize
André Spiegel <spiegel@gnu.org>
parents:
32093
diff
changeset
|
2830 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2831 (defun vc-rename-master (oldmaster newfile templates) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2832 "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2833 (let* ((dir (file-name-directory (expand-file-name oldmaster))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2834 (newdir (or (file-name-directory newfile) "")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2835 (newbase (file-name-nondirectory newfile)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2836 (masters |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2837 ;; List of potential master files for `newfile' |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2838 (mapcar |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2839 (lambda (s) (vc-possible-master s newdir newbase)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2840 templates))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2841 (if (or (file-symlink-p oldmaster) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2842 (file-symlink-p (file-name-directory oldmaster))) |
41071 | 2843 (error "This is unsafe in the presence of symbolic links")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2844 (rename-file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2845 oldmaster |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2846 (catch 'found |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2847 ;; If possible, keep the master file in the same directory. |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2848 (dolist (f masters) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2849 (if (and f (string= (file-name-directory (expand-file-name f)) dir)) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2850 (throw 'found f))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2851 ;; If not, just use the first possible place. |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2852 (dolist (f masters) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2853 (and f (or (not (setq dir (file-name-directory f))) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2854 (file-directory-p dir)) |
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2855 (throw 'found f))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2856 (error "New file lacks a version control directory"))))) |
904 | 2857 |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2858 (defun vc-delete-file (file) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2859 "Delete file and mark it as such in the version control system." |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2860 (interactive "fVC delete file: ") |
51245
f6920b201e1c
(vc-delete-file): Fix free variable reference.
André Spiegel <spiegel@gnu.org>
parents:
51064
diff
changeset
|
2861 (let ((buf (get-file-buffer file)) |
f6920b201e1c
(vc-delete-file): Fix free variable reference.
André Spiegel <spiegel@gnu.org>
parents:
51064
diff
changeset
|
2862 (backend (vc-backend file))) |
f6920b201e1c
(vc-delete-file): Fix free variable reference.
André Spiegel <spiegel@gnu.org>
parents:
51064
diff
changeset
|
2863 (unless backend |
51627
1329f6a6c949
(vc-rename-file): Fix typo.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51369
diff
changeset
|
2864 (error "File %s is not under version control" |
51245
f6920b201e1c
(vc-delete-file): Fix free variable reference.
André Spiegel <spiegel@gnu.org>
parents:
51064
diff
changeset
|
2865 (file-name-nondirectory file))) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2866 (unless (vc-find-backend-function backend 'delete-file) |
51245
f6920b201e1c
(vc-delete-file): Fix free variable reference.
André Spiegel <spiegel@gnu.org>
parents:
51064
diff
changeset
|
2867 (error "Deleting files under %s is not supported in VC" backend)) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2868 (if (and buf (buffer-modified-p buf)) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2869 (error "Please save files before deleting them")) |
65689
96187e7edd1b
2005-09-25 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents:
65680
diff
changeset
|
2870 (unless (y-or-n-p (format "Really want to delete %s? " |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2871 (file-name-nondirectory file))) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2872 (error "Abort!")) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2873 (unless (or (file-directory-p file) (null make-backup-files)) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2874 (with-current-buffer (or buf (find-file-noselect file)) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2875 (let ((backup-inhibited nil)) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2876 (backup-buffer)))) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2877 (vc-call delete-file file) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2878 ;; If the backend hasn't deleted the file itself, let's do it for him. |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2879 (if (file-exists-p file) (delete-file file)))) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2880 |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2881 (defun vc-default-rename-file (backend old new) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2882 (condition-case nil |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2883 (add-name-to-file old new) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2884 (error (rename-file old new))) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2885 (vc-delete-file old) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2886 (with-current-buffer (find-file-noselect new) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2887 (vc-register))) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2888 |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
2889 ;;;###autoload |
904 | 2890 (defun vc-rename-file (old new) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2891 "Rename file OLD to NEW, and rename its master file likewise." |
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2892 (interactive "fVC rename file: \nFRename to: ") |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2893 (let ((oldbuf (get-file-buffer old))) |
4991
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
2894 (if (and oldbuf (buffer-modified-p oldbuf)) |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
2895 (error "Please save files before moving them")) |
904 | 2896 (if (get-file-buffer new) |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
2897 (error "Already editing new file name")) |
4991
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
2898 (if (file-exists-p new) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
2899 (error "New file already exists")) |
51627
1329f6a6c949
(vc-rename-file): Fix typo.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51369
diff
changeset
|
2900 (let ((state (vc-state old))) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2901 (unless (memq state '(up-to-date edited)) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2902 (error "Please %s files before moving them" |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2903 (if (stringp state) "check in" "update")))) |
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2904 (vc-call rename-file old new) |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
2905 (vc-file-clearprops old) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2906 ;; Move the actual file (unless the backend did it already) |
50926
dd6110a63907
New backend functions `delete-file' and `repository-hostname'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50894
diff
changeset
|
2907 (if (file-exists-p old) (rename-file old new)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2908 ;; ?? Renaming a file might change its contents due to keyword expansion. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2909 ;; We should really check out a new copy if the old copy was precisely equal |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2910 ;; to some checked in version. However, testing for this is tricky.... |
904 | 2911 (if oldbuf |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2912 (with-current-buffer oldbuf |
15227
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
2913 (let ((buffer-read-only buffer-read-only)) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
2914 (set-visited-file-name new)) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
2915 (vc-backend new) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
2916 (vc-mode-line new) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2917 (set-buffer-modified-p nil))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2918 |
927 | 2919 ;;;###autoload |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
2920 (defun vc-update-change-log (&rest args) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2921 "Find change log file and add entries from recent version control logs. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2922 Normally, find log entries for all registered files in the default |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2923 directory. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2924 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2925 With prefix arg of \\[universal-argument], only find log entries for the current buffer's file. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2926 |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2927 With any numeric prefix arg, find log entries for all currently visited |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2928 files that are under version control. This puts all the entries in the |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2929 log for the default directory, which may not be appropriate. |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2930 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2931 From a program, any ARGS are assumed to be filenames for which |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2932 log entries should be gathered." |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2933 (interactive |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2934 (cond ((consp current-prefix-arg) ;C-u |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2935 (list buffer-file-name)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2936 (current-prefix-arg ;Numeric argument. |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2937 (let ((files nil) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2938 (buffers (buffer-list)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2939 file) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2940 (while buffers |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2941 (setq file (buffer-file-name (car buffers))) |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
2942 (and file (vc-backend file) |
3939
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
2943 (setq files (cons file files))) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2944 (setq buffers (cdr buffers))) |
3939
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
2945 files)) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
2946 (t |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2947 ;; Don't supply any filenames to backend; this means |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2948 ;; it should find all relevant files relative to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2949 ;; the default-directory. |
15977
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
2950 nil))) |
65405
ae5763b55d33
(vc-directory, vc-update-change-log): Throw an error on the attempt to
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
2951 (dolist (file (or args (list default-directory))) |
ae5763b55d33
(vc-directory, vc-update-change-log): Throw an error on the attempt to
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
2952 (if (eq (string-match tramp-file-name-regexp file) 0) |
ae5763b55d33
(vc-directory, vc-update-change-log): Throw an error on the attempt to
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
2953 (error "Sorry, vc-update-change-log does not work over Tramp"))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2954 (vc-call-backend (vc-responsible-backend default-directory) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2955 'update-changelog args)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2956 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2957 (defun vc-default-update-changelog (backend files) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2958 "Default implementation of update-changelog. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2959 Uses `rcs2log' which only works for RCS and CVS." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2960 ;; FIXME: We (c|sh)ould add support for cvs2cl |
14053
c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
Karl Heuer <kwzh@gnu.org>
parents:
14040
diff
changeset
|
2961 (let ((odefault default-directory) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2962 (changelog (find-change-log)) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2963 ;; Presumably not portable to non-Unixy systems, along with rcs2log: |
43725
60a9d71aad02
(vc-transfer-file): Use `make-temp-file' instead of `make-temp-name'.
André Spiegel <spiegel@gnu.org>
parents:
43586
diff
changeset
|
2964 (tempfile (make-temp-file |
25488
48c997ce6c8d
(vc-update-change-log): Use small-temporary-file-directory when non-nil.
Eli Zaretskii <eliz@gnu.org>
parents:
25406
diff
changeset
|
2965 (expand-file-name "vc" |
48c997ce6c8d
(vc-update-change-log): Use small-temporary-file-directory when non-nil.
Eli Zaretskii <eliz@gnu.org>
parents:
25406
diff
changeset
|
2966 (or small-temporary-file-directory |
48c997ce6c8d
(vc-update-change-log): Use small-temporary-file-directory when non-nil.
Eli Zaretskii <eliz@gnu.org>
parents:
25406
diff
changeset
|
2967 temporary-file-directory)))) |
68384
1d4de26bcb1f
(vc-default-dired-state-info): Pass FILE to vc-user-login-name.
André Spiegel <spiegel@gnu.org>
parents:
67885
diff
changeset
|
2968 (login-name (or user-login-name |
1d4de26bcb1f
(vc-default-dired-state-info): Pass FILE to vc-user-login-name.
André Spiegel <spiegel@gnu.org>
parents:
67885
diff
changeset
|
2969 (format "uid%d" (number-to-string (user-uid))))) |
14855
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
2970 (full-name (or add-log-full-name |
16743
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2971 (user-full-name) |
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2972 (user-login-name) |
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2973 (format "uid%d" (number-to-string (user-uid))))) |
14855
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
2974 (mailing-address (or add-log-mailing-address |
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
2975 user-mail-address))) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2976 (find-file-other-window changelog) |
3905
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2977 (barf-if-buffer-read-only) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2978 (vc-buffer-sync) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2979 (undo-boundary) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2980 (goto-char (point-min)) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2981 (push-mark) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2982 (message "Computing change log entries...") |
3939
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
2983 (message "Computing change log entries... %s" |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2984 (unwind-protect |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2985 (progn |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2986 (setq default-directory odefault) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2987 (if (eq 0 (apply 'call-process |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2988 (expand-file-name "rcs2log" |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2989 exec-directory) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2990 nil (list t tempfile) nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2991 "-c" changelog |
68384
1d4de26bcb1f
(vc-default-dired-state-info): Pass FILE to vc-user-login-name.
André Spiegel <spiegel@gnu.org>
parents:
67885
diff
changeset
|
2992 "-u" (concat login-name |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2993 "\t" full-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2994 "\t" mailing-address) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2995 (mapcar |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2996 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2997 (file-relative-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2998 (if (file-name-absolute-p f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2999 f |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3000 (concat odefault f)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3001 files))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3002 "done" |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3003 (pop-to-buffer (get-buffer-create "*vc*")) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
3004 (erase-buffer) |
59011
816dc38b1981
(vc-default-update-changelog): Use insert-file-contents, rather than
André Spiegel <spiegel@gnu.org>
parents:
58642
diff
changeset
|
3005 (insert-file-contents tempfile) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
3006 "failed")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3007 (setq default-directory (file-name-directory changelog)) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
3008 (delete-file tempfile))))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3009 |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3010 ;; Annotate functionality |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3011 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
3012 ;; Declare globally instead of additional parameter to |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
3013 ;; temp-buffer-show-function (not possible to pass more than one |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3014 ;; parameter). The use of annotate-ratio is deprecated in favor of |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3015 ;; annotate-mode, which replaces it with the more sensible "span-to |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3016 ;; days", along with autoscaling support. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
3017 (defvar vc-annotate-ratio nil "Global variable.") |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
3018 |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3019 ;; internal buffer-local variables |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3020 (defvar vc-annotate-backend nil) |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3021 (defvar vc-annotate-parent-file nil) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3022 (defvar vc-annotate-parent-rev nil) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3023 (defvar vc-annotate-parent-display-mode nil) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3024 |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3025 (defconst vc-annotate-font-lock-keywords |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3026 ;; The fontification is done by vc-annotate-lines instead of font-lock. |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3027 '((vc-annotate-lines))) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3028 |
53663
34fd515d8bb8
(vc-annotate-mode): Inherit from fundamental-mode and activate
André Spiegel <spiegel@gnu.org>
parents:
53630
diff
changeset
|
3029 (define-derived-mode vc-annotate-mode fundamental-mode "Annotate" |
41071 | 3030 "Major mode for output buffers of the `vc-annotate' command. |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3031 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3032 You can use the mode-specific menu to alter the time-span of the used |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3033 colors. See variable `vc-annotate-menu-elements' for customizing the |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3034 menu items." |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3035 (set (make-local-variable 'truncate-lines) t) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3036 (set (make-local-variable 'font-lock-defaults) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3037 '(vc-annotate-font-lock-keywords t)) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3038 (view-mode 1)) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3039 |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3040 (defun vc-annotate-display-default (ratio) |
41071 | 3041 "Display the output of \\[vc-annotate] using the default color range. |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3042 The color range is given by `vc-annotate-color-map', scaled by RATIO. |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3043 The current time is used as the offset." |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3044 (interactive (progn (kill-local-variable 'vc-annotate-color-map) '(1.0))) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
3045 (message "Redisplaying annotation...") |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3046 (vc-annotate-display ratio) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
3047 (message "Redisplaying annotation...done")) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3048 |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3049 (defun vc-annotate-oldest-in-map (color-map) |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3050 "Return the oldest time in the COLOR-MAP." |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3051 ;; Since entries should be sorted, we can just use the last one. |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3052 (caar (last color-map))) |
67767
f4a3c7808545
(vc-annotate-car-last-cons): Defn moved up.
Richard M. Stallman <rms@gnu.org>
parents:
67755
diff
changeset
|
3053 |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3054 (defun vc-annotate-display-autoscale (&optional full) |
57114
deddb5e7acc3
(annotate-time): Document point handling.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56952
diff
changeset
|
3055 "Highlight the output of \\[vc-annotate] using an autoscaled color map. |
41071 | 3056 Autoscaling means that the map is scaled from the current time to the |
57904
f6abcbacf62a
(vc-annotate-display-autoscale): Add prefix-arg
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57653
diff
changeset
|
3057 oldest annotation in the buffer, or, with prefix argument FULL, to |
41071 | 3058 cover the range from the oldest annotation to the newest." |
57904
f6abcbacf62a
(vc-annotate-display-autoscale): Add prefix-arg
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57653
diff
changeset
|
3059 (interactive "P") |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3060 (let ((newest 0.0) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3061 (oldest 999999.) ;Any CVS users at the founding of Rome? |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3062 (current (vc-annotate-convert-time (current-time))) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3063 date) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3064 (message "Redisplaying annotation...") |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3065 ;; Run through this file and find the oldest and newest dates annotated. |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3066 (save-excursion |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3067 (goto-char (point-min)) |
57906
ce81228800f3
(vc-annotate-display-autoscale): Make sure
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57904
diff
changeset
|
3068 (while (setq date (prog1 (vc-call-backend vc-annotate-backend |
ce81228800f3
(vc-annotate-display-autoscale): Make sure
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57904
diff
changeset
|
3069 'annotate-time) |
ce81228800f3
(vc-annotate-display-autoscale): Make sure
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57904
diff
changeset
|
3070 (forward-line 1))) |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3071 (if (> date newest) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3072 (setq newest date)) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3073 (if (< date oldest) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3074 (setq oldest date)))) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3075 (vc-annotate-display |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3076 (/ (- (if full newest current) oldest) |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3077 (vc-annotate-oldest-in-map vc-annotate-color-map)) |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3078 (if full newest)) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
3079 (message "Redisplaying annotation...done \(%s\)" |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
3080 (if full |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
3081 (format "Spanned from %.1f to %.1f days old" |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3082 (- current oldest) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3083 (- current newest)) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3084 (format "Spanned to %.1f days old" (- current oldest)))))) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3085 |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3086 ;; Menu -- Using easymenu.el |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3087 (easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3088 "VC Annotate Display Menu" |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3089 `("VC-Annotate" |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3090 ["By Color Map Range" (unless (null vc-annotate-display-mode) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3091 (setq vc-annotate-display-mode nil) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3092 (vc-annotate-display-select)) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3093 :style toggle :selected (null vc-annotate-display-mode)] |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3094 ,@(let ((oldest-in-map (vc-annotate-oldest-in-map vc-annotate-color-map))) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3095 (mapcar (lambda (element) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3096 (let ((days (* element oldest-in-map))) |
67882
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3097 `[,(format "Span %.1f days" days) |
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3098 (vc-annotate-display-select nil ,days) |
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3099 :style toggle :selected |
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3100 (eql vc-annotate-display-mode ,days) ])) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3101 vc-annotate-menu-elements)) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3102 ["Span ..." |
67882
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3103 (vc-annotate-display-select |
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3104 nil (float (string-to-number (read-string "Span how many days? "))))] |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3105 "--" |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3106 ["Span to Oldest" |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3107 (unless (eq vc-annotate-display-mode 'scale) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3108 (vc-annotate-display-select nil 'scale)) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3109 :style toggle :selected |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3110 (eq vc-annotate-display-mode 'scale)] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3111 ["Span Oldest->Newest" |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3112 (unless (eq vc-annotate-display-mode 'fullscale) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3113 (vc-annotate-display-select nil 'fullscale)) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3114 :style toggle :selected |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3115 (eq vc-annotate-display-mode 'fullscale)] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3116 "--" |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3117 ["Annotate previous revision" vc-annotate-prev-version] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3118 ["Annotate next revision" vc-annotate-next-version] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3119 ["Annotate revision at line" vc-annotate-revision-at-line] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3120 ["Annotate revision previous to line" vc-annotate-revision-previous-to-line] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3121 ["Annotate latest revision" vc-annotate-workfile-version] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3122 ["Show log of revision at line" vc-annotate-show-log-revision-at-line] |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3123 ["Show diff of revision at line" vc-annotate-show-diff-revision-at-line])) |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3124 |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3125 (defun vc-annotate-display-select (&optional buffer mode) |
41071 | 3126 "Highlight the output of \\[vc-annotate]. |
3127 By default, the current buffer is highlighted, unless overridden by | |
3128 BUFFER. `vc-annotate-display-mode' specifies the highlighting mode to | |
3129 use; you may override this using the second optional arg MODE." | |
3130 (interactive) | |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3131 (if mode (setq vc-annotate-display-mode mode)) |
69943
7d69833e0c1a
(vc-ensure-vc-buffer): Only change current-buffer, not the window config.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69939
diff
changeset
|
3132 (pop-to-buffer (or buffer (current-buffer))) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3133 (cond ((null vc-annotate-display-mode) |
67882
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3134 ;; The ratio is global, thus relative to the global color-map. |
59639203f09a
(vc-annotate-mode-map): Remove obsolete binding.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67767
diff
changeset
|
3135 (kill-local-variable 'vc-annotate-color-map) |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3136 (vc-annotate-display-default (or vc-annotate-ratio 1.0))) |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3137 ;; One of the auto-scaling modes |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3138 ((eq vc-annotate-display-mode 'scale) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3139 (vc-annotate-display-autoscale)) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3140 ((eq vc-annotate-display-mode 'fullscale) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3141 (vc-annotate-display-autoscale t)) |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3142 ((numberp vc-annotate-display-mode) ; A fixed number of days lookback |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3143 (vc-annotate-display-default |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3144 (/ vc-annotate-display-mode |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3145 (vc-annotate-oldest-in-map vc-annotate-color-map)))) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3146 (t (error "No such display mode: %s" |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3147 vc-annotate-display-mode)))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3148 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3149 ;;;###autoload |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3150 (defun vc-annotate (file rev &optional display-mode buf) |
63262
10744649cbb8
(vc-annotate): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62610
diff
changeset
|
3151 "Display the edit history of the current file using colors. |
39233
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3152 |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3153 This command creates a buffer that shows, for each line of the current |
63262
10744649cbb8
(vc-annotate): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62610
diff
changeset
|
3154 file, when it was last edited and by whom. Additionally, colors are |
39233
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3155 used to show the age of each line--blue means oldest, red means |
63262
10744649cbb8
(vc-annotate): Fix spellings in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
62610
diff
changeset
|
3156 youngest, and intermediate colors indicate intermediate ages. By |
39233
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3157 default, the time scale stretches back one year into the past; |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3158 everything that is older than that is shown in blue. |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3159 |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3160 With a prefix argument, this command asks two questions in the |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3161 minibuffer. First, you may enter a version number; then the buffer |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3162 displays and annotates that version instead of the current version |
39388 | 3163 \(type RET in the minibuffer to leave that default unchanged). Then, |
40440
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
3164 you are prompted for the time span in days which the color range |
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
3165 should cover. For example, a time span of 20 days means that changes |
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
3166 over the past 20 days are shown in red to blue, according to their |
6edf1e051b27
Mention vc-*-switches in backend API documentation.
André Spiegel <spiegel@gnu.org>
parents:
40181
diff
changeset
|
3167 age, and everything that is older than that is shown in blue. |
39233
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3168 |
a4c35b208150
(vc-annotate): Rewrote doc string.
André Spiegel <spiegel@gnu.org>
parents:
39117
diff
changeset
|
3169 Customization variables: |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3170 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3171 `vc-annotate-menu-elements' customizes the menu elements of the |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3172 mode-specific menu. `vc-annotate-color-map' and |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3173 `vc-annotate-very-old-color' defines the mapping of time to |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3174 colors. `vc-annotate-background' specifies the background color." |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3175 (interactive |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3176 (save-current-buffer |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3177 (vc-ensure-vc-buffer) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3178 (list buffer-file-name |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3179 (let ((def (vc-workfile-version buffer-file-name))) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3180 (if (null current-prefix-arg) def |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3181 (read-string |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3182 (format "Annotate from version (default %s): " def) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3183 nil nil def))) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3184 (if (null current-prefix-arg) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3185 vc-annotate-display-mode |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3186 (float (string-to-number |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3187 (read-string "Annotate span days (default 20): " |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3188 nil nil "20"))))))) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
3189 (vc-ensure-vc-buffer) |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3190 (setq vc-annotate-display-mode display-mode) ;Not sure why. --Stef |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3191 (let* ((temp-buffer-name (format "*Annotate %s (rev %s)*" (buffer-name) rev)) |
70007
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3192 (temp-buffer-show-function 'vc-annotate-display-select) |
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3193 ;; If BUF is specified, we presume the caller maintains current line, |
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3194 ;; so we don't need to do it here. This implementation may give |
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3195 ;; strange results occasionally in the case of REV != WORKFILE-REV. |
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3196 (current-line (unless buf (line-number-at-pos)))) |
33546
4f99fed47d24
(vc-annotate): Changed handling of prefix arg; now asks for both
André Spiegel <spiegel@gnu.org>
parents:
32950
diff
changeset
|
3197 (message "Annotating...") |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3198 ;; If BUF is specified it tells in which buffer we should put the |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3199 ;; annotations. This is used when switching annotations to another |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3200 ;; revision, so we should update the buffer's name. |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3201 (if buf (with-current-buffer buf |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3202 (rename-buffer temp-buffer-name t) |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3203 ;; In case it had to be uniquified. |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3204 (setq temp-buffer-name (buffer-name)))) |
32344
f91ef1141a75
(with-vc-file, edit-vc-file): Specify `indent-function' property.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
32310
diff
changeset
|
3205 (with-output-to-temp-buffer temp-buffer-name |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3206 (vc-call annotate-command file (get-buffer temp-buffer-name) rev) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3207 ;; we must setup the mode first, and then set our local |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3208 ;; variables before the show-function is called at the exit of |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3209 ;; with-output-to-temp-buffer |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3210 (with-current-buffer temp-buffer-name |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3211 (if (not (equal major-mode 'vc-annotate-mode)) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3212 (vc-annotate-mode)) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3213 (set (make-local-variable 'vc-annotate-backend) (vc-backend file)) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3214 (set (make-local-variable 'vc-annotate-parent-file) file) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3215 (set (make-local-variable 'vc-annotate-parent-rev) rev) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3216 (set (make-local-variable 'vc-annotate-parent-display-mode) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3217 display-mode))) |
70007
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3218 (when current-line |
19ab508f832f
(vc-annotate): Arrange for point to end up at the same
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
70006
diff
changeset
|
3219 (goto-line current-line temp-buffer-name)) |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3220 (message "Annotating... done"))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3221 |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3222 (defun vc-annotate-prev-version (prefix) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3223 "Visit the annotation of the version previous to this one. |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3224 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3225 With a numeric prefix argument, annotate the version that many |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3226 versions previous." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3227 (interactive "p") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3228 (vc-annotate-warp-version (- 0 prefix))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3229 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3230 (defun vc-annotate-next-version (prefix) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3231 "Visit the annotation of the version after this one. |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3232 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3233 With a numeric prefix argument, annotate the version that many |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3234 versions after." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3235 (interactive "p") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3236 (vc-annotate-warp-version prefix)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3237 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3238 (defun vc-annotate-workfile-version () |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3239 "Visit the annotation of the workfile version of this file." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3240 (interactive) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3241 (if (not (equal major-mode 'vc-annotate-mode)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3242 (message "Cannot be invoked outside of a vc annotate buffer") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3243 (let ((warp-rev (vc-workfile-version vc-annotate-parent-file))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3244 (if (equal warp-rev vc-annotate-parent-rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3245 (message "Already at version %s" warp-rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3246 (vc-annotate-warp-version warp-rev))))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3247 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3248 (defun vc-annotate-extract-revision-at-line () |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3249 "Extract the revision number of the current line." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3250 ;; This function must be invoked from a buffer in vc-annotate-mode |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3251 (vc-call-backend vc-annotate-backend 'annotate-extract-revision-at-line)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3252 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3253 (defun vc-annotate-revision-at-line () |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3254 "Visit the annotation of the version identified in the current line." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3255 (interactive) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3256 (if (not (equal major-mode 'vc-annotate-mode)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3257 (message "Cannot be invoked outside of a vc annotate buffer") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3258 (let ((rev-at-line (vc-annotate-extract-revision-at-line))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3259 (if (not rev-at-line) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3260 (message "Cannot extract revision number from the current line") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3261 (if (equal rev-at-line vc-annotate-parent-rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3262 (message "Already at version %s" rev-at-line) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3263 (vc-annotate-warp-version rev-at-line)))))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3264 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3265 (defun vc-annotate-revision-previous-to-line () |
54553
c862ab7552a4
(vc-print-log): backend-function may be a byte-compiled object, not a lambda
Sam Steingold <sds@gnu.org>
parents:
54530
diff
changeset
|
3266 "Visit the annotation of the version before the version at line." |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3267 (interactive) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3268 (if (not (equal major-mode 'vc-annotate-mode)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3269 (message "Cannot be invoked outside of a vc annotate buffer") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3270 (let ((rev-at-line (vc-annotate-extract-revision-at-line)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3271 (prev-rev nil)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3272 (if (not rev-at-line) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3273 (message "Cannot extract revision number from the current line") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3274 (setq prev-rev |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3275 (vc-call previous-version vc-annotate-parent-file rev-at-line)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3276 (vc-annotate-warp-version prev-rev))))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3277 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3278 (defun vc-annotate-show-log-revision-at-line () |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3279 "Visit the log of the version at line." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3280 (interactive) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3281 (if (not (equal major-mode 'vc-annotate-mode)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3282 (message "Cannot be invoked outside of a vc annotate buffer") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3283 (let ((rev-at-line (vc-annotate-extract-revision-at-line))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3284 (if (not rev-at-line) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3285 (message "Cannot extract revision number from the current line") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3286 (vc-print-log rev-at-line))))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3287 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3288 (defun vc-annotate-show-diff-revision-at-line () |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3289 "Visit the diff of the version at line from its previous version." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3290 (interactive) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3291 (if (not (equal major-mode 'vc-annotate-mode)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3292 (message "Cannot be invoked outside of a vc annotate buffer") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3293 (let ((rev-at-line (vc-annotate-extract-revision-at-line)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3294 (prev-rev nil)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3295 (if (not rev-at-line) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3296 (message "Cannot extract revision number from the current line") |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3297 (setq prev-rev |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3298 (vc-call previous-version vc-annotate-parent-file rev-at-line)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3299 (if (not prev-rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3300 (message "Cannot diff from any version prior to %s" rev-at-line) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3301 (save-window-excursion |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3302 (vc-version-diff vc-annotate-parent-file prev-rev rev-at-line)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3303 (switch-to-buffer "*vc-diff*")))))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3304 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3305 (defun vc-annotate-warp-version (revspec) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3306 "Annotate the version described by REVSPEC. |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3307 |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3308 If REVSPEC is a positive integer, warp that many versions |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3309 forward, if possible, otherwise echo a warning message. If |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3310 REVSPEC is a negative integer, warp that many versions backward, |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3311 if possible, otherwise echo a warning message. If REVSPEC is a |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3312 string, then it describes a revision number, so warp to that |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3313 revision." |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3314 (if (not (equal major-mode 'vc-annotate-mode)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3315 (message "Cannot be invoked outside of a vc annotate buffer") |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3316 (let* ((buf (current-buffer)) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3317 (oldline (line-number-at-pos)) |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3318 (revspeccopy revspec) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3319 (newrev nil)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3320 (cond |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3321 ((and (integerp revspec) (> revspec 0)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3322 (setq newrev vc-annotate-parent-rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3323 (while (and (> revspec 0) newrev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3324 (setq newrev (vc-call next-version |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3325 vc-annotate-parent-file newrev)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3326 (setq revspec (1- revspec))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3327 (if (not newrev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3328 (message "Cannot increment %d versions from version %s" |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3329 revspeccopy vc-annotate-parent-rev))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3330 ((and (integerp revspec) (< revspec 0)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3331 (setq newrev vc-annotate-parent-rev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3332 (while (and (< revspec 0) newrev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3333 (setq newrev (vc-call previous-version |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3334 vc-annotate-parent-file newrev)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3335 (setq revspec (1+ revspec))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3336 (if (not newrev) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3337 (message "Cannot decrement %d versions from version %s" |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3338 (- 0 revspeccopy) vc-annotate-parent-rev))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3339 ((stringp revspec) (setq newrev revspec)) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3340 (t (error "Invalid argument to vc-annotate-warp-version"))) |
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3341 (when newrev |
67755
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3342 (vc-annotate vc-annotate-parent-file newrev |
0cdb122ad4db
Remove unnecessary leading * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67578
diff
changeset
|
3343 vc-annotate-parent-display-mode |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3344 buf) |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3345 (goto-line (min oldline (progn (goto-char (point-max)) |
78599
3ec4d1da6eeb
(vc-annotate-warp-version): Don't use previous-line.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78492
diff
changeset
|
3346 (forward-line -1) |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3347 (line-number-at-pos))) buf))))) |
53630
2f41b6c48585
* vc.el (vc-default-previous-version): Doc enhancement.
André Spiegel <spiegel@gnu.org>
parents:
53283
diff
changeset
|
3348 |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3349 (defun vc-annotate-compcar (threshold a-list) |
41071 | 3350 "Test successive cons cells of A-LIST against THRESHOLD. |
3351 Return the first cons cell with a car that is not less than THRESHOLD, | |
3352 nil if no such cell exists." | |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3353 (let ((i 1) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3354 (tmp-cons (car a-list))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3355 (while (and tmp-cons (< (car tmp-cons) threshold)) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3356 (setq tmp-cons (car (nthcdr i a-list))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3357 (setq i (+ i 1))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3358 tmp-cons)) ; Return the appropriate value |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3359 |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3360 (defun vc-annotate-convert-time (time) |
41071 | 3361 "Convert a time value to a floating-point number of days. |
3362 The argument TIME is a list as returned by `current-time' or | |
3363 `encode-time', only the first two elements of that list are considered." | |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3364 (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600)) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3365 |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3366 (defun vc-annotate-difference (&optional offset) |
41071 | 3367 "Return the time span in days to the next annotation. |
3368 This calls the backend function annotate-time, and returns the | |
3369 difference in days between the time returned and the current time, | |
3370 or OFFSET if present." | |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3371 (let ((next-time (vc-call-backend vc-annotate-backend 'annotate-time))) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3372 (if next-time |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
3373 (- (or offset |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3374 (vc-call-backend vc-annotate-backend 'annotate-current-time)) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3375 next-time)))) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3376 |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3377 (defun vc-default-annotate-current-time (backend) |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3378 "Return the current time, encoded as fractional days." |
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3379 (vc-annotate-convert-time (current-time))) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
3380 |
51764
3c3b6501b4f1
(vc-annotate-offset): Move defvar up.
John Paul Wallington <jpw@pobox.com>
parents:
51762
diff
changeset
|
3381 (defvar vc-annotate-offset nil) |
3c3b6501b4f1
(vc-annotate-offset): Move defvar up.
John Paul Wallington <jpw@pobox.com>
parents:
51762
diff
changeset
|
3382 |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3383 (defun vc-annotate-display (ratio &optional offset) |
41071 | 3384 "Highlight `vc-annotate' output in the current buffer. |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3385 RATIO, is the expansion that should be applied to `vc-annotate-color-map'. |
49619
b48f8839a782
(vc-annotate-display, vc-checkout-carefully): Add obsolescence declaration and
Juanma Barranquero <lekktu@gmail.com>
parents:
49597
diff
changeset
|
3386 The annotations are relative to the current time, unless overridden by OFFSET." |
67885
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3387 (if (/= ratio 1.0) |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3388 (set (make-local-variable 'vc-annotate-color-map) |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3389 (mapcar (lambda (elem) (cons (* (car elem) ratio) (cdr elem))) |
e60b008e862d
(vc-annotate-display): Replace optional arg `color-map' with
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67882
diff
changeset
|
3390 vc-annotate-color-map))) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3391 (set (make-local-variable 'vc-annotate-offset) offset) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3392 (font-lock-mode 1)) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3393 |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3394 (defun vc-annotate-lines (limit) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3395 (let (difference) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3396 (while (and (< (point) limit) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3397 (setq difference (vc-annotate-difference vc-annotate-offset))) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3398 (let* ((color (or (vc-annotate-compcar difference vc-annotate-color-map) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3399 (cons nil vc-annotate-very-old-color))) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3400 ;; substring from index 1 to remove any leading `#' in the name |
70006
ccc2eb385394
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
69943
diff
changeset
|
3401 (face-name (concat "vc-annotate-face-" |
ccc2eb385394
Remove eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
69943
diff
changeset
|
3402 (if (string-equal |
69939
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3403 (substring (cdr color) 0 1) "#") |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3404 (substring (cdr color) 1) |
99dd1b3c0caa
(vc-annotate-display-mode): Made default 'fullscale.
J.D. Smith <jdsmith@as.arizona.edu>
parents:
68678
diff
changeset
|
3405 (cdr color)))) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3406 ;; Make the face if not done. |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3407 (face (or (intern-soft face-name) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3408 (let ((tmp-face (make-face (intern face-name)))) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3409 (set-face-foreground tmp-face (cdr color)) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3410 (if vc-annotate-background |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40850
diff
changeset
|
3411 (set-face-background tmp-face |
40170
115527dd1d27
Change scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40164
diff
changeset
|
3412 vc-annotate-background)) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3413 tmp-face))) ; Return the face |
50894
4dc2d45403ec
(with-vc-properties, with-vc-file, edit-vc-file):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49869
diff
changeset
|
3414 (point (point))) |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
3415 (forward-line 1) |
46481
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3416 (put-text-property point (point) 'face face))) |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3417 ;; Pretend to font-lock there were no matches. |
ddfd07bf63ec
(vc-default-comment-history): Hard code *vc*.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46454
diff
changeset
|
3418 nil)) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
3419 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
3420 ;; Collect back-end-dependent stuff here |
904 | 3421 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3422 (defalias 'vc-default-logentry-check 'ignore) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
3423 |
904 | 3424 (defun vc-check-headers () |
3425 "Check if the current file has any headers in it." | |
3426 (interactive) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3427 (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) |
904 | 3428 |
33562
7c20a27966ae
Updated backend documentation.
André Spiegel <spiegel@gnu.org>
parents:
33553
diff
changeset
|
3429 (defun vc-default-check-headers (backend) |
7c20a27966ae
Updated backend documentation.
André Spiegel <spiegel@gnu.org>
parents:
33553
diff
changeset
|
3430 "Default implementation of check-headers; always returns nil." |
7c20a27966ae
Updated backend documentation.
André Spiegel <spiegel@gnu.org>
parents:
33553
diff
changeset
|
3431 nil) |
7c20a27966ae
Updated backend documentation.
André Spiegel <spiegel@gnu.org>
parents:
33553
diff
changeset
|
3432 |
904 | 3433 ;; Back-end-dependent stuff ends here. |
3434 | |
3435 ;; Set up key bindings for use while editing log messages | |
3436 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3437 (defun vc-log-edit (file) |
47765
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3438 "Set up `log-edit' for use with VC on FILE." |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
3439 (setq default-directory |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
3440 (if file (file-name-directory file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
3441 (with-current-buffer vc-parent-buffer default-directory))) |
47765
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3442 (log-edit 'vc-finish-logentry nil |
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3443 (if file `(lambda () ',(list (file-name-nondirectory file))) |
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3444 ;; If FILE is nil, we were called from vc-dired. |
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3445 (lambda () |
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3446 (with-current-buffer vc-parent-buffer |
1dc1153f070a
(vc-log-mode-map): Explicitly inherit from text-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47760
diff
changeset
|
3447 (dired-get-marked-files t))))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3448 (set (make-local-variable 'vc-log-file) file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3449 (make-local-variable 'vc-log-version) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
3450 (set-buffer-modified-p nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3451 (setq buffer-file-name nil)) |
904 | 3452 |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3453 ;; These things should probably be generally available |
904 | 3454 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
3455 (defun vc-file-tree-walk (dirname func &rest args) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
3456 "Walk recursively through DIRNAME. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3457 Invoke FUNC f ARGS on each VC-managed file f underneath it." |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
3458 (vc-file-tree-walk-internal (expand-file-name dirname) func args) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
3459 (message "Traversing directory %s...done" dirname)) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
3460 |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
3461 (defun vc-file-tree-walk-internal (file func args) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
3462 (if (not (file-directory-p file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3463 (if (vc-backend file) (apply func file args)) |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
3464 (message "Traversing directory %s..." (abbreviate-file-name file)) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
3465 (let ((dir (file-name-as-directory file))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
3466 (mapcar |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3467 (lambda (f) (or |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3468 (string-equal f ".") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3469 (string-equal f "..") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3470 (member f vc-directory-exclusion-list) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3471 (let ((dirf (expand-file-name f dir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3472 (or |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3473 (file-symlink-p dirf);; Avoid possible loops |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3474 (vc-file-tree-walk-internal dirf func args))))) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
3475 (directory-files dir))))) |
904 | 3476 |
3477 (provide 'vc) | |
3478 | |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3479 ;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3480 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3481 ;; These may be useful to anyone who has to debug or extend the package. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3482 ;; (Note that this information corresponds to versions 5.x. Some of it |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3483 ;; might have been invalidated by the additions to support branching |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3484 ;; and RCS keyword lookup. AS, 1995/03/24) |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3485 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3486 ;; A fundamental problem in VC is that there are time windows between |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3487 ;; vc-next-action's computations of the file's version-control state and |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3488 ;; the actions that change it. This is a window open to lossage in a |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3489 ;; multi-user environment; someone else could nip in and change the state |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3490 ;; of the master during it. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3491 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3492 ;; The performance problem is that rlog/prs calls are very expensive; we want |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3493 ;; to avoid them as much as possible. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3494 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3495 ;; ANALYSIS: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3496 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3497 ;; The performance problem, it turns out, simplifies in practice to the |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3498 ;; problem of making vc-state fast. The two other functions that call |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3499 ;; prs/rlog will not be so commonly used that the slowdown is a problem; one |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3500 ;; makes snapshots, the other deletes the calling user's last change in the |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3501 ;; master. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3502 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3503 ;; The race condition implies that we have to either (a) lock the master |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3504 ;; during the entire execution of vc-next-action, or (b) detect and |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3505 ;; recover from errors resulting from dispatch on an out-of-date state. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3506 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3507 ;; Alternative (a) appears to be infeasible. The problem is that we can't |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3508 ;; guarantee that the lock will ever be removed. Suppose a user starts a |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3509 ;; checkin, the change message buffer pops up, and the user, having wandered |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3510 ;; off to do something else, simply forgets about it? |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3511 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3512 ;; Alternative (b), on the other hand, works well with a cheap way to speed up |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3513 ;; vc-state. Usually, if a file is registered, we can read its locked/ |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3514 ;; unlocked state and its current owner from its permissions. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3515 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3516 ;; This shortcut will fail if someone has manually changed the workfile's |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3517 ;; permissions; also if developers are munging the workfile in several |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3518 ;; directories, with symlinks to a master (in this latter case, the |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3519 ;; permissions shortcut will fail to detect a lock asserted from another |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3520 ;; directory). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3521 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3522 ;; Note that these cases correspond exactly to the errors which could happen |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3523 ;; because of a competing checkin/checkout race in between two instances of |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3524 ;; vc-next-action. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3525 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3526 ;; For VC's purposes, a workfile/master pair may have the following states: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3527 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3528 ;; A. Unregistered. There is a workfile, there is no master. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3529 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3530 ;; B. Registered and not locked by anyone. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3531 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3532 ;; C. Locked by calling user and unchanged. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3533 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3534 ;; D. Locked by the calling user and changed. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3535 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3536 ;; E. Locked by someone other than the calling user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3537 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3538 ;; This makes for 25 states and 20 error conditions. Here's the matrix: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3539 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3540 ;; VC's idea of state |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3541 ;; | |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3542 ;; V Actual state RCS action SCCS action Effect |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3543 ;; A B C D E |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3544 ;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3545 ;; B 5 . 6 7 8 co -l get -e checkout |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3546 ;; C 9 10 . 11 12 co -u unget; get revert |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3547 ;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3548 ;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3549 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3550 ;; All commands take the master file name as a last argument (not shown). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3551 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3552 ;; In the discussion below, a "self-race" is a pathological situation in |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3553 ;; which VC operations are being attempted simultaneously by two or more |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3554 ;; Emacsen running under the same username. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3555 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3556 ;; The vc-next-action code has the following windows: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3557 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3558 ;; Window P: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3559 ;; Between the check for existence of a master file and the call to |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3560 ;; admin/checkin in vc-buffer-admin (apparent state A). This window may |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3561 ;; never close if the initial-comment feature is on. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3562 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3563 ;; Window Q: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3564 ;; Between the call to vc-workfile-unchanged-p in and the immediately |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3565 ;; following revert (apparent state C). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3566 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3567 ;; Window R: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3568 ;; Between the call to vc-workfile-unchanged-p in and the following |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3569 ;; checkin (apparent state D). This window may never close. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3570 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3571 ;; Window S: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3572 ;; Between the unlock and the immediately following checkout during a |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3573 ;; revert operation (apparent state C). Included in window Q. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3574 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3575 ;; Window T: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3576 ;; Between vc-state and the following checkout (apparent state B). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3577 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3578 ;; Window U: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3579 ;; Between vc-state and the following revert (apparent state C). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3580 ;; Includes windows Q and S. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3581 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3582 ;; Window V: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3583 ;; Between vc-state and the following checkin (apparent state |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3584 ;; D). This window may never be closed if the user fails to complete the |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3585 ;; checkin message. Includes window R. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3586 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3587 ;; Window W: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3588 ;; Between vc-state and the following steal-lock (apparent |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3589 ;; state E). This window may never close if the user fails to complete |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3590 ;; the steal-lock message. Includes window X. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3591 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3592 ;; Window X: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3593 ;; Between the unlock and the immediately following re-lock during a |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3594 ;; steal-lock operation (apparent state E). This window may never close |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3595 ;; if the user fails to complete the steal-lock message. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3596 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3597 ;; Errors: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3598 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3599 ;; Apparent state A --- |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3600 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3601 ;; 1. File looked unregistered but is actually registered and not locked. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3602 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3603 ;; Potential cause: someone else's admin during window P, with |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3604 ;; caller's admin happening before their checkout. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3605 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3606 ;; RCS: Prior to version 5.6.4, ci fails with message |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3607 ;; "no lock set by <user>". From 5.6.4 onwards, VC uses the new |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3608 ;; ci -i option and the message is "<file>,v: already exists". |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3609 ;; SCCS: admin will fail with error (ad19). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3610 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3611 ;; We can let these errors be passed up to the user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3612 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3613 ;; 2. File looked unregistered but is actually locked by caller, unchanged. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3614 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3615 ;; Potential cause: self-race during window P. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3616 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3617 ;; RCS: Prior to version 5.6.4, reverts the file to the last saved |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3618 ;; version and unlocks it. From 5.6.4 onwards, VC uses the new |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3619 ;; ci -i option, failing with message "<file>,v: already exists". |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3620 ;; SCCS: will fail with error (ad19). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3621 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3622 ;; Either of these consequences is acceptable. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3623 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3624 ;; 3. File looked unregistered but is actually locked by caller, changed. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3625 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3626 ;; Potential cause: self-race during window P. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3627 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3628 ;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3629 ;; a delta with a null change comment (the -t- switch will be |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3630 ;; ignored). From 5.6.4 onwards, VC uses the new ci -i option, |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3631 ;; failing with message "<file>,v: already exists". |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3632 ;; SCCS: will fail with error (ad19). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3633 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3634 ;; 4. File looked unregistered but is locked by someone else. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3635 ;;; |
38374
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3636 ;; Potential cause: someone else's admin during window P, with |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3637 ;; caller's admin happening *after* their checkout. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3638 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3639 ;; RCS: Prior to version 5.6.4, ci fails with a |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3640 ;; "no lock set by <user>" message. From 5.6.4 onwards, |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3641 ;; VC uses the new ci -i option, failing with message |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3642 ;; "<file>,v: already exists". |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3643 ;; SCCS: will fail with error (ad19). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3644 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3645 ;; We can let these errors be passed up to the user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3646 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3647 ;; Apparent state B --- |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3648 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3649 ;; 5. File looked registered and not locked, but is actually unregistered. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3650 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3651 ;; Potential cause: master file got nuked during window P. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3652 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3653 ;; RCS: will fail with "RCS/<file>: No such file or directory" |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3654 ;; SCCS: will fail with error ut4. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3655 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3656 ;; We can let these errors be passed up to the user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3657 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3658 ;; 6. File looked registered and not locked, but is actually locked by the |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3659 ;; calling user and unchanged. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3660 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3661 ;; Potential cause: self-race during window T. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3662 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3663 ;; RCS: in the same directory as the previous workfile, co -l will fail |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3664 ;; with "co error: writable foo exists; checkout aborted". In any other |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3665 ;; directory, checkout will succeed. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3666 ;; SCCS: will fail with ge17. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3667 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3668 ;; Either of these consequences is acceptable. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3669 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3670 ;; 7. File looked registered and not locked, but is actually locked by the |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3671 ;; calling user and changed. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3672 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3673 ;; As case 6. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3674 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3675 ;; 8. File looked registered and not locked, but is actually locked by another |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3676 ;; user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3677 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3678 ;; Potential cause: someone else checks it out during window T. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3679 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3680 ;; RCS: co error: revision 1.3 already locked by <user> |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3681 ;; SCCS: fails with ge4 (in directory) or ut7 (outside it). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3682 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3683 ;; We can let these errors be passed up to the user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3684 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3685 ;; Apparent state C --- |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3686 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3687 ;; 9. File looks locked by calling user and unchanged, but is unregistered. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3688 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3689 ;; As case 5. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3690 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3691 ;; 10. File looks locked by calling user and unchanged, but is actually not |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3692 ;; locked. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3693 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3694 ;; Potential cause: a self-race in window U, or by the revert's |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3695 ;; landing during window X of some other user's steal-lock or window S |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3696 ;; of another user's revert. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3697 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3698 ;; RCS: succeeds, refreshing the file from the identical version in |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3699 ;; the master. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3700 ;; SCCS: fails with error ut4 (p file nonexistent). |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3701 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3702 ;; Either of these consequences is acceptable. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3703 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3704 ;; 11. File is locked by calling user. It looks unchanged, but is actually |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3705 ;; changed. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3706 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3707 ;; Potential cause: the file would have to be touched by a self-race |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3708 ;; during window Q. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3709 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3710 ;; The revert will succeed, removing whatever changes came with |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3711 ;; the touch. It is theoretically possible that work could be lost. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3712 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3713 ;; 12. File looks like it's locked by the calling user and unchanged, but |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3714 ;; it's actually locked by someone else. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3715 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3716 ;; Potential cause: a steal-lock in window V. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3717 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3718 ;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3719 ;; SCCS: fails with error un2 |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3720 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3721 ;; We can pass these errors up to the user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3722 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3723 ;; Apparent state D --- |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3724 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3725 ;; 13. File looks like it's locked by the calling user and changed, but it's |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3726 ;; actually unregistered. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3727 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3728 ;; Potential cause: master file got nuked during window P. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3729 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3730 ;; RCS: Prior to version 5.6.4, checks in the user's version as an |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3731 ;; initial delta. From 5.6.4 onwards, VC uses the new ci -j |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3732 ;; option, failing with message "no such file or directory". |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3733 ;; SCCS: will fail with error ut4. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3734 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3735 ;; This case is kind of nasty. Under RCS prior to version 5.6.4, |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3736 ;; VC may fail to detect the loss of previous version information. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3737 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3738 ;; 14. File looks like it's locked by the calling user and changed, but it's |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3739 ;; actually unlocked. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3740 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3741 ;; Potential cause: self-race in window V, or the checkin happening |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3742 ;; during the window X of someone else's steal-lock or window S of |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3743 ;; someone else's revert. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3744 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3745 ;; RCS: ci will fail with "no lock set by <user>". |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3746 ;; SCCS: delta will fail with error ut4. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3747 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3748 ;; 15. File looks like it's locked by the calling user and changed, but it's |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3749 ;; actually locked by the calling user and unchanged. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3750 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3751 ;; Potential cause: another self-race --- a whole checkin/checkout |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3752 ;; sequence by the calling user would have to land in window R. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3753 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3754 ;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3755 ;; RCS: reverts to the file state as of the second user's checkin, leaving |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3756 ;; the file unlocked. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3757 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3758 ;; It is theoretically possible that work could be lost under RCS. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3759 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3760 ;; 16. File looks like it's locked by the calling user and changed, but it's |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3761 ;; actually locked by a different user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3762 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3763 ;; RCS: ci error: no lock set by <user> |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3764 ;; SCCS: unget will fail with error un2 |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3765 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3766 ;; We can pass these errors up to the user. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3767 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3768 ;; Apparent state E --- |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3769 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3770 ;; 17. File looks like it's locked by some other user, but it's actually |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3771 ;; unregistered. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3772 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3773 ;; As case 13. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3774 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3775 ;; 18. File looks like it's locked by some other user, but it's actually |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3776 ;; unlocked. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3777 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3778 ;; Potential cause: someone released a lock during window W. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3779 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3780 ;; RCS: The calling user will get the lock on the file. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3781 ;; SCCS: unget -n will fail with cm4. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3782 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3783 ;; Either of these consequences will be OK. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3784 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3785 ;; 19. File looks like it's locked by some other user, but it's actually |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3786 ;; locked by the calling user and unchanged. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3787 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3788 ;; Potential cause: the other user relinquishing a lock followed by |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3789 ;; a self-race, both in window W. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3790 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3791 ;; Under both RCS and SCCS, both unlock and lock will succeed, making |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3792 ;; the sequence a no-op. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3793 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3794 ;; 20. File looks like it's locked by some other user, but it's actually |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3795 ;; locked by the calling user and changed. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3796 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3797 ;; As case 19. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3798 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3799 ;; PROBLEM CASES: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3800 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3801 ;; In order of decreasing severity: |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3802 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3803 ;; Cases 11 and 15 are the only ones that potentially lose work. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3804 ;; They would require a self-race for this to happen. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3805 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3806 ;; Case 13 in RCS loses information about previous deltas, retaining |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3807 ;; only the information in the current workfile. This can only happen |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3808 ;; if the master file gets nuked in window P. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3809 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3810 ;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3811 ;; no change comment in the master. This would require a self-race in |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3812 ;; window P or R respectively. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3813 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3814 ;; Cases 2, 10, 19 and 20 do extra work, but make no changes. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3815 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3816 ;; Unfortunately, it appears to me that no recovery is possible in these |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3817 ;; cases. They don't yield error messages, so there's no way to tell that |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3818 ;; a race condition has occurred. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3819 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3820 ;; All other cases don't change either the workfile or the master, and |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3821 ;; trigger command errors which the user will see. |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3822 ;; |
ee328ec2505c
(vc-prefix-map): Moved back to vc-hooks.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37544
diff
changeset
|
3823 ;; Thus, there is no explicit recovery code. |
904 | 3824 |
56952
1e43327f7457
(vc-buffer-context, vc-restore-buffer-context): Disable obsolete code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55100
diff
changeset
|
3825 ;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6 |
904 | 3826 ;;; vc.el ends here |