Commit | Line | Data |
---|---|---|
66321b2f | 1 | ;;; vc.el --- drive a version-control system from within Emacs |
594722a8 | 2 | |
0d30b337 | 3 | ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, |
d7a0267c | 4 | ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
594722a8 | 5 | |
0e362f54 GM |
6 | ;; Author: FSF (see below for full credits) |
7 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | |
284b3043 | 8 | ;; Keywords: tools |
594722a8 | 9 | |
ac3f4c6f | 10 | ;; $Id$ |
d7b60083 | 11 | |
594722a8 ER |
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 | |
b4aa6026 | 16 | ;; the Free Software Foundation; either version 3, or (at your option) |
594722a8 ER |
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 | |
b578f267 | 25 | ;; along with GNU Emacs; see the file COPYING. If not, write to the |
086add15 LK |
26 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
27 | ;; Boston, MA 02110-1301, USA. | |
594722a8 | 28 | |
0e362f54 GM |
29 | ;;; Credits: |
30 | ||
31 | ;; VC was initially designed and implemented by Eric S. Raymond | |
61de26cb | 32 | ;; <esr@thyrsus.com> in 1992. Over the years, many other people have |
0e362f54 | 33 | ;; contributed substantial amounts of work to VC. These include: |
61de26cb | 34 | ;; |
0e362f54 GM |
35 | ;; Per Cederqvist <ceder@lysator.liu.se> |
36 | ;; Paul Eggert <eggert@twinsun.com> | |
37 | ;; Sebastian Kremer <sk@thp.uni-koeln.de> | |
38 | ;; Martin Lorentzson <martinl@gnu.org> | |
166a0ef7 | 39 | ;; Dave Love <fx@gnu.org> |
0e362f54 | 40 | ;; Stefan Monnier <monnier@cs.yale.edu> |
6f1ecae4 | 41 | ;; J.D. Smith <jdsmith@alum.mit.edu> |
0e362f54 GM |
42 | ;; Andre Spiegel <spiegel@gnu.org> |
43 | ;; Richard Stallman <rms@gnu.org> | |
6f1ecae4 | 44 | ;; Thien-Thi Nguyen <ttn@gnu.org> |
61de26cb ER |
45 | ;; |
46 | ;; In July 2007 ESR returned and redesigned the mode to cope better | |
47 | ;; with modern version-control systems that do commits by fileset | |
48 | ;; rather than per individual file. | |
49 | ;; | |
50 | ;; Features in the new version: | |
51 | ;; * Key commands (vc-next-action = C-x v v, vc-print-log = C-x v l, vc-revert | |
52 | ;; = C-x v u, vc-rollback = C-x v c, vc-diff = C-x v =, vc-update = C-x v +) | |
53 | ;; now operate on filesets rather than individual files. | |
54 | ;; * The fileset for a command is either (a) all marked files in VC-dired | |
55 | ;; mode, (b) the currently visited file if it's under version control, | |
56 | ;; or (c) the current directory if the visited buffer is not under | |
57 | ;; version control and a wildcarding-enable flag has been set. | |
58 | ;; | |
59 | ;; If you maintain a client of the mode or customize it in your .emacs, | |
60 | ;; note that some backend functions which formerly took single file arguments | |
61 | ;; now take a list of files. These include: register, checkin, print-log, | |
62 | ;; rollback, and diff. | |
0e362f54 | 63 | |
594722a8 ER |
64 | ;;; Commentary: |
65 | ||
1a2f456b ER |
66 | ;; This mode is fully documented in the Emacs user's manual. |
67 | ;; | |
c0edfa75 | 68 | ;; Supported version-control systems presently include CVS, RCS, GNU |
5e8c0b8b DN |
69 | ;; Arch, Subversion, Bzr, Git, Mercurial, Meta-CVS, Monotone and SCCS |
70 | ;; (or its free replacement, CSSC). | |
b0c9bc8c AS |
71 | ;; |
72 | ;; Some features will not work with old RCS versions. Where | |
73 | ;; appropriate, VC finds out which version you have, and allows or | |
0e362f54 | 74 | ;; disallows those features (stealing locks, for example, works only |
b0c9bc8c | 75 | ;; from 5.6.2 onwards). |
632e9525 RS |
76 | ;; Even initial checkins will fail if your RCS version is so old that ci |
77 | ;; doesn't understand -t-; this has been known to happen to people running | |
0e362f54 | 78 | ;; NExTSTEP 3.0. |
594722a8 | 79 | ;; |
0e362f54 | 80 | ;; You can support the RCS -x option by customizing vc-rcs-master-templates. |
594722a8 ER |
81 | ;; |
82 | ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
83 | ;; to be installed somewhere on Emacs's path for executables. | |
84 | ;; | |
1a2f456b | 85 | ;; If your site uses the ChangeLog convention supported by Emacs, the |
1cca5da4 SM |
86 | ;; function log-edit-comment-to-change-log could prove a useful checkin hook, |
87 | ;; although you might prefer to use C-c C-a (i.e. log-edit-insert-changelog) | |
88 | ;; from the commit buffer instead or to set `log-edit-setup-invert'. | |
1a2f456b | 89 | ;; |
594722a8 ER |
90 | ;; The vc code maintains some internal state in order to reduce expensive |
91 | ;; version-control operations to a minimum. Some names are only computed | |
3b37b179 | 92 | ;; once. If you perform version control operations with the backend while |
594722a8 ER |
93 | ;; vc's back is turned, or move/rename master files while vc is running, |
94 | ;; vc may get seriously confused. Don't do these things! | |
95 | ;; | |
96 | ;; Developer's notes on some concurrency issues are included at the end of | |
97 | ;; the file. | |
0e362f54 | 98 | ;; |
fcb500ea AS |
99 | ;; ADDING SUPPORT FOR OTHER BACKENDS |
100 | ;; | |
101 | ;; VC can use arbitrary version control systems as a backend. To add | |
102 | ;; support for a new backend named SYS, write a library vc-sys.el that | |
103 | ;; contains functions of the form `vc-sys-...' (note that SYS is in lower | |
104 | ;; case for the function and library names). VC will use that library if | |
105 | ;; you put the symbol SYS somewhere into the list of | |
106 | ;; `vc-handled-backends'. Then, for example, if `vc-sys-registered' | |
107 | ;; returns non-nil for a file, all SYS-specific versions of VC commands | |
108 | ;; will be available for that file. | |
109 | ;; | |
110 | ;; VC keeps some per-file information in the form of properties (see | |
111 | ;; vc-file-set/getprop in vc-hooks.el). The backend-specific functions | |
112 | ;; do not generally need to be aware of these properties. For example, | |
ac3f4c6f | 113 | ;; `vc-sys-working-revision' should compute the working revision and |
fcb500ea AS |
114 | ;; return it; it should not look it up in the property, and it needn't |
115 | ;; store it there either. However, if a backend-specific function does | |
116 | ;; store a value in a property, that value takes precedence over any | |
99cb8c8b | 117 | ;; value that the generic code might want to set (check for uses of |
fcb500ea AS |
118 | ;; the macro `with-vc-properties' in vc.el). |
119 | ;; | |
120 | ;; In the list of functions below, each identifier needs to be prepended | |
121 | ;; with `vc-sys-'. Some of the functions are mandatory (marked with a | |
122 | ;; `*'), others are optional (`-'). | |
123 | ;; | |
8cdd17b4 ER |
124 | ;; BACKEND PROPERTIES |
125 | ;; | |
126 | ;; * revision-granularity | |
127 | ;; | |
61de26cb ER |
128 | ;; Takes no arguments. Returns either 'file or 'repository. Backends |
129 | ;; that return 'file have per-file revision numbering; backends | |
130 | ;; that return 'repository have per-repository revision numbering, | |
131 | ;; so a revision level implicitly identifies a changeset | |
132 | ;; | |
fcb500ea AS |
133 | ;; STATE-QUERYING FUNCTIONS |
134 | ;; | |
0e362f54 | 135 | ;; * registered (file) |
fcb500ea | 136 | ;; |
37a5e97a | 137 | ;; Return non-nil if FILE is registered in this backend. Both this |
73770b03 DN |
138 | ;; function as well as `state' should be careful to fail gracefully |
139 | ;; in the event that the backend executable is absent. It is | |
140 | ;; preferable that this function's body is autoloaded, that way only | |
141 | ;; calling vc-registered does not cause the backend to be loaded | |
142 | ;; (all the vc-FOO-registered functions are called to try to find | |
143 | ;; the controlling backend for FILE. | |
fcb500ea | 144 | ;; |
99cb8c8b | 145 | ;; * state (file) |
fcb500ea AS |
146 | ;; |
147 | ;; Return the current version control state of FILE. For a list of | |
148 | ;; possible values, see `vc-state'. This function should do a full and | |
149 | ;; reliable state computation; it is usually called immediately after | |
150 | ;; C-x v v. If you want to use a faster heuristic when visiting a | |
151 | ;; file, put that into `state-heuristic' below. | |
152 | ;; | |
0e362f54 | 153 | ;; - state-heuristic (file) |
fcb500ea AS |
154 | ;; |
155 | ;; If provided, this function is used to estimate the version control | |
156 | ;; state of FILE at visiting time. It should be considerably faster | |
157 | ;; than the implementation of `state'. For a list of possible values, | |
158 | ;; see the doc string of `vc-state'. | |
159 | ;; | |
0e362f54 | 160 | ;; - dir-state (dir) |
fcb500ea AS |
161 | ;; |
162 | ;; If provided, this function is used to find the version control state | |
163 | ;; of all files in DIR in a fast way. The function should not return | |
164 | ;; anything, but rather store the files' states into the corresponding | |
165 | ;; `vc-state' properties. | |
166 | ;; | |
ac3f4c6f | 167 | ;; * working-revision (file) |
fcb500ea | 168 | ;; |
ac3f4c6f | 169 | ;; Return the working revision of FILE. This is the revision fetched |
61de26cb | 170 | ;; by the last checkout or upate, not necessarily the same thing as the |
ac3f4c6f | 171 | ;; head or tip revision. Should return "0" for a file added but not yet |
61de26cb | 172 | ;; committed. |
fcb500ea AS |
173 | ;; |
174 | ;; - latest-on-branch-p (file) | |
175 | ;; | |
ac3f4c6f ER |
176 | ;; Return non-nil if the working revision of FILE is the latest revision |
177 | ;; on its branch (many VCSes call this the 'tip' or 'head' revision). | |
0d0e9356 | 178 | ;; The default implementation always returns t, which means that |
ac3f4c6f | 179 | ;; working with non-current revisions is not supported by default. |
fcb500ea | 180 | ;; |
0e362f54 | 181 | ;; * checkout-model (file) |
fcb500ea AS |
182 | ;; |
183 | ;; Indicate whether FILE needs to be "checked out" before it can be | |
184 | ;; edited. See `vc-checkout-model' for a list of possible values. | |
185 | ;; | |
aae91380 | 186 | ;; - workfile-unchanged-p (file) |
fcb500ea | 187 | ;; |
ac3f4c6f ER |
188 | ;; Return non-nil if FILE is unchanged from the working revision. |
189 | ;; This function should do a brief comparison of FILE's contents | |
190 | ;; with those of the repository master of the working revision. If | |
191 | ;; the backend does not have such a brief-comparison feature, the | |
192 | ;; default implementation of this function can be used, which | |
193 | ;; delegates to a full vc-BACKEND-diff. (Note that vc-BACKEND-diff | |
194 | ;; must not run asynchronously in this case, see variable | |
0d0e9356 | 195 | ;; `vc-disable-async-diff'.) |
fcb500ea | 196 | ;; |
0e362f54 | 197 | ;; - mode-line-string (file) |
fcb500ea | 198 | ;; |
3a12f9f8 DN |
199 | ;; If provided, this function should return the VC-specific mode |
200 | ;; line string for FILE. The returned string should have a | |
201 | ;; `help-echo' property which is the text to be displayed as a | |
202 | ;; tooltip when the mouse hovers over the VC entry on the mode-line. | |
203 | ;; The default implementation deals well with all states that | |
204 | ;; `vc-state' can return. | |
fcb500ea | 205 | ;; |
aae91380 | 206 | ;; - dired-state-info (file) |
fcb500ea AS |
207 | ;; |
208 | ;; Translate the `vc-state' property of FILE into a string that can be | |
209 | ;; used in a vc-dired buffer. The default implementation deals well | |
210 | ;; with all states that `vc-state' can return. | |
211 | ;; | |
212 | ;; STATE-CHANGING FUNCTIONS | |
213 | ;; | |
61de26cb | 214 | ;; * create-repo (backend) |
8cdd17b4 ER |
215 | ;; |
216 | ;; Create an empty repository in the current directory and initialize | |
217 | ;; it so VC mode can add files to it. For file-oriented systems, this | |
218 | ;; need do no more than create a subdirectory with the right name. | |
219 | ;; | |
220 | ;; * register (files &optional rev comment) | |
fcb500ea | 221 | ;; |
8cdd17b4 ER |
222 | ;; Register FILES in this backend. Optionally, an initial revision REV |
223 | ;; and an initial description of the file, COMMENT, may be specified, | |
224 | ;; but it is not guaranteed that the backend will do anything with this. | |
ecd50f65 | 225 | ;; The implementation should pass the value of vc-register-switches |
8cdd17b4 ER |
226 | ;; to the backend command. (Note: in older versions of VC, this |
227 | ;; command took a single file argument and not a list.) | |
fcb500ea | 228 | ;; |
ac3f4c6f | 229 | ;; - init-revision (file) |
b470cb65 | 230 | ;; |
ac3f4c6f | 231 | ;; The initial revision to use when registering FILE if one is not |
b470cb65 | 232 | ;; specified by the user. If not provided, the variable |
ac3f4c6f | 233 | ;; vc-default-init-revision is used instead. |
b470cb65 | 234 | ;; |
099bd78a | 235 | ;; - responsible-p (file) |
fcb500ea AS |
236 | ;; |
237 | ;; Return non-nil if this backend considers itself "responsible" for | |
238 | ;; FILE, which can also be a directory. This function is used to find | |
239 | ;; out what backend to use for registration of new files and for things | |
240 | ;; like change log generation. The default implementation always | |
241 | ;; returns nil. | |
242 | ;; | |
0e362f54 | 243 | ;; - could-register (file) |
fcb500ea AS |
244 | ;; |
245 | ;; Return non-nil if FILE could be registered under this backend. The | |
246 | ;; default implementation always returns t. | |
247 | ;; | |
aae91380 | 248 | ;; - receive-file (file rev) |
fcb500ea AS |
249 | ;; |
250 | ;; Let this backend "receive" a file that is already registered under | |
251 | ;; another backend. The default implementation simply calls `register' | |
252 | ;; for FILE, but it can be overridden to do something more specific, | |
253 | ;; e.g. keep revision numbers consistent or choose editing modes for | |
254 | ;; FILE that resemble those of the other backend. | |
255 | ;; | |
256 | ;; - unregister (file) | |
257 | ;; | |
258 | ;; Unregister FILE from this backend. This is only needed if this | |
259 | ;; backend may be used as a "more local" backend for temporary editing. | |
260 | ;; | |
8cdd17b4 | 261 | ;; * checkin (files rev comment) |
fcb500ea | 262 | ;; |
8cdd17b4 ER |
263 | ;; Commit changes in FILES to this backend. If REV is non-nil, that |
264 | ;; should become the new revision number (not all backends do | |
265 | ;; anything with it). COMMENT is used as a check-in comment. The | |
266 | ;; implementation should pass the value of vc-checkin-switches to | |
267 | ;; the backend command. (Note: in older versions of VC, this | |
268 | ;; command took a single file argument and not a list.) | |
fcb500ea | 269 | ;; |
ac3f4c6f | 270 | ;; * find-revision (file rev buffer) |
fd8160f7 SM |
271 | ;; |
272 | ;; Fetch revision REV of file FILE and put it into BUFFER. | |
273 | ;; If REV is the empty string, fetch the head of the trunk. | |
274 | ;; The implementation should pass the value of vc-checkout-switches | |
275 | ;; to the backend command. | |
276 | ;; | |
9e6da495 | 277 | ;; * checkout (file &optional editable rev) |
fcb500ea AS |
278 | ;; |
279 | ;; Check out revision REV of FILE into the working area. If EDITABLE | |
280 | ;; is non-nil, FILE should be writable by the user and if locking is | |
281 | ;; used for FILE, a lock should also be set. If REV is non-nil, that | |
ac3f4c6f | 282 | ;; is the revision to check out (default is the working revision). |
4279775b AS |
283 | ;; If REV is t, that means to check out the head of the current branch; |
284 | ;; if it is the empty string, check out the head of the trunk. | |
285 | ;; The implementation should pass the value of vc-checkout-switches | |
fd8160f7 | 286 | ;; to the backend command. |
fcb500ea | 287 | ;; |
bbfc07d3 | 288 | ;; * revert (file &optional contents-done) |
fcb500ea | 289 | ;; |
ac3f4c6f | 290 | ;; Revert FILE back to the working revision. If optional |
bbfc07d3 AS |
291 | ;; arg CONTENTS-DONE is non-nil, then the contents of FILE have |
292 | ;; already been reverted from a version backup, and this function | |
293 | ;; only needs to update the status of FILE within the backend. | |
fcb500ea | 294 | ;; |
8cdd17b4 | 295 | ;; - rollback (files) |
fcb500ea | 296 | ;; |
ac3f4c6f ER |
297 | ;; Remove the tip revision of each of FILES from the repository. If |
298 | ;; this function is not provided, trying to cancel a revision is | |
8cdd17b4 ER |
299 | ;; caught as an error. (Most backends don't provide it.) (Also |
300 | ;; note that older versions of this backend command were called | |
301 | ;; 'cancel-version' and took a single file arg, not a list of | |
302 | ;; files.) | |
fcb500ea | 303 | ;; |
aae91380 | 304 | ;; - merge (file rev1 rev2) |
fcb500ea AS |
305 | ;; |
306 | ;; Merge the changes between REV1 and REV2 into the current working file. | |
307 | ;; | |
aae91380 | 308 | ;; - merge-news (file) |
fcb500ea AS |
309 | ;; |
310 | ;; Merge recent changes from the current branch into FILE. | |
311 | ;; | |
ac3f4c6f | 312 | ;; - steal-lock (file &optional revision) |
fcb500ea | 313 | ;; |
ac3f4c6f | 314 | ;; Steal any lock on the working revision of FILE, or on REVISION if |
0d0e9356 ER |
315 | ;; that is provided. This function is only needed if locking is |
316 | ;; used for files under this backend, and if files can indeed be | |
317 | ;; locked by other users. | |
fcb500ea AS |
318 | ;; |
319 | ;; HISTORY FUNCTIONS | |
320 | ;; | |
8cdd17b4 | 321 | ;; * print-log (files &optional buffer) |
fcb500ea | 322 | ;; |
8cdd17b4 ER |
323 | ;; Insert the revision log for FILES into BUFFER, or the *vc* buffer |
324 | ;; if BUFFER is nil. (Note: older versions of this function expected | |
325 | ;; only a single file argument.) | |
fcb500ea | 326 | ;; |
37a5e97a SM |
327 | ;; - log-view-mode () |
328 | ;; | |
329 | ;; Mode to use for the output of print-log. This defaults to | |
330 | ;; `log-view-mode' and is expected to be changed (if at all) to a derived | |
331 | ;; mode of `log-view-mode'. | |
332 | ;; | |
ac3f4c6f | 333 | ;; - show-log-entry (revision) |
fcb500ea | 334 | ;; |
ac3f4c6f | 335 | ;; If provided, search the log entry for REVISION in the current buffer, |
fcb500ea AS |
336 | ;; and make sure it is displayed in the buffer's window. The default |
337 | ;; implementation of this function works for RCS-style logs. | |
338 | ;; | |
aae91380 | 339 | ;; - wash-log (file) |
fcb500ea | 340 | ;; |
61de26cb | 341 | ;; Remove all non-comment information from the output of print-log. |
fcb500ea | 342 | ;; |
0e362f54 | 343 | ;; - logentry-check () |
fcb500ea AS |
344 | ;; |
345 | ;; If defined, this function is run to find out whether the user | |
346 | ;; entered a valid log entry for check-in. The log entry is in the | |
347 | ;; current buffer, and if it is not a valid one, the function should | |
348 | ;; throw an error. | |
349 | ;; | |
aae91380 | 350 | ;; - comment-history (file) |
fcb500ea | 351 | ;; |
d6ba9c39 | 352 | ;; Return a string containing all log entries that were made for FILE. |
fcb500ea AS |
353 | ;; This is used for transferring a file from one backend to another, |
354 | ;; retaining comment information. The default implementation of this | |
355 | ;; function does this by calling print-log and then wash-log, and | |
356 | ;; returning the resulting buffer contents as a string. | |
357 | ;; | |
aae91380 | 358 | ;; - update-changelog (files) |
fcb500ea AS |
359 | ;; |
360 | ;; Using recent log entries, create ChangeLog entries for FILES, or for | |
361 | ;; all files at or below the default-directory if FILES is nil. The | |
362 | ;; default implementation runs rcs2log, which handles RCS- and | |
363 | ;; CVS-style logs. | |
364 | ;; | |
d7b60083 | 365 | ;; * diff (files &optional rev1 rev2 buffer) |
fcb500ea | 366 | ;; |
ac9ff209 AS |
367 | ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if |
368 | ;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences | |
ac3f4c6f ER |
369 | ;; from REV1 to REV2. If REV1 is nil, use the working revision (as |
370 | ;; found in the repository) as the older revision; if REV2 is nil, | |
371 | ;; use the current working-copy contents as the newer revision. This | |
372 | ;; function should pass the value of (vc-switches BACKEND 'diff) to | |
373 | ;; the backend command. It should return a status of either 0 (no | |
374 | ;; differences found), or 1 (either non-empty diff or the diff is | |
375 | ;; run asynchronously). | |
fcb500ea | 376 | ;; |
4d83a657 SM |
377 | ;; - revision-completion-table (file) |
378 | ;; | |
379 | ;; Return a completion table for existing revisions of FILE. | |
380 | ;; The default is to not use any completion table. | |
381 | ;; | |
99cb8c8b | 382 | ;; - diff-tree (dir &optional rev1 rev2) |
2c87edc1 AS |
383 | ;; |
384 | ;; Insert the diff for all files at and below DIR into the *vc-diff* | |
99cb8c8b | 385 | ;; buffer. The meaning of REV1 and REV2 is the same as for |
2c87edc1 AS |
386 | ;; vc-BACKEND-diff. The default implementation does an explicit tree |
387 | ;; walk, calling vc-BACKEND-diff for each individual file. | |
388 | ;; | |
3c42cc64 | 389 | ;; - annotate-command (file buf &optional rev) |
fcb500ea | 390 | ;; |
3c42cc64 | 391 | ;; If this function is provided, it should produce an annotated display |
ac3f4c6f | 392 | ;; of FILE in BUF, relative to revision REV. Annotation means each line |
3c42cc64 TTN |
393 | ;; of FILE displayed is prefixed with version information associated with |
394 | ;; its addition (deleted lines leave no history) and that the text of the | |
395 | ;; file is fontified according to age. | |
fcb500ea | 396 | ;; |
75665141 | 397 | ;; - annotate-time () |
fcb500ea AS |
398 | ;; |
399 | ;; Only required if `annotate-command' is defined for the backend. | |
75665141 AS |
400 | ;; Return the time of the next line of annotation at or after point, |
401 | ;; as a floating point fractional number of days. The helper | |
402 | ;; function `vc-annotate-convert-time' may be useful for converting | |
403 | ;; multi-part times as returned by `current-time' and `encode-time' | |
0ff9b955 | 404 | ;; to this format. Return nil if no more lines of annotation appear |
75665141 AS |
405 | ;; in the buffer. You can safely assume that point is placed at the |
406 | ;; beginning of each line, starting at `point-min'. The buffer that | |
407 | ;; point is placed in is the Annotate output, as defined by the | |
946b248f TTN |
408 | ;; relevant backend. This function also affects how much of the line |
409 | ;; is fontified; where it leaves point is where fontification begins. | |
75665141 AS |
410 | ;; |
411 | ;; - annotate-current-time () | |
412 | ;; | |
413 | ;; Only required if `annotate-command' is defined for the backend, | |
414 | ;; AND you'd like the current time considered to be anything besides | |
cb223bba | 415 | ;; (vc-annotate-convert-time (current-time)) -- i.e. the current |
75665141 AS |
416 | ;; time with hours, minutes, and seconds included. Probably safe to |
417 | ;; ignore. Return the current-time, in units of fractional days. | |
fcb500ea | 418 | ;; |
1b5a7343 AS |
419 | ;; - annotate-extract-revision-at-line () |
420 | ;; | |
421 | ;; Only required if `annotate-command' is defined for the backend. | |
422 | ;; Invoked from a buffer in vc-annotate-mode, return the revision | |
423 | ;; corresponding to the current line, or nil if there is no revision | |
424 | ;; corresponding to the current line. | |
425 | ;; | |
fcb500ea AS |
426 | ;; SNAPSHOT SYSTEM |
427 | ;; | |
0e362f54 | 428 | ;; - create-snapshot (dir name branchp) |
fcb500ea AS |
429 | ;; |
430 | ;; Take a snapshot of the current state of files under DIR and name it | |
431 | ;; NAME. This should make sure that files are up-to-date before | |
432 | ;; proceeding with the action. DIR can also be a file and if BRANCHP | |
433 | ;; is specified, NAME should be created as a branch and DIR should be | |
434 | ;; checked out under this new branch. The default implementation does | |
435 | ;; not support branches but does a sanity check, a tree traversal and | |
436 | ;; for each file calls `assign-name'. | |
437 | ;; | |
438 | ;; - assign-name (file name) | |
439 | ;; | |
ac3f4c6f | 440 | ;; Give name NAME to the working revision of FILE, assuming it is |
fcb500ea AS |
441 | ;; up-to-date. Only used by the default version of `create-snapshot'. |
442 | ;; | |
0e362f54 | 443 | ;; - retrieve-snapshot (dir name update) |
fcb500ea AS |
444 | ;; |
445 | ;; Retrieve a named snapshot of all registered files at or below DIR. | |
446 | ;; If UPDATE is non-nil, then update buffers of any files in the | |
447 | ;; snapshot that are currently visited. The default implementation | |
448 | ;; does a sanity check whether there aren't any uncommitted changes at | |
449 | ;; or below DIR, and then performs a tree walk, using the `checkout' | |
ac3f4c6f | 450 | ;; function to retrieve the corresponding revisions. |
fcb500ea AS |
451 | ;; |
452 | ;; MISCELLANEOUS | |
453 | ;; | |
aae91380 | 454 | ;; - make-version-backups-p (file) |
fcb500ea | 455 | ;; |
ac3f4c6f | 456 | ;; Return non-nil if unmodified repository revisions of FILE should be |
fcb500ea AS |
457 | ;; backed up locally. If this is done, VC can perform `diff' and |
458 | ;; `revert' operations itself, without calling the backend system. The | |
459 | ;; default implementation always returns nil. | |
460 | ;; | |
a36319a4 SM |
461 | ;; - repository-hostname (dirname) |
462 | ;; | |
463 | ;; Return the hostname that the backend will have to contact | |
464 | ;; in order to operate on a file in DIRNAME. If the return value | |
0452b6e7 | 465 | ;; is nil, it means that the repository is local. |
a36319a4 SM |
466 | ;; This function is used in `vc-stay-local-p' which backends can use |
467 | ;; for their convenience. | |
468 | ;; | |
ac3f4c6f | 469 | ;; - previous-revision (file rev) |
869131a5 | 470 | ;; |
ac3f4c6f ER |
471 | ;; Return the revision number that precedes REV for FILE, or nil if no such |
472 | ;; revision exists. | |
1b5a7343 | 473 | ;; |
ac3f4c6f | 474 | ;; - next-revision (file rev) |
1b5a7343 | 475 | ;; |
ac3f4c6f ER |
476 | ;; Return the revision number that follows REV for FILE, or nil if no such |
477 | ;; revision exists. | |
869131a5 | 478 | ;; |
aae91380 | 479 | ;; - check-headers () |
fcb500ea AS |
480 | ;; |
481 | ;; Return non-nil if the current buffer contains any version headers. | |
482 | ;; | |
aae91380 | 483 | ;; - clear-headers () |
fcb500ea AS |
484 | ;; |
485 | ;; In the current buffer, reset all version headers to their unexpanded | |
486 | ;; form. This function should be provided if the state-querying code | |
487 | ;; for this backend uses the version headers to determine the state of | |
488 | ;; a file. This function will then be called whenever VC changes the | |
489 | ;; version control state in such a way that the headers would give | |
490 | ;; wrong information. | |
491 | ;; | |
a36319a4 SM |
492 | ;; - delete-file (file) |
493 | ;; | |
494 | ;; Delete FILE and mark it as deleted in the repository. If this | |
495 | ;; function is not provided, the command `vc-delete-file' will | |
496 | ;; signal an error. | |
497 | ;; | |
099bd78a | 498 | ;; - rename-file (old new) |
fcb500ea AS |
499 | ;; |
500 | ;; Rename file OLD to NEW, both in the working area and in the | |
a36319a4 SM |
501 | ;; repository. If this function is not provided, the renaming |
502 | ;; will be done by (vc-delete-file old) and (vc-register new). | |
86a65190 | 503 | ;; |
6e54fa53 SM |
504 | ;; - find-file-hook () |
505 | ;; | |
81c63b50 | 506 | ;; Operation called in current buffer when opening a file. This can |
6e54fa53 | 507 | ;; be used by the backend to setup some local variables it might need. |
cb223bba | 508 | ;; |
81c63b50 SM |
509 | ;; - find-file-not-found-hook () |
510 | ;; | |
511 | ;; Operation called in current buffer when opening a non-existing file. | |
512 | ;; By default, this asks the user if she wants to check out the file. | |
cb223bba DN |
513 | ;; |
514 | ;; - extra-menu () | |
515 | ;; | |
516 | ;; Return a menu keymap, the items in the keymap will appear at the | |
517 | ;; end of the Version Control menu. The goal is to allow backends | |
518 | ;; to specify extra menu items that appear in the VC menu. This way | |
519 | ;; you can provide menu entries for functionality that is specific | |
520 | ;; to your backend and which does not map to any of the VC generic | |
521 | ;; concepts. | |
aae91380 | 522 | |
fcb500ea | 523 | ;;; Code: |
0e362f54 | 524 | |
594722a8 | 525 | (require 'vc-hooks) |
8c0aaf40 | 526 | (require 'ring) |
0e362f54 | 527 | (eval-when-compile |
7849e179 | 528 | (require 'cl) |
099bd78a SM |
529 | (require 'compile) |
530 | (require 'dired) ; for dired-map-over-marks macro | |
531 | (require 'dired-aux)) ; for dired-kill-{line,tree} | |
8c0aaf40 ER |
532 | |
533 | (if (not (assoc 'vc-parent-buffer minor-mode-alist)) | |
534 | (setq minor-mode-alist | |
535 | (cons '(vc-parent-buffer vc-parent-buffer-name) | |
536 | minor-mode-alist))) | |
594722a8 ER |
537 | |
538 | ;; General customization | |
539 | ||
0101cc40 RS |
540 | (defgroup vc nil |
541 | "Version-control system in Emacs." | |
542 | :group 'tools) | |
543 | ||
544 | (defcustom vc-suppress-confirm nil | |
04864eb0 | 545 | "If non-nil, treat user as expert; suppress yes-no prompts on some things." |
0101cc40 RS |
546 | :type 'boolean |
547 | :group 'vc) | |
548 | ||
2c4eea90 | 549 | (defcustom vc-delete-logbuf-window t |
04864eb0 | 550 | "If non-nil, delete the *VC-log* buffer and window after each logical action. |
2c4eea90 KH |
551 | If nil, bury that buffer instead. |
552 | This is most useful if you have multiple windows on a frame and would like to | |
553 | preserve the setting." | |
554 | :type 'boolean | |
555 | :group 'vc) | |
556 | ||
0101cc40 | 557 | (defcustom vc-initial-comment nil |
04864eb0 | 558 | "If non-nil, prompt for initial comment when a file is registered." |
0101cc40 RS |
559 | :type 'boolean |
560 | :group 'vc) | |
561 | ||
ac3f4c6f ER |
562 | (defcustom vc-default-init-revision "1.1" |
563 | "A string used as the default revision number when a new file is registered. | |
b470cb65 AS |
564 | This can be overridden by giving a prefix argument to \\[vc-register]. This |
565 | can also be overridden by a particular VC backend." | |
0d53f466 | 566 | :type 'string |
cd32a7ba DN |
567 | :group 'vc |
568 | :version "20.3") | |
0d53f466 | 569 | |
0101cc40 | 570 | (defcustom vc-command-messages nil |
04864eb0 | 571 | "If non-nil, display run messages from back-end commands." |
0101cc40 RS |
572 | :type 'boolean |
573 | :group 'vc) | |
574 | ||
575 | (defcustom vc-checkin-switches nil | |
04864eb0 | 576 | "A string or list of strings specifying extra switches for checkin. |
0101cc40 RS |
577 | These are passed to the checkin program by \\[vc-checkin]." |
578 | :type '(choice (const :tag "None" nil) | |
579 | (string :tag "Argument String") | |
580 | (repeat :tag "Argument List" | |
581 | :value ("") | |
582 | string)) | |
583 | :group 'vc) | |
584 | ||
585 | (defcustom vc-checkout-switches nil | |
04864eb0 | 586 | "A string or list of strings specifying extra switches for checkout. |
0101cc40 RS |
587 | These are passed to the checkout program by \\[vc-checkout]." |
588 | :type '(choice (const :tag "None" nil) | |
589 | (string :tag "Argument String") | |
590 | (repeat :tag "Argument List" | |
591 | :value ("") | |
592 | string)) | |
593 | :group 'vc) | |
594 | ||
595 | (defcustom vc-register-switches nil | |
04864eb0 | 596 | "A string or list of strings; extra switches for registering a file. |
0101cc40 RS |
597 | These are passed to the checkin program by \\[vc-register]." |
598 | :type '(choice (const :tag "None" nil) | |
599 | (string :tag "Argument String") | |
600 | (repeat :tag "Argument List" | |
601 | :value ("") | |
602 | string)) | |
603 | :group 'vc) | |
604 | ||
0e362f54 | 605 | (defcustom vc-dired-listing-switches "-al" |
04864eb0 | 606 | "Switches passed to `ls' for vc-dired. MUST contain the `l' option." |
0e362f54 GM |
607 | :type 'string |
608 | :group 'vc | |
6f41eeb5 | 609 | :version "21.1") |
0e362f54 | 610 | |
3b574573 | 611 | (defcustom vc-dired-recurse t |
04864eb0 | 612 | "If non-nil, show directory trees recursively in VC Dired." |
3b574573 AS |
613 | :type 'boolean |
614 | :group 'vc | |
615 | :version "20.3") | |
616 | ||
617 | (defcustom vc-dired-terse-display t | |
61de26cb | 618 | "If non-nil, show only locked or locally modified files in VC Dired." |
3b574573 AS |
619 | :type 'boolean |
620 | :group 'vc | |
621 | :version "20.3") | |
622 | ||
c0edfa75 | 623 | (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" |
625f71cf | 624 | ".git" ".hg" ".bzr" "{arch}") |
04864eb0 | 625 | "List of directory names to be ignored when walking directory trees." |
0101cc40 RS |
626 | :type '(repeat string) |
627 | :group 'vc) | |
666a0ebb | 628 | |
acc5b122 | 629 | (defcustom vc-diff-switches nil |
04864eb0 | 630 | "A string or list of strings specifying switches for diff under VC. |
b453817c AS |
631 | When running diff under a given BACKEND, VC concatenates the values of |
632 | `diff-switches', `vc-diff-switches', and `vc-BACKEND-diff-switches' to | |
633 | get the switches for that command. Thus, `vc-diff-switches' should | |
634 | contain switches that are specific to version control, but not | |
635 | specific to any particular backend." | |
acc5b122 AS |
636 | :type '(choice (const :tag "None" nil) |
637 | (string :tag "Argument String") | |
638 | (repeat :tag "Argument List" | |
639 | :value ("") | |
640 | string)) | |
641 | :group 'vc | |
642 | :version "21.1") | |
643 | ||
48033a08 AS |
644 | (defcustom vc-diff-knows-L nil |
645 | "*Indicates whether diff understands the -L option. | |
646 | The value is either `yes', `no', or nil. If it is nil, VC tries | |
647 | to use -L and sets this variable to remember whether it worked." | |
648 | :type '(choice (const :tag "Work out" nil) (const yes) (const no)) | |
649 | :group 'vc) | |
650 | ||
f1d1d46a | 651 | (defcustom vc-allow-async-revert nil |
e4d26892 | 652 | "Specifies whether the diff during \\[vc-revert] may be asynchronous. |
f1d1d46a AS |
653 | Enabling this option means that you can confirm a revert operation even |
654 | if the local changes in the file have not been found and displayed yet." | |
655 | :type '(choice (const :tag "No" nil) | |
656 | (const :tag "Yes" t)) | |
657 | :group 'vc | |
bf247b6e | 658 | :version "22.1") |
f1d1d46a | 659 | |
7cad930d AS |
660 | ;;;###autoload |
661 | (defcustom vc-checkout-hook nil | |
04864eb0 | 662 | "Normal hook (list of functions) run after checking out a file. |
7cad930d AS |
663 | See `run-hooks'." |
664 | :type 'hook | |
665 | :group 'vc | |
666 | :version "21.1") | |
667 | ||
da7c8a12 | 668 | (defcustom vc-annotate-display-mode 'fullscale |
6f1ecae4 | 669 | "Which mode to color the output of \\[vc-annotate] with by default." |
da7c8a12 | 670 | :type '(choice (const :tag "By Color Map Range" nil) |
75665141 AS |
671 | (const :tag "Scale to Oldest" scale) |
672 | (const :tag "Scale Oldest->Newest" fullscale) | |
673 | (number :tag "Specify Fractional Number of Days" | |
674 | :value "20.5")) | |
675 | :group 'vc) | |
676 | ||
0e362f54 GM |
677 | ;;;###autoload |
678 | (defcustom vc-checkin-hook nil | |
61de26cb | 679 | "Normal hook (list of functions) run after commit or file checkin. |
1cca5da4 | 680 | See also `log-edit-done-hook'." |
0e362f54 | 681 | :type 'hook |
1cca5da4 | 682 | :options '(log-edit-comment-to-change-log) |
0e362f54 GM |
683 | :group 'vc) |
684 | ||
685 | ;;;###autoload | |
686 | (defcustom vc-before-checkin-hook nil | |
61de26cb | 687 | "Normal hook (list of functions) run before a commit or a file checkin. |
0e362f54 GM |
688 | See `run-hooks'." |
689 | :type 'hook | |
690 | :group 'vc) | |
691 | ||
692 | (defcustom vc-logentry-check-hook nil | |
04864eb0 | 693 | "Normal hook run by `vc-backend-logentry-check'. |
0e362f54 GM |
694 | Use this to impose your own rules on the entry in addition to any the |
695 | version control backend imposes itself." | |
696 | :type 'hook | |
697 | :group 'vc) | |
2e810285 | 698 | |
0e362f54 | 699 | ;; Annotate customization |
7d2d9482 | 700 | (defcustom vc-annotate-color-map |
da7c8a12 S |
701 | (if (and (tty-display-color-p) (<= (display-color-cells) 8)) |
702 | ;; A custom sorted TTY colormap | |
703 | (let* ((colors | |
704 | (sort | |
705 | (delq nil | |
706 | (mapcar (lambda (x) | |
707 | (if (not (or | |
708 | (string-equal (car x) "white") | |
709 | (string-equal (car x) "black") )) | |
710 | (car x))) | |
711 | (tty-color-alist))) | |
712 | (lambda (a b) | |
713 | (cond | |
714 | ((or (string-equal a "red") (string-equal b "blue")) t) | |
715 | ((or (string-equal b "red") (string-equal a "blue")) nil) | |
716 | ((string-equal a "yellow") t) | |
717 | ((string-equal b "yellow") nil) | |
718 | ((string-equal a "cyan") t) | |
719 | ((string-equal b "cyan") nil) | |
720 | ((string-equal a "green") t) | |
721 | ((string-equal b "green") nil) | |
722 | ((string-equal a "magenta") t) | |
723 | ((string-equal b "magenta") nil) | |
724 | (t (string< a b)))))) | |
725 | (date 20.) | |
726 | (delta (/ (- 360. date) (1- (length colors))))) | |
727 | (mapcar (lambda (x) | |
728 | (prog1 | |
729 | (cons date x) | |
730 | (setq date (+ date delta)))) colors)) | |
731 | ;; Normal colormap: hue stepped from 0-240deg, value=1., saturation=0.75 | |
732 | '(( 20. . "#FF3F3F") | |
733 | ( 40. . "#FF6C3F") | |
734 | ( 60. . "#FF993F") | |
735 | ( 80. . "#FFC63F") | |
736 | (100. . "#FFF33F") | |
737 | (120. . "#DDFF3F") | |
738 | (140. . "#B0FF3F") | |
739 | (160. . "#83FF3F") | |
740 | (180. . "#56FF3F") | |
741 | (200. . "#3FFF56") | |
742 | (220. . "#3FFF83") | |
743 | (240. . "#3FFFB0") | |
744 | (260. . "#3FFFDD") | |
745 | (280. . "#3FF3FF") | |
746 | (300. . "#3FC6FF") | |
747 | (320. . "#3F99FF") | |
748 | (340. . "#3F6CFF") | |
749 | (360. . "#3F3FFF"))) | |
04864eb0 | 750 | "Association list of age versus color, for \\[vc-annotate]. |
da7c8a12 S |
751 | Ages are given in units of fractional days. Default is eighteen |
752 | steps using a twenty day increment, from red to blue. For TTY | |
753 | displays with 8 or fewer colors, the default is red to blue with | |
754 | all other colors between (excluding black and white)." | |
0e362f54 | 755 | :type 'alist |
7d2d9482 RS |
756 | :group 'vc) |
757 | ||
da7c8a12 | 758 | (defcustom vc-annotate-very-old-color "#3F3FFF" |
04864eb0 | 759 | "Color for lines older than the current color range in \\[vc-annotate]]." |
7d2d9482 RS |
760 | :type 'string |
761 | :group 'vc) | |
762 | ||
763 | (defcustom vc-annotate-background "black" | |
04864eb0 | 764 | "Background color for \\[vc-annotate]. |
7d2d9482 RS |
765 | Default color is used if nil." |
766 | :type 'string | |
767 | :group 'vc) | |
768 | ||
769 | (defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01) | |
04864eb0 | 770 | "Menu elements for the mode-specific menu of VC-Annotate mode. |
7d2d9482 | 771 | List of factors, used to expand/compress the time scale. See `vc-annotate'." |
0e362f54 | 772 | :type '(repeat number) |
7d2d9482 RS |
773 | :group 'vc) |
774 | ||
0e362f54 GM |
775 | (defvar vc-annotate-mode-map |
776 | (let ((m (make-sparse-keymap))) | |
04864eb0 SM |
777 | (define-key m "A" 'vc-annotate-revision-previous-to-line) |
778 | (define-key m "D" 'vc-annotate-show-diff-revision-at-line) | |
779 | (define-key m "J" 'vc-annotate-revision-at-line) | |
780 | (define-key m "L" 'vc-annotate-show-log-revision-at-line) | |
ac3f4c6f ER |
781 | (define-key m "N" 'vc-annotate-next-revision) |
782 | (define-key m "P" 'vc-annotate-prev-revision) | |
783 | (define-key m "W" 'vc-annotate-working-revision) | |
0e362f54 GM |
784 | m) |
785 | "Local keymap used for VC-Annotate mode.") | |
67242a23 | 786 | |
594722a8 ER |
787 | ;; Header-insertion hair |
788 | ||
0101cc40 | 789 | (defcustom vc-static-header-alist |
04864eb0 | 790 | '(("\\.c\\'" . |
594722a8 | 791 | "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) |
0e362f54 GM |
792 | "*Associate static header string templates with file types. |
793 | A \%s in the template is replaced with the first string associated with | |
099bd78a | 794 | the file's version control type in `vc-header-alist'." |
0101cc40 RS |
795 | :type '(repeat (cons :format "%v" |
796 | (regexp :tag "File Type") | |
797 | (string :tag "Header String"))) | |
798 | :group 'vc) | |
7b4f934d | 799 | |
0101cc40 | 800 | (defcustom vc-comment-alist |
594722a8 | 801 | '((nroff-mode ".\\\"" "")) |
6f1ecae4 | 802 | "*Special comment delimiters for generating VC headers. |
099bd78a SM |
803 | Add an entry in this list if you need to override the normal `comment-start' |
804 | and `comment-end' variables. This will only be necessary if the mode language | |
0101cc40 RS |
805 | is sensitive to blank lines." |
806 | :type '(repeat (list :format "%v" | |
807 | (symbol :tag "Mode") | |
808 | (string :tag "Comment Start") | |
809 | (string :tag "Comment End"))) | |
810 | :group 'vc) | |
594722a8 | 811 | |
0101cc40 | 812 | (defcustom vc-checkout-carefully (= (user-uid) 0) |
bf142f28 | 813 | "*Non-nil means be extra-careful in checkout. |
bbf97570 | 814 | Verify that the file really is not locked |
0101cc40 RS |
815 | and that its contents match what the master file says." |
816 | :type 'boolean | |
817 | :group 'vc) | |
bf142f28 JB |
818 | (make-obsolete-variable 'vc-checkout-carefully |
819 | "the corresponding checks are always done now." | |
820 | "21.1") | |
bbf97570 | 821 | |
0e362f54 | 822 | \f |
594722a8 | 823 | ;; Variables the user doesn't need to know about. |
594722a8 | 824 | (defvar vc-log-operation nil) |
67242a23 | 825 | (defvar vc-log-after-operation-hook nil) |
04864eb0 | 826 | |
dbf87856 RS |
827 | ;; In a log entry buffer, this is a local variable |
828 | ;; that points to the buffer for which it was made | |
829 | ;; (either a file, or a VC dired buffer). | |
1a2f456b | 830 | (defvar vc-parent-buffer nil) |
0e362f54 | 831 | (put 'vc-parent-buffer 'permanent-local t) |
8c0aaf40 | 832 | (defvar vc-parent-buffer-name nil) |
0e362f54 | 833 | (put 'vc-parent-buffer-name 'permanent-local t) |
594722a8 | 834 | |
f1d1d46a AS |
835 | (defvar vc-disable-async-diff nil |
836 | "VC sets this to t locally to disable some async diff operations. | |
837 | Backends that offer asynchronous diffs should respect this variable | |
838 | in their implementation of vc-BACKEND-diff.") | |
839 | ||
d7b60083 | 840 | (defvar vc-log-fileset) |
ac3f4c6f | 841 | (defvar vc-log-revision) |
db59472c | 842 | |
8c0aaf40 | 843 | (defvar vc-dired-mode nil) |
e1f297e6 ER |
844 | (make-variable-buffer-local 'vc-dired-mode) |
845 | ||
594722a8 ER |
846 | ;; File property caching |
847 | ||
8c0aaf40 | 848 | (defun vc-clear-context () |
11cdd167 | 849 | "Clear all cached file properties." |
8c0aaf40 | 850 | (interactive) |
11cdd167 | 851 | (fillarray vc-file-prop-obarray 0)) |
8c0aaf40 | 852 | |
d7b60083 ER |
853 | (defmacro with-vc-properties (files form settings) |
854 | "Execute FORM, then maybe set per-file properties for FILES. | |
6f1ecae4 AS |
855 | SETTINGS is an association list of property/value pairs. After |
856 | executing FORM, set those properties from SETTINGS that have not yet | |
857 | been updated to their corresponding values." | |
b4e4e3a8 | 858 | (declare (debug t)) |
169f0cae | 859 | `(let ((vc-touched-properties (list t))) |
099bd78a | 860 | ,form |
d7b60083 ER |
861 | (dolist (file ,files) |
862 | (mapc (lambda (setting) | |
a3255400 | 863 | (let ((property (car setting))) |
099bd78a | 864 | (unless (memq property vc-touched-properties) |
0438c691 | 865 | (put (intern file vc-file-prop-obarray) |
a3255400 | 866 | property (cdr setting))))) |
d7b60083 | 867 | ,settings)))) |
099bd78a | 868 | |
ec402ad4 | 869 | ;; Two macros for elisp programming |
61de26cb | 870 | |
709822e8 AS |
871 | ;;;###autoload |
872 | (defmacro with-vc-file (file comment &rest body) | |
6f1ecae4 | 873 | "Check out a writable copy of FILE if necessary, then execute BODY. |
0e362f54 GM |
874 | Check in FILE with COMMENT (a string) after BODY has been executed. |
875 | FILE is passed through `expand-file-name'; BODY executed within | |
61de26cb ER |
876 | `save-excursion'. If FILE is not under version control, or you are |
877 | using a locking version-control system and the file is locked by | |
709822e8 | 878 | somebody else, signal error." |
b4e4e3a8 | 879 | (declare (debug t) (indent 2)) |
169f0cae AS |
880 | (let ((filevar (make-symbol "file"))) |
881 | `(let ((,filevar (expand-file-name ,file))) | |
882 | (or (vc-backend ,filevar) | |
2df5044f | 883 | (error "File not under version control: `%s'" file)) |
169f0cae AS |
884 | (unless (vc-editable-p ,filevar) |
885 | (let ((state (vc-state ,filevar))) | |
f1180544 | 886 | (if (stringp state) |
2df5044f | 887 | (error "`%s' is locking `%s'" state ,filevar) |
169f0cae AS |
888 | (vc-checkout ,filevar t)))) |
889 | (save-excursion | |
890 | ,@body) | |
d7b60083 | 891 | (vc-checkin (list ,filevar) nil ,comment)))) |
169f0cae | 892 | |
709822e8 AS |
893 | ;;;###autoload |
894 | (defmacro edit-vc-file (file comment &rest body) | |
0e362f54 GM |
895 | "Edit FILE under version control, executing body. |
896 | Checkin with COMMENT after executing BODY. | |
709822e8 AS |
897 | This macro uses `with-vc-file', passing args to it. |
898 | However, before executing BODY, find FILE, and after BODY, save buffer." | |
b4e4e3a8 | 899 | (declare (debug t) (indent 2)) |
169f0cae AS |
900 | (let ((filevar (make-symbol "file"))) |
901 | `(let ((,filevar (expand-file-name ,file))) | |
902 | (with-vc-file | |
903 | ,filevar ,comment | |
904 | (set-buffer (find-file-noselect ,filevar)) | |
905 | ,@body | |
906 | (save-buffer))))) | |
907 | ||
61de26cb ER |
908 | ;; Common command execution logic to be used by backends |
909 | ||
0e362f54 | 910 | (defun vc-process-filter (p s) |
099bd78a | 911 | "An alternative output filter for async process P. |
58ce5535 TTN |
912 | One difference with the default filter is that this inserts S after markers. |
913 | Another is that undo information is not kept." | |
0e362f54 GM |
914 | (with-current-buffer (process-buffer p) |
915 | (save-excursion | |
58ce5535 TTN |
916 | (let ((buffer-undo-list t) |
917 | (inhibit-read-only t)) | |
0e362f54 GM |
918 | (goto-char (process-mark p)) |
919 | (insert s) | |
920 | (set-marker (process-mark p) (point)))))) | |
921 | ||
922 | (defun vc-setup-buffer (&optional buf) | |
6f1ecae4 | 923 | "Prepare BUF for executing a VC command and make it current. |
0e362f54 GM |
924 | BUF defaults to \"*vc*\", can be a string and will be created if necessary." |
925 | (unless buf (setq buf "*vc*")) | |
926 | (let ((camefrom (current-buffer)) | |
927 | (olddir default-directory)) | |
928 | (set-buffer (get-buffer-create buf)) | |
929 | (kill-all-local-variables) | |
930 | (set (make-local-variable 'vc-parent-buffer) camefrom) | |
931 | (set (make-local-variable 'vc-parent-buffer-name) | |
932 | (concat " from " (buffer-name camefrom))) | |
933 | (setq default-directory olddir) | |
58ce5535 TTN |
934 | (let ((buffer-undo-list t) |
935 | (inhibit-read-only t)) | |
0e362f54 GM |
936 | (erase-buffer)))) |
937 | ||
86e80023 SM |
938 | (defvar vc-sentinel-movepoint) ;Dynamically scoped. |
939 | ||
940 | (defun vc-process-sentinel (p s) | |
941 | (let ((previous (process-get p 'vc-previous-sentinel))) | |
942 | (if previous (funcall previous p s)) | |
943 | (with-current-buffer (process-buffer p) | |
944 | (let (vc-sentinel-movepoint) | |
945 | ;; Normally, we want async code such as sentinels to not move point. | |
946 | (save-excursion | |
947 | (goto-char (process-mark p)) | |
948 | (let ((cmds (process-get p 'vc-sentinel-commands))) | |
949 | (process-put p 'vc-postprocess nil) | |
950 | (dolist (cmd cmds) | |
951 | ;; Each sentinel may move point and the next one should be run | |
952 | ;; at that new point. We could get the same result by having | |
953 | ;; each sentinel read&set process-mark, but since `cmd' needs | |
954 | ;; to work both for async and sync processes, this would be | |
955 | ;; difficult to achieve. | |
956 | (vc-exec-after cmd)))) | |
957 | ;; But sometimes the sentinels really want to move point. | |
958 | (if vc-sentinel-movepoint | |
959 | (let ((win (get-buffer-window (current-buffer) 0))) | |
960 | (if (not win) | |
961 | (goto-char vc-sentinel-movepoint) | |
962 | (with-selected-window win | |
963 | (goto-char vc-sentinel-movepoint))))))))) | |
964 | ||
0e362f54 GM |
965 | (defun vc-exec-after (code) |
966 | "Eval CODE when the current buffer's process is done. | |
967 | If the current buffer has no process, just evaluate CODE. | |
968 | Else, add CODE to the process' sentinel." | |
969 | (let ((proc (get-buffer-process (current-buffer)))) | |
970 | (cond | |
971 | ;; If there's no background process, just execute the code. | |
0f7ea453 CY |
972 | ;; We used to explicitly call delete-process on exited processes, |
973 | ;; but this led to timing problems causing process output to be | |
974 | ;; lost. Terminated processes get deleted automatically | |
975 | ;; anyway. -- cyd | |
976 | ((or (null proc) (eq (process-status proc) 'exit)) | |
7c33af85 SM |
977 | ;; Make sure we've read the process's output before going further. |
978 | (if proc (accept-process-output proc)) | |
0f7ea453 | 979 | (eval code)) |
0e362f54 GM |
980 | ;; If a process is running, add CODE to the sentinel |
981 | ((eq (process-status proc) 'run) | |
86e80023 SM |
982 | (let ((previous (process-sentinel proc))) |
983 | (unless (eq previous 'vc-process-sentinel) | |
984 | (process-put proc 'vc-previous-sentinel previous)) | |
985 | (set-process-sentinel proc 'vc-process-sentinel)) | |
986 | (process-put proc 'vc-sentinel-commands | |
987 | (cons code (process-get proc 'vc-sentinel-commands)))) | |
0e362f54 GM |
988 | (t (error "Unexpected process state")))) |
989 | nil) | |
990 | ||
991 | (defvar vc-post-command-functions nil | |
992 | "Hook run at the end of `vc-do-command'. | |
993 | Each function is called inside the buffer in which the command was run | |
d7b60083 | 994 | and is passed 3 arguments: the COMMAND, the FILES and the FLAGS.") |
0e362f54 | 995 | |
2765044b DN |
996 | (defvar w32-quote-process-args) |
997 | ||
8cdd17b4 ER |
998 | (defun vc-delistify (filelist) |
999 | "Smash a FILELIST into a file list string suitable for info messages." | |
2765044b | 1000 | ;; FIXME what about file names with spaces? |
d1a607bc | 1001 | (if (not filelist) "." (mapconcat 'identity filelist " "))) |
8cdd17b4 | 1002 | |
a84b80ba | 1003 | ;;;###autoload |
8cdd17b4 | 1004 | (defun vc-do-command (buffer okstatus command file-or-list &rest flags) |
6f1ecae4 | 1005 | "Execute a VC command, notifying user and checking for errors. |
ad339989 AS |
1006 | Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the |
1007 | current buffer if BUFFER is t. If the destination buffer is not | |
1008 | already current, set it up properly and erase it. The command is | |
1009 | considered successful if its exit status does not exceed OKSTATUS (if | |
c94dca60 | 1010 | OKSTATUS is nil, that means to ignore error status, if it is `async', that |
11c89a07 | 1011 | means not to wait for termination of the subprocess; if it is t it means to |
8cdd17b4 ER |
1012 | ignore all execution errors). FILE-OR-LIST is the name of a working file; |
1013 | it may be a list of files or be nil (to execute commands that don't expect | |
1014 | a file name or set of files). If an optional list of FLAGS is present, | |
0e362f54 | 1015 | that is inserted into the command line before the filename." |
8cdd17b4 ER |
1016 | ;; FIXME: file-relative-name can return a bogus result because |
1017 | ;; it doesn't look at the actual file-system to see if symlinks | |
1018 | ;; come into play. | |
d1a607bc SM |
1019 | (let* ((files |
1020 | (mapcar (lambda (f) (file-relative-name (expand-file-name f))) | |
1021 | (if (listp file-or-list) file-or-list (list file-or-list)))) | |
d7b60083 ER |
1022 | (full-command |
1023 | ;; What we're doing here is preparing a version of the command | |
1024 | ;; for display in a debug-progess message. If it's fewer than | |
1025 | ;; 20 characters display the entire command (without trailing | |
1026 | ;; newline). Otherwise display the first 20 followed by an ellipsis. | |
1027 | (concat (if (string= (substring command -1) "\n") | |
1028 | (substring command 0 -1) | |
1029 | command) | |
1030 | " " | |
1031 | (vc-delistify (mapcar (lambda (s) (if (> (length s) 20) (concat (substring s 0 2) "...") s)) flags)) | |
1032 | " " (vc-delistify files)))) | |
8cdd17b4 ER |
1033 | (save-current-buffer |
1034 | (unless (or (eq buffer t) | |
1035 | (and (stringp buffer) | |
1036 | (string= (buffer-name) buffer)) | |
1037 | (eq buffer (current-buffer))) | |
1038 | (vc-setup-buffer buffer)) | |
1039 | (let ((squeezed (remq nil flags)) | |
1040 | (inhibit-read-only t) | |
1041 | (status 0)) | |
1042 | (when files | |
1043 | (setq squeezed (nconc squeezed files))) | |
1044 | (let ((exec-path (append vc-path exec-path)) | |
1045 | ;; Add vc-path to PATH for the execution of this command. | |
1046 | (process-environment | |
1047 | (cons (concat "PATH=" (getenv "PATH") | |
1048 | path-separator | |
1049 | (mapconcat 'identity vc-path path-separator)) | |
1050 | process-environment)) | |
1051 | (w32-quote-process-args t)) | |
1052 | (if (and (eq okstatus 'async) (file-remote-p default-directory)) | |
1053 | ;; start-process does not support remote execution | |
1054 | (setq okstatus nil)) | |
1055 | (if (eq okstatus 'async) | |
61de26cb | 1056 | ;; Run asynchronously |
8cdd17b4 ER |
1057 | (let ((proc |
1058 | (let ((process-connection-type nil)) | |
1059 | (apply 'start-process command (current-buffer) command | |
1060 | squeezed)))) | |
d7b60083 ER |
1061 | (if vc-command-messages |
1062 | (message "Running %s in background..." full-command)) | |
8cdd17b4 ER |
1063 | ;;(set-process-sentinel proc (lambda (p msg) (delete-process p))) |
1064 | (set-process-filter proc 'vc-process-filter) | |
1065 | (vc-exec-after | |
d7b60083 ER |
1066 | `(if vc-command-messages |
1067 | (message "Running %s in background... done" ',full-command)))) | |
1068 | ;; Run synchrously | |
1069 | (if vc-command-messages | |
1070 | (message "Running %s in foreground..." full-command)) | |
8cdd17b4 ER |
1071 | (let ((buffer-undo-list t)) |
1072 | (setq status (apply 'process-file command nil t nil squeezed))) | |
1073 | (when (and (not (eq t okstatus)) | |
1074 | (or (not (integerp status)) | |
1075 | (and okstatus (< okstatus status)))) | |
1076 | (pop-to-buffer (current-buffer)) | |
1077 | (goto-char (point-min)) | |
1078 | (shrink-window-if-larger-than-buffer) | |
1079 | (error "Running %s...FAILED (%s)" full-command | |
1080 | (if (integerp status) (format "status %d" status) status)))) | |
d7b60083 | 1081 | ;; We're done |
8cdd17b4 | 1082 | (if vc-command-messages |
d7b60083 | 1083 | (message "Running %s...OK = %d" full-command status))) |
8cdd17b4 | 1084 | (vc-exec-after |
d7b60083 ER |
1085 | `(run-hook-with-args 'vc-post-command-functions |
1086 | ',command ',file-or-list ',flags)) | |
8cdd17b4 | 1087 | status)))) |
594722a8 | 1088 | |
c4ae7096 | 1089 | (defun vc-position-context (posn) |
099bd78a SM |
1090 | "Save a bit of the text around POSN in the current buffer. |
1091 | Used to help us find the corresponding position again later | |
1092 | if markers are destroyed or corrupted." | |
0e362f54 GM |
1093 | ;; A lot of this was shamelessly lifted from Sebastian Kremer's |
1094 | ;; rcs.el mode. | |
c4ae7096 JB |
1095 | (list posn |
1096 | (buffer-size) | |
1097 | (buffer-substring posn | |
1098 | (min (point-max) (+ posn 100))))) | |
1099 | ||
c4ae7096 | 1100 | (defun vc-find-position-by-context (context) |
6f1ecae4 AS |
1101 | "Return the position of CONTEXT in the current buffer. |
1102 | If CONTEXT cannot be found, return nil." | |
c4ae7096 JB |
1103 | (let ((context-string (nth 2 context))) |
1104 | (if (equal "" context-string) | |
1105 | (point-max) | |
1106 | (save-excursion | |
1107 | (let ((diff (- (nth 1 context) (buffer-size)))) | |
1108 | (if (< diff 0) (setq diff (- diff))) | |
1109 | (goto-char (nth 0 context)) | |
1110 | (if (or (search-forward context-string nil t) | |
1111 | ;; Can't use search-backward since the match may continue | |
1112 | ;; after point. | |
1113 | (progn (goto-char (- (point) diff (length context-string))) | |
1114 | ;; goto-char doesn't signal an error at | |
1115 | ;; beginning of buffer like backward-char would | |
1116 | (search-forward context-string nil t))) | |
1117 | ;; to beginning of OSTRING | |
1118 | (- (point) (length context-string)))))))) | |
1119 | ||
4b398f5d | 1120 | (defun vc-context-matches-p (posn context) |
099bd78a | 1121 | "Return t if POSN matches CONTEXT, nil otherwise." |
4b398f5d AS |
1122 | (let* ((context-string (nth 2 context)) |
1123 | (len (length context-string)) | |
1124 | (end (+ posn len))) | |
1125 | (if (> end (1+ (buffer-size))) | |
1126 | nil | |
1127 | (string= context-string (buffer-substring posn end))))) | |
1128 | ||
c8de1d91 | 1129 | (defun vc-buffer-context () |
099bd78a SM |
1130 | "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE). |
1131 | Used by `vc-restore-buffer-context' to later restore the context." | |
c4ae7096 | 1132 | (let ((point-context (vc-position-context (point))) |
cfadef63 RS |
1133 | ;; Use mark-marker to avoid confusion in transient-mark-mode. |
1134 | (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer)) | |
1135 | (vc-position-context (mark-marker)))) | |
1136 | ;; Make the right thing happen in transient-mark-mode. | |
ab877583 | 1137 | (mark-active nil) |
0452b6e7 SM |
1138 | ;; The new compilation code does not use compilation-error-list any |
1139 | ;; more, so the code below is now ineffective and might as well | |
1140 | ;; be disabled. -- Stef | |
1141 | ;; ;; We may want to reparse the compilation buffer after revert | |
1142 | ;; (reparse (and (boundp 'compilation-error-list) ;compile loaded | |
1143 | ;; ;; Construct a list; each elt is nil or a buffer | |
4837b516 | 1144 | ;; ;; if that buffer is a compilation output buffer |
0452b6e7 SM |
1145 | ;; ;; that contains markers into the current buffer. |
1146 | ;; (save-current-buffer | |
1147 | ;; (mapcar (lambda (buffer) | |
1148 | ;; (set-buffer buffer) | |
1149 | ;; (let ((errors (or | |
1150 | ;; compilation-old-error-list | |
1151 | ;; compilation-error-list)) | |
1152 | ;; (buffer-error-marked-p nil)) | |
1153 | ;; (while (and (consp errors) | |
1154 | ;; (not buffer-error-marked-p)) | |
1155 | ;; (and (markerp (cdr (car errors))) | |
1156 | ;; (eq buffer | |
1157 | ;; (marker-buffer | |
1158 | ;; (cdr (car errors)))) | |
1159 | ;; (setq buffer-error-marked-p t)) | |
1160 | ;; (setq errors (cdr errors))) | |
1161 | ;; (if buffer-error-marked-p buffer))) | |
1162 | ;; (buffer-list))))) | |
1163 | (reparse nil)) | |
c8de1d91 AS |
1164 | (list point-context mark-context reparse))) |
1165 | ||
1166 | (defun vc-restore-buffer-context (context) | |
0e362f54 | 1167 | "Restore point/mark, and reparse any affected compilation buffers. |
099bd78a | 1168 | CONTEXT is that which `vc-buffer-context' returns." |
c8de1d91 AS |
1169 | (let ((point-context (nth 0 context)) |
1170 | (mark-context (nth 1 context)) | |
1171 | (reparse (nth 2 context))) | |
0452b6e7 SM |
1172 | ;; The new compilation code does not use compilation-error-list any |
1173 | ;; more, so the code below is now ineffective and might as well | |
1174 | ;; be disabled. -- Stef | |
1175 | ;; ;; Reparse affected compilation buffers. | |
1176 | ;; (while reparse | |
1177 | ;; (if (car reparse) | |
1178 | ;; (with-current-buffer (car reparse) | |
1179 | ;; (let ((compilation-last-buffer (current-buffer)) ;select buffer | |
1180 | ;; ;; Record the position in the compilation buffer of | |
1181 | ;; ;; the last error next-error went to. | |
1182 | ;; (error-pos (marker-position | |
1183 | ;; (car (car-safe compilation-error-list))))) | |
1184 | ;; ;; Reparse the error messages as far as they were parsed before. | |
1185 | ;; (compile-reinitialize-errors '(4) compilation-parsing-end) | |
1186 | ;; ;; Move the pointer up to find the error we were at before | |
1187 | ;; ;; reparsing. Now next-error should properly go to the next one. | |
1188 | ;; (while (and compilation-error-list | |
1189 | ;; (/= error-pos (car (car compilation-error-list)))) | |
1190 | ;; (setq compilation-error-list (cdr compilation-error-list)))))) | |
1191 | ;; (setq reparse (cdr reparse))) | |
e1f297e6 | 1192 | |
4b398f5d AS |
1193 | ;; if necessary, restore point and mark |
1194 | (if (not (vc-context-matches-p (point) point-context)) | |
1195 | (let ((new-point (vc-find-position-by-context point-context))) | |
1196 | (if new-point (goto-char new-point)))) | |
01e02ab3 AS |
1197 | (and mark-active |
1198 | mark-context | |
1199 | (not (vc-context-matches-p (mark) mark-context)) | |
1200 | (let ((new-mark (vc-find-position-by-context mark-context))) | |
1201 | (if new-mark (set-mark new-mark)))))) | |
c4ae7096 | 1202 | |
d7b60083 ER |
1203 | ;;; Code for deducing what fileset and backend to assume |
1204 | ||
2765044b DN |
1205 | (defun vc-responsible-backend (file &optional register) |
1206 | "Return the name of a backend system that is responsible for FILE. | |
1207 | The optional argument REGISTER means that a backend suitable for | |
1208 | registration should be found. | |
1209 | ||
1210 | If REGISTER is nil, then if FILE is already registered, return the | |
1211 | backend of FILE. If FILE is not registered, or a directory, then the | |
1212 | first backend in `vc-handled-backends' that declares itself | |
1213 | responsible for FILE is returned. If no backend declares itself | |
1214 | responsible, return the first backend. | |
1215 | ||
1216 | If REGISTER is non-nil, return the first responsible backend under | |
1217 | which FILE is not yet registered. If there is no such backend, return | |
1218 | the first backend under which FILE is not yet registered, but could | |
1219 | be registered." | |
1220 | (if (not vc-handled-backends) | |
1221 | (error "No handled backends")) | |
1222 | (or (and (not (file-directory-p file)) (not register) (vc-backend file)) | |
1223 | (catch 'found | |
1224 | ;; First try: find a responsible backend. If this is for registration, | |
1225 | ;; it must be a backend under which FILE is not yet registered. | |
1226 | (dolist (backend vc-handled-backends) | |
1227 | (and (or (not register) | |
1228 | (not (vc-call-backend backend 'registered file))) | |
1229 | (vc-call-backend backend 'responsible-p file) | |
1230 | (throw 'found backend))) | |
1231 | ;; no responsible backend | |
1232 | (if (not register) | |
1233 | ;; if this is not for registration, the first backend must do | |
1234 | (car vc-handled-backends) | |
1235 | ;; for registration, we need to find a new backend that | |
1236 | ;; could register FILE | |
1237 | (dolist (backend vc-handled-backends) | |
1238 | (and (not (vc-call-backend backend 'registered file)) | |
1239 | (vc-call-backend backend 'could-register file) | |
1240 | (throw 'found backend))) | |
1241 | (error "No backend that could register"))))) | |
1242 | ||
1243 | (defun vc-expand-dirs (file-or-dir-list) | |
1244 | "Expands directories in a file list specification. | |
1245 | Only files already under version control are noticed." | |
1246 | ;; FIXME: Kill this function. | |
1247 | (let ((flattened '())) | |
1248 | (dolist (node file-or-dir-list) | |
1249 | (vc-file-tree-walk | |
1250 | node (lambda (f) (if (vc-backend f) (push f flattened))))) | |
1251 | (nreverse flattened))) | |
1252 | ||
d7b60083 ER |
1253 | (defun vc-deduce-fileset (&optional allow-directory-wildcard) |
1254 | "Deduce a set of files and a backend to apply an operation to. | |
1255 | ||
1256 | If we're in VC-dired-mode, the fileset is the list of marked | |
1257 | files. Otherwise, if we're looking at a buffer visiting a | |
1258 | version-controlled file. the fileset is a singleton containing | |
1259 | the relative filename, throw an error. | |
1260 | ||
1261 | If neither of these things is true, but allow-directory-wildcard is on, | |
1262 | select all files under version control at and below the current | |
1263 | directory. | |
1264 | ||
1265 | Otherwise, throw an error. | |
1266 | " | |
1267 | (cond (vc-dired-mode | |
1268 | (let ((regexp (dired-marker-regexp)) | |
1269 | (marked (dired-map-over-marks (dired-get-filename) nil))) | |
1270 | (unless marked | |
1271 | (error "No files have been selected.")) | |
1272 | ;; All members of the fileset must have the same backend | |
1273 | (let ((firstbackend (vc-backend (car marked)))) | |
1274 | (mapc (lambda (f) (unless (eq (vc-backend f) firstbackend) | |
1275 | (error "All members of a fileset must be under the same version-control system."))) | |
1276 | (cdr marked))) | |
1277 | marked)) | |
1278 | ((vc-backend buffer-file-name) | |
1279 | (list buffer-file-name)) | |
1280 | ((and vc-parent-buffer (buffer-file-name vc-parent-buffer)) | |
1281 | (progn | |
1282 | (set-buffer vc-parent-buffer) | |
1283 | (vc-deduce-fileset))) | |
1284 | ;; This is guarded by an enabling arg so users won't potentially | |
1285 | ;; shoot themselves in the foot by modifying a fileset they can't | |
1286 | ;; verify by eyeball. Allow it for nondestructive commands like | |
1287 | ;; making diffs, or possibly for destructive ones that have | |
1288 | ;; confirmation prompts. | |
1289 | (allow-directory-wildcard | |
1290 | (progn | |
d7b60083 ER |
1291 | (message "All version-controlled files below %s selected." |
1292 | default-directory) | |
1293 | (list default-directory))) | |
1294 | (t (error "No fileset is available here.")))) | |
1295 | ||
2765044b DN |
1296 | (defun vc-ensure-vc-buffer () |
1297 | "Make sure that the current buffer visits a version-controlled file." | |
1298 | (if vc-dired-mode | |
1299 | (set-buffer (find-file-noselect (dired-get-filename))) | |
1300 | (while vc-parent-buffer | |
1301 | (set-buffer vc-parent-buffer)) | |
1302 | (if (not buffer-file-name) | |
1303 | (error "Buffer %s is not associated with a file" (buffer-name)) | |
1304 | (if (not (vc-backend buffer-file-name)) | |
1305 | (error "File %s is not under version control" buffer-file-name))))) | |
1306 | ||
61de26cb ER |
1307 | ;;; Support for the C-x v v command. This is where all the single-file-oriented |
1308 | ;;; code from before the fileset rewrite lives. | |
1309 | ||
2765044b DN |
1310 | (defsubst vc-editable-p (file) |
1311 | "Return non-nil if FILE can be edited." | |
1312 | (or (eq (vc-checkout-model file) 'implicit) | |
1313 | (memq (vc-state file) '(edited needs-merge)))) | |
1314 | ||
61de26cb | 1315 | (defun vc-revert-buffer-internal (&optional arg no-confirm) |
6f1ecae4 | 1316 | "Revert buffer, keeping point and mark where user expects them. |
ac3f4c6f | 1317 | Try to be clever in the face of changes due to expanded version-control |
099bd78a SM |
1318 | key words. This is important for typeahead to work as expected. |
1319 | ARG and NO-CONFIRM are passed on to `revert-buffer'." | |
c8de1d91 AS |
1320 | (interactive "P") |
1321 | (widen) | |
1322 | (let ((context (vc-buffer-context))) | |
4b398f5d AS |
1323 | ;; Use save-excursion here, because it may be able to restore point |
1324 | ;; and mark properly even in cases where vc-restore-buffer-context | |
0e362f54 | 1325 | ;; would fail. However, save-excursion might also get it wrong -- |
4b398f5d AS |
1326 | ;; in this case, vc-restore-buffer-context gives it a second try. |
1327 | (save-excursion | |
0e362f54 | 1328 | ;; t means don't call normal-mode; |
4b398f5d AS |
1329 | ;; that's to preserve various minor modes. |
1330 | (revert-buffer arg no-confirm t)) | |
c8de1d91 AS |
1331 | (vc-restore-buffer-context context))) |
1332 | ||
97d3f950 | 1333 | (defun vc-buffer-sync (&optional not-urgent) |
099bd78a | 1334 | "Make sure the current buffer and its working file are in sync. |
0e362f54 | 1335 | NOT-URGENT means it is ok to continue if the user says not to save." |
bbf97570 | 1336 | (if (buffer-modified-p) |
97d3f950 RS |
1337 | (if (or vc-suppress-confirm |
1338 | (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name)))) | |
1339 | (save-buffer) | |
0e362f54 | 1340 | (unless not-urgent |
97d3f950 RS |
1341 | (error "Aborted"))))) |
1342 | ||
2765044b DN |
1343 | (defvar vc-dired-window-configuration) |
1344 | ||
1345 | ;; Here's the major entry point. | |
1346 | ||
1347 | ;;;###autoload | |
1348 | (defun vc-next-action (verbose) | |
d7b60083 ER |
1349 | "Do the next logical version control operation on the current fileset. |
1350 | This requires that all files in the fileset be in the same state. | |
2765044b | 1351 | |
d7b60083 ER |
1352 | For locking systems: |
1353 | If every file is not already registered, this registers each for version | |
2765044b | 1354 | control. |
d7b60083 ER |
1355 | If every file is registered and not locked by anyone, this checks out |
1356 | a writable and locked file of each ready for editing. | |
1357 | If every file is checked out and locked by the calling user, this | |
1358 | first checks to see if each file has changed since checkout. If not, | |
1359 | it performs a revert on that file. | |
1360 | If every file has been changed, this pops up a buffer for entry | |
2765044b DN |
1361 | of a log message; when the message has been entered, it checks in the |
1362 | resulting changes along with the log message as change commentary. If | |
1363 | the variable `vc-keep-workfiles' is non-nil (which is its default), a | |
d7b60083 ER |
1364 | read-only copy of each changed file is left in place afterwards. |
1365 | If the affected file is registered and locked by someone else, you are | |
1366 | given the option to steal the lock(s). | |
1367 | ||
1368 | For merging systems: | |
1369 | If every file is not already registered, this registers each one for version | |
1370 | control. This does an add, but not a commit. | |
1371 | If every file is added but not committed, each one is committed. | |
1372 | If every working file is changed, but the corresponding repository file is | |
2765044b DN |
1373 | unchanged, this pops up a buffer for entry of a log message; when the |
1374 | message has been entered, it checks in the resulting changes along | |
1375 | with the logmessage as change commentary. A writable file is retained. | |
1376 | If the repository file is changed, you are asked if you want to | |
1377 | merge in the changes into your working copy." | |
2765044b | 1378 | (interactive "P") |
d7b60083 ER |
1379 | (let* ((files (vc-deduce-fileset)) |
1380 | (backend (vc-backend (car files))) | |
1381 | (state (vc-state (car files))) | |
1382 | (model (vc-checkout-model (car files))) | |
ac3f4c6f | 1383 | revision) |
d7b60083 ER |
1384 | ;; Verify that the fileset is homogenous |
1385 | (dolist (file (cdr files)) | |
1386 | (if (not (eq (vc-state file) state)) | |
1387 | (error "Fileset is in a mixed-up state")) | |
1388 | (if (not (eq (vc-checkout-model file) model)) | |
1389 | (error "Fileset has mixed checkout models"))) | |
1390 | ;; Check for buffers in the fileset not matching the on-disk contents. | |
1391 | (dolist (file files) | |
1392 | (let ((visited (get-file-buffer file))) | |
1393 | (when visited | |
1394 | (if vc-dired-mode | |
1395 | (switch-to-buffer-other-window visited) | |
1396 | (set-buffer visited)) | |
1397 | ;; Check relation of buffer and file, and make sure | |
1398 | ;; user knows what he's doing. First, finding the file | |
1399 | ;; will check whether the file on disk is newer. | |
1400 | ;; Ignore buffer-read-only during this test, and | |
1401 | ;; preserve find-file-literally. | |
1402 | (let ((buffer-read-only (not (file-writable-p file)))) | |
1403 | (find-file-noselect file nil find-file-literally)) | |
1404 | (if (not (verify-visited-file-modtime (current-buffer))) | |
1405 | (if (yes-or-no-p (format "Replace %s on disk with buffer contents? " file)) | |
1406 | (write-file buffer-file-name) | |
1407 | (error "Aborted")) | |
1408 | ;; Now, check if we have unsaved changes. | |
1409 | (vc-buffer-sync t) | |
1410 | (if (buffer-modified-p) | |
1411 | (or (y-or-n-p (message "Use %s on disk, keeping modified buffer? " file)) | |
1412 | (error "Aborted"))))))) | |
0e362f54 | 1413 | ;; Do the right thing |
d7b60083 ER |
1414 | (cond |
1415 | ;; Files aren't registered | |
1416 | ((not state) | |
1417 | (mapc 'vc-register files)) | |
ac3f4c6f | 1418 | ;; Files are up-to-date, or need a merge and user specified a revision |
d7b60083 | 1419 | ((or (eq state 'up-to-date) (and verbose (eq state 'needs-patch))) |
0e362f54 | 1420 | (cond |
d7b60083 | 1421 | (verbose |
ac3f4c6f ER |
1422 | ;; go to a different revision |
1423 | (setq revision (read-string "Branch, revision, or backend to move to: ")) | |
1424 | (let ((vsym (intern-soft (upcase revision)))) | |
d7b60083 | 1425 | (if (member vsym vc-handled-backends) |
ebd0c5ba | 1426 | (mapc (lambda (file) (vc-transfer-file file vsym)) files) |
d7b60083 | 1427 | (mapc (lambda (file) |
ac3f4c6f | 1428 | (vc-checkout file (eq model 'implicit) revision)))))) |
d7b60083 ER |
1429 | ((not (eq model 'implicit)) |
1430 | ;; check the files out | |
1431 | (mapc (lambda (file) (vc-checkout file t)) files)) | |
1432 | (t | |
1433 | ;; do nothing | |
1434 | (message "Fileset is up-to-date")))) | |
1435 | ;; Files have local changes | |
1436 | ((eq state 'edited) | |
1437 | (let ((ready-for-commit files)) | |
1438 | ;; If files are edited but read-only, give user a chance to correct | |
1439 | (dolist (file files) | |
1440 | (if (not (file-writable-p file)) | |
1441 | (progn | |
1442 | ;; Make the file+buffer read-write. | |
f509e245 | 1443 | (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue?" file)) |
d7b60083 ER |
1444 | (error "Aborted")) |
1445 | (set-file-modes file (logior (file-modes file) 128)) | |
1446 | (let ((visited (get-file-buffer file))) | |
1447 | (if visited | |
1448 | (save-excursion | |
1449 | (set-buffer visited) | |
1450 | (toggle-read-only -1))))))) | |
1451 | ;; Allow user to revert files with no changes | |
1452 | (save-excursion | |
1453 | (let ((revertlist '())) | |
1454 | (dolist (file files) | |
1455 | (let ((visited (get-file-buffer file))) | |
1456 | ;; For files with locking, if the file does not contain | |
1457 | ;; any changes, just let go of the lock, i.e. revert. | |
1458 | (if (and (not (eq model 'implicit)) | |
1459 | (vc-workfile-unchanged-p file) | |
1460 | ;; If buffer is modified, that means the user just | |
1461 | ;; said no to saving it; in that case, don't revert, | |
1462 | ;; because the user might intend to save after | |
1463 | ;; finishing the log entry and committing. | |
1464 | (not (and visited (buffer-modified-p)))) | |
1465 | (progn | |
1466 | (vc-revert-file file) | |
1467 | (delete file ready-for-commit))))))) | |
1468 | ;; Remaining files need to be committed | |
1469 | (if (not ready-for-commit) | |
1470 | (message "No files remain to be committed") | |
1d502d5a | 1471 | (if (not verbose) |
d7b60083 ER |
1472 | (vc-checkin ready-for-commit) |
1473 | (progn | |
ac3f4c6f ER |
1474 | (setq revision (read-string "New revision or backend: ")) |
1475 | (let ((vsym (intern (upcase revision)))) | |
d7b60083 ER |
1476 | (if (member vsym vc-handled-backends) |
1477 | (vc-transfer-file file vsym) | |
ac3f4c6f | 1478 | (vc-checkin ready-for-commit revision)))))))) |
d7b60083 ER |
1479 | ;; locked by somebody else (locking VCSes only) |
1480 | ((stringp state) | |
ac3f4c6f | 1481 | (let ((revision |
d7b60083 | 1482 | (if verbose |
5e8b0a32 DN |
1483 | (read-string "Revision to steal: ") |
1484 | (vc-working-revision file)))) | |
1485 | (mapc (lambda (file) (vc-steal-lock file revision state) files)))) | |
d7b60083 ER |
1486 | ;; needs-patch |
1487 | ((eq state 'needs-patch) | |
1488 | (dolist (file files) | |
6f41eeb5 | 1489 | (if (yes-or-no-p (format |
ac3f4c6f | 1490 | "%s is not up-to-date. Get latest revision? " |
0e362f54 | 1491 | (file-name-nondirectory file))) |
d7b60083 ER |
1492 | (vc-checkout file (eq model 'implicit) t) |
1493 | (if (and (not (eq model 'implicit)) | |
ac3f4c6f | 1494 | (yes-or-no-p "Lock this revision? ")) |
d7b60083 ER |
1495 | (vc-checkout file t))))) |
1496 | ;; needs-merge | |
1497 | ((eq state 'needs-merge) | |
1498 | (dolist (file files) | |
6f41eeb5 | 1499 | (if (yes-or-no-p (format |
0e362f54 GM |
1500 | "%s is not up-to-date. Merge in changes now? " |
1501 | (file-name-nondirectory file))) | |
d7b60083 | 1502 | (vc-maybe-resolve-conflicts file (vc-call merge-news file))))) |
46e33aee | 1503 | |
d7b60083 ER |
1504 | ;; unlocked-changes |
1505 | ((eq state 'unlocked-changes) | |
1506 | (dolist (file files) | |
1507 | (if (not (equal buffer-file-name file)) | |
1508 | (find-file-other-window file)) | |
0e362f54 | 1509 | (if (save-window-excursion |
d7b60083 ER |
1510 | (vc-diff-internal |
1511 | (vc-backend file) nil (list file) | |
ac3f4c6f | 1512 | (vc-working-revision file) nil) |
0e362f54 | 1513 | (goto-char (point-min)) |
ceec5a0c | 1514 | (let ((inhibit-read-only t)) |
f4f34b33 | 1515 | (insert |
ceec5a0c | 1516 | (format "Changes to %s since last lock:\n\n" file))) |
0e362f54 GM |
1517 | (not (beep)) |
1518 | (yes-or-no-p (concat "File has unlocked changes. " | |
1519 | "Claim lock retaining changes? "))) | |
1520 | (progn (vc-call steal-lock file) | |
61de26cb | 1521 | (clear-visited-file-modtime) |
0e362f54 GM |
1522 | ;; Must clear any headers here because they wouldn't |
1523 | ;; show that the file is locked now. | |
1524 | (vc-clear-headers file) | |
a36319a4 | 1525 | (write-file buffer-file-name) |
0e362f54 GM |
1526 | (vc-mode-line file)) |
1527 | (if (not (yes-or-no-p | |
ac3f4c6f | 1528 | "Revert to checked-in revision, instead? ")) |
0e362f54 | 1529 | (error "Checkout aborted") |
61de26cb | 1530 | (vc-revert-buffer-internal t t) |
0e362f54 | 1531 | (vc-checkout file t)))))))) |
e1f297e6 | 1532 | |
61de26cb ER |
1533 | (defun vc-create-repo (backend) |
1534 | "Create an empty repository in the current directory." | |
1535 | (interactive | |
1536 | (list | |
1537 | (intern | |
1538 | (upcase | |
1539 | (completing-read | |
1540 | "Create repository for: " | |
1541 | (mapcar (lambda (b) (list (downcase (symbol-name b)))) vc-handled-backends) | |
1542 | nil t))))) | |
1543 | (vc-call-backend backend 'create-repo)) | |
1544 | ||
637a8ae9 | 1545 | ;;;###autoload |
ac3f4c6f | 1546 | (defun vc-register (&optional set-revision comment) |
2765044b | 1547 | "Register the current file into a version control system. |
ac3f4c6f | 1548 | With prefix argument SET-REVISION, allow user to specify initial revision |
2765044b | 1549 | level. If COMMENT is present, use that as an initial comment. |
0e362f54 | 1550 | |
2765044b DN |
1551 | The version control system to use is found by cycling through the list |
1552 | `vc-handled-backends'. The first backend in that list which declares | |
1553 | itself responsible for the file (usually because other files in that | |
1554 | directory are already registered under that backend) will be used to | |
1555 | register the file. If no backend declares itself responsible, the | |
1556 | first backend that could register the file is used." | |
1557 | (interactive "P") | |
1558 | (unless buffer-file-name (error "No visited file")) | |
1559 | (when (vc-backend buffer-file-name) | |
1560 | (if (vc-registered buffer-file-name) | |
1561 | (error "This file is already registered") | |
1562 | (unless (y-or-n-p "Previous master file has vanished. Make a new one? ") | |
1563 | (error "Aborted")))) | |
1564 | ;; Watch out for new buffers of size 0: the corresponding file | |
1565 | ;; does not exist yet, even though buffer-modified-p is nil. | |
1566 | (if (and (not (buffer-modified-p)) | |
1567 | (zerop (buffer-size)) | |
1568 | (not (file-exists-p buffer-file-name))) | |
1569 | (set-buffer-modified-p t)) | |
1570 | (vc-buffer-sync) | |
46e33aee | 1571 | |
d7b60083 | 1572 | (vc-start-entry (list buffer-file-name) |
ac3f4c6f ER |
1573 | (if set-revision |
1574 | (read-string (format "Initial revision level for %s: " | |
1d502d5a | 1575 | (buffer-name))) |
04864eb0 | 1576 | (vc-call-backend (vc-responsible-backend buffer-file-name) |
ac3f4c6f | 1577 | 'init-revision)) |
0e362f54 | 1578 | (or comment (not vc-initial-comment)) |
0ab66291 | 1579 | nil |
0e362f54 | 1580 | "Enter initial comment." |
d7b60083 ER |
1581 | (lambda (files rev comment) |
1582 | (dolist (file files) | |
1583 | (message "Registering %s... " file) | |
1584 | (let ((backend (vc-responsible-backend file t))) | |
1585 | (vc-file-clearprops file) | |
1586 | (vc-call-backend backend 'register (list file) rev comment) | |
1587 | (vc-file-setprop file 'vc-backend backend) | |
1588 | (unless vc-make-backup-files | |
1589 | (make-local-variable 'backup-inhibited) | |
1590 | (setq backup-inhibited t))) | |
1591 | (message "Registering %s... done" file))))) | |
1592 | ||
1593 | (defun vc-register-with (backend) | |
1594 | "Register the current file with a specified back end." | |
1595 | (interactive "SBackend: ") | |
1596 | (if (not (member backend vc-handled-backends)) | |
1597 | (error "Unknown back end.")) | |
1598 | (let ((vc-handled-backends (list backend))) | |
1599 | (call-interactively 'vc-register))) | |
8989ab56 | 1600 | |
624b4662 | 1601 | (defun vc-resynch-window (file &optional keep noquery) |
099bd78a SM |
1602 | "If FILE is in the current buffer, either revert or unvisit it. |
1603 | The choice between revert (to see expanded keywords) and unvisit depends on | |
1604 | `vc-keep-workfiles'. NOQUERY if non-nil inhibits confirmation for | |
0e362f54 GM |
1605 | reverting. NOQUERY should be t *only* if it is known the only |
1606 | difference between the buffer and the file is due to version control | |
1607 | rather than user editing!" | |
594722a8 ER |
1608 | (and (string= buffer-file-name file) |
1609 | (if keep | |
1610 | (progn | |
61de26cb | 1611 | (vc-revert-buffer-internal t noquery) |
0e362f54 GM |
1612 | ;; TODO: Adjusting view mode might no longer be necessary |
1613 | ;; after RMS change to files.el of 1999-08-08. Investigate | |
1614 | ;; this when we install the new VC. | |
f8791ebe AS |
1615 | (and view-read-only |
1616 | (if (file-writable-p file) | |
1617 | (and view-mode | |
1618 | (let ((view-old-buffer-read-only nil)) | |
1619 | (view-mode-exit))) | |
1620 | (and (not view-mode) | |
1621 | (not (eq (get major-mode 'mode-class) 'special)) | |
1622 | (view-mode-enter)))) | |
594722a8 | 1623 | (vc-mode-line buffer-file-name)) |
88a2ffaf | 1624 | (kill-buffer (current-buffer))))) |
594722a8 | 1625 | |
503b5c85 | 1626 | (defun vc-resynch-buffer (file &optional keep noquery) |
0e362f54 | 1627 | "If FILE is currently visited, resynch its buffer." |
4b398f5d AS |
1628 | (if (string= buffer-file-name file) |
1629 | (vc-resynch-window file keep noquery) | |
1630 | (let ((buffer (get-file-buffer file))) | |
1631 | (if buffer | |
0e362f54 GM |
1632 | (with-current-buffer buffer |
1633 | (vc-resynch-window file keep noquery))))) | |
1634 | (vc-dired-resynch-file file)) | |
503b5c85 | 1635 | |
d7b60083 ER |
1636 | (defun vc-start-entry (files rev comment initial-contents msg action &optional after-hook) |
1637 | "Accept a comment for an operation on FILES revision REV. | |
6f41eeb5 | 1638 | If COMMENT is nil, pop up a VC-log buffer, emit MSG, and set the |
0ab66291 AS |
1639 | action on close to ACTION. If COMMENT is a string and |
1640 | INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial | |
1641 | contents of the log entry buffer. If COMMENT is a string and | |
1642 | INITIAL-CONTENTS is nil, do action immediately as if the user had | |
1643 | entered COMMENT. If COMMENT is t, also do action immediately with an | |
46e33aee TTN |
1644 | empty comment. Remember the file's buffer in `vc-parent-buffer' |
1645 | \(current one if no file). AFTER-HOOK specifies the local value | |
0ab66291 | 1646 | for vc-log-operation-hook." |
d7b60083 ER |
1647 | (let ((parent |
1648 | (if (and files (equal (length files) 1)) | |
1649 | (get-file-buffer (car files)) | |
1650 | (current-buffer)))) | |
f0b188ed | 1651 | (if vc-before-checkin-hook |
d7b60083 | 1652 | (if files |
0e362f54 | 1653 | (with-current-buffer parent |
f0b188ed RS |
1654 | (run-hooks 'vc-before-checkin-hook)) |
1655 | (run-hooks 'vc-before-checkin-hook))) | |
0ab66291 | 1656 | (if (and comment (not initial-contents)) |
e1f297e6 ER |
1657 | (set-buffer (get-buffer-create "*VC-log*")) |
1658 | (pop-to-buffer (get-buffer-create "*VC-log*"))) | |
8c0aaf40 ER |
1659 | (set (make-local-variable 'vc-parent-buffer) parent) |
1660 | (set (make-local-variable 'vc-parent-buffer-name) | |
1661 | (concat " from " (buffer-name vc-parent-buffer))) | |
d7b60083 ER |
1662 | ;;(if file (vc-mode-line file)) |
1663 | (vc-log-edit files) | |
b965445f RS |
1664 | (make-local-variable 'vc-log-after-operation-hook) |
1665 | (if after-hook | |
1666 | (setq vc-log-after-operation-hook after-hook)) | |
e1f297e6 | 1667 | (setq vc-log-operation action) |
ac3f4c6f | 1668 | (setq vc-log-revision rev) |
347bef30 SM |
1669 | (when comment |
1670 | (erase-buffer) | |
1671 | (when (stringp comment) (insert comment))) | |
1672 | (if (or (not comment) initial-contents) | |
1673 | (message "%s Type C-c C-c when done" msg) | |
1674 | (vc-finish-logentry (eq comment t))))) | |
e1f297e6 | 1675 | |
c6d4f628 | 1676 | (defun vc-checkout (file &optional writable rev) |
099bd78a SM |
1677 | "Retrieve a copy of the revision REV of FILE. |
1678 | If WRITABLE is non-nil, make sure the retrieved file is writable. | |
133a84aa AS |
1679 | REV defaults to the latest revision. |
1680 | ||
1681 | After check-out, runs the normal hook `vc-checkout-hook'." | |
ffda0460 AS |
1682 | (and writable |
1683 | (not rev) | |
10b48cc4 | 1684 | (vc-call make-version-backups-p file) |
ffda0460 | 1685 | (vc-up-to-date-p file) |
10b48cc4 | 1686 | (vc-make-version-backup file)) |
099bd78a | 1687 | (with-vc-properties |
d7b60083 | 1688 | (list file) |
099bd78a SM |
1689 | (condition-case err |
1690 | (vc-call checkout file writable rev) | |
1691 | (file-error | |
1692 | ;; Maybe the backend is not installed ;-( | |
1693 | (when writable | |
1694 | (let ((buf (get-file-buffer file))) | |
1695 | (when buf (with-current-buffer buf (toggle-read-only -1))))) | |
1696 | (signal (car err) (cdr err)))) | |
a3255400 SM |
1697 | `((vc-state . ,(if (or (eq (vc-checkout-model file) 'implicit) |
1698 | (not writable)) | |
1699 | (if (vc-call latest-on-branch-p file) | |
1700 | 'up-to-date | |
1701 | 'needs-patch) | |
1702 | 'edited)) | |
1703 | (vc-checkout-time . ,(nth 5 (file-attributes file))))) | |
7cad930d AS |
1704 | (vc-resynch-buffer file t t) |
1705 | (run-hooks 'vc-checkout-hook)) | |
594722a8 | 1706 | |
0e362f54 | 1707 | (defun vc-steal-lock (file rev owner) |
099bd78a | 1708 | "Steal the lock on FILE." |
29fc1ce9 | 1709 | (let (file-description) |
29fc1ce9 RS |
1710 | (if rev |
1711 | (setq file-description (format "%s:%s" file rev)) | |
1712 | (setq file-description file)) | |
4bc504c8 RS |
1713 | (if (not (yes-or-no-p (format "Steal the lock on %s from %s? " |
1714 | file-description owner))) | |
0e362f54 | 1715 | (error "Steal canceled")) |
869131a5 AS |
1716 | (message "Stealing lock on %s..." file) |
1717 | (with-vc-properties | |
d7b60083 | 1718 | (list file) |
869131a5 AS |
1719 | (vc-call steal-lock file rev) |
1720 | `((vc-state . edited))) | |
1721 | (vc-resynch-buffer file t t) | |
1722 | (message "Stealing lock on %s...done" file) | |
1723 | ;; Write mail after actually stealing, because if the stealing | |
1724 | ;; goes wrong, we don't want to send any mail. | |
1725 | (compose-mail owner (format "Stolen lock on %s" file-description)) | |
29fc1ce9 | 1726 | (setq default-directory (expand-file-name "~/")) |
29fc1ce9 RS |
1727 | (goto-char (point-max)) |
1728 | (insert | |
1729 | (format "I stole the lock on %s, " file-description) | |
1730 | (current-time-string) | |
1731 | ".\n") | |
1732 | (message "Please explain why you stole the lock. Type C-c C-c when done."))) | |
594722a8 | 1733 | |
d7b60083 ER |
1734 | (defun vc-checkin (files &optional rev comment initial-contents) |
1735 | "Check in FILES. | |
ac3f4c6f | 1736 | The optional argument REV may be a string specifying the new revision |
0e362f54 | 1737 | level (if nil increment the current level). COMMENT is a comment |
0ab66291 AS |
1738 | string; if omitted, a buffer is popped up to accept a comment. If |
1739 | INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial contents | |
1740 | of the log entry buffer. | |
0e362f54 GM |
1741 | |
1742 | If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided | |
1743 | that the version control system supports this mode of operation. | |
861f3c29 DL |
1744 | |
1745 | Runs the normal hook `vc-checkin-hook'." | |
6f41eeb5 | 1746 | (vc-start-entry |
d7b60083 | 1747 | files rev comment initial-contents |
6f41eeb5 | 1748 | "Enter a change comment." |
d7b60083 ER |
1749 | (lambda (files rev comment) |
1750 | (message "Checking in %s..." (vc-delistify files)) | |
0e362f54 GM |
1751 | ;; "This log message intentionally left almost blank". |
1752 | ;; RCS 5.7 gripes about white-space-only comments too. | |
1753 | (or (and comment (string-match "[^\t\n ]" comment)) | |
1754 | (setq comment "*** empty log message ***")) | |
46e33aee | 1755 | (with-vc-properties |
d7b60083 ER |
1756 | files |
1757 | ;; We used to change buffers to get local value of vc-checkin-switches, | |
1758 | ;; but 'the' local buffer is not a well-defined concept for filesets. | |
1759 | (progn | |
1760 | (vc-call checkin files rev comment) | |
1761 | (mapc 'vc-delete-automatic-version-backups files)) | |
a3255400 SM |
1762 | `((vc-state . up-to-date) |
1763 | (vc-checkout-time . ,(nth 5 (file-attributes file))) | |
ac3f4c6f | 1764 | (vc-working-revision . nil))) |
d7b60083 | 1765 | (message "Checking in %s...done" (vc-delistify files))) |
0e362f54 | 1766 | 'vc-checkin-hook)) |
594722a8 | 1767 | |
8c0aaf40 | 1768 | (defun vc-finish-logentry (&optional nocomment) |
6f1ecae4 AS |
1769 | "Complete the operation implied by the current log entry. |
1770 | Use the contents of the current buffer as a check-in or registration | |
1771 | comment. If the optional arg NOCOMMENT is non-nil, then don't check | |
11cdd167 | 1772 | the buffer contents as a comment." |
594722a8 | 1773 | (interactive) |
8c0aaf40 | 1774 | ;; Check and record the comment, if any. |
0e362f54 GM |
1775 | (unless nocomment |
1776 | ;; Comment too long? | |
d7b60083 | 1777 | (vc-call-backend (or (and vc-log-fileset (vc-backend (car vc-log-fileset))) |
0e362f54 GM |
1778 | (vc-responsible-backend default-directory)) |
1779 | 'logentry-check) | |
11cdd167 | 1780 | (run-hooks 'vc-logentry-check-hook)) |
b2396d1f | 1781 | ;; Sync parent buffer in case the user modified it while editing the comment. |
cdaf7a1a | 1782 | ;; But not if it is a vc-dired buffer. |
0e362f54 GM |
1783 | (with-current-buffer vc-parent-buffer |
1784 | (or vc-dired-mode (vc-buffer-sync))) | |
d6ba9c39 ER |
1785 | (if (not vc-log-operation) |
1786 | (error "No log operation is pending")) | |
61dee1e7 AS |
1787 | ;; save the parameters held in buffer-local variables |
1788 | (let ((log-operation vc-log-operation) | |
d7b60083 | 1789 | (log-fileset vc-log-fileset) |
ac3f4c6f | 1790 | (log-revision vc-log-revision) |
61dee1e7 | 1791 | (log-entry (buffer-string)) |
2c4eea90 KH |
1792 | (after-hook vc-log-after-operation-hook) |
1793 | (tmp-vc-parent-buffer vc-parent-buffer)) | |
e2bef5c3 | 1794 | (pop-to-buffer vc-parent-buffer) |
61dee1e7 AS |
1795 | ;; OK, do it to it |
1796 | (save-excursion | |
0e362f54 | 1797 | (funcall log-operation |
d7b60083 | 1798 | log-fileset |
ac3f4c6f | 1799 | log-revision |
61dee1e7 | 1800 | log-entry)) |
df1e7b91 KH |
1801 | ;; Remove checkin window (after the checkin so that if that fails |
1802 | ;; we don't zap the *VC-log* buffer and the typing therein). | |
1803 | (let ((logbuf (get-buffer "*VC-log*"))) | |
2c4eea90 KH |
1804 | (cond ((and logbuf vc-delete-logbuf-window) |
1805 | (delete-windows-on logbuf (selected-frame)) | |
262c8cea | 1806 | ;; Kill buffer and delete any other dedicated windows/frames. |
2c4eea90 | 1807 | (kill-buffer logbuf)) |
0ab66291 AS |
1808 | (logbuf (pop-to-buffer "*VC-log*") |
1809 | (bury-buffer) | |
1810 | (pop-to-buffer tmp-vc-parent-buffer)))) | |
e2bef5c3 | 1811 | ;; Now make sure we see the expanded headers |
d7b60083 ER |
1812 | (if log-fileset |
1813 | (mapc | |
1814 | (lambda (file) (vc-resynch-buffer file vc-keep-workfiles t)) | |
1815 | log-fileset)) | |
0e362f54 | 1816 | (if vc-dired-mode |
0ab66291 | 1817 | (dired-move-to-filename)) |
37667a5c | 1818 | (run-hooks after-hook 'vc-finish-logentry-hook))) |
594722a8 | 1819 | |
2765044b DN |
1820 | ;;; Additional entry points for examining version histories |
1821 | ||
1822 | (defun vc-default-diff-tree (backend dir rev1 rev2) | |
1823 | "List differences for all registered files at and below DIR. | |
ac3f4c6f | 1824 | The meaning of REV1 and REV2 is the same as for `vc-revision-diff'." |
2765044b DN |
1825 | ;; This implementation does an explicit tree walk, and calls |
1826 | ;; vc-BACKEND-diff directly for each file. An optimization | |
1827 | ;; would be to use `vc-diff-internal', so that diffs can be local, | |
1828 | ;; and to call it only for files that are actually changed. | |
1829 | ;; However, this is expensive for some backends, and so it is left | |
1830 | ;; to backend-specific implementations. | |
1831 | (setq default-directory dir) | |
1832 | (vc-file-tree-walk | |
1833 | default-directory | |
1834 | (lambda (f) | |
1835 | (vc-exec-after | |
1836 | `(let ((coding-system-for-read (vc-coding-system-for-diff ',f))) | |
1837 | (message "Looking at %s" ',f) | |
1838 | (vc-call-backend ',(vc-backend f) | |
1839 | 'diff (list ',f) ',rev1 ',rev2)))))) | |
1840 | ||
1841 | (defun vc-coding-system-for-diff (file) | |
1842 | "Return the coding system for reading diff output for FILE." | |
1843 | (or coding-system-for-read | |
1844 | ;; if we already have this file open, | |
1845 | ;; use the buffer's coding system | |
1846 | (let ((buf (find-buffer-visiting file))) | |
1847 | (if buf (with-current-buffer buf | |
1848 | buffer-file-coding-system))) | |
1849 | ;; otherwise, try to find one based on the file name | |
1850 | (car (find-operation-coding-system 'insert-file-contents file)) | |
1851 | ;; and a final fallback | |
1852 | 'undecided)) | |
1853 | ||
1854 | (defun vc-switches (backend op) | |
1855 | (let ((switches | |
1856 | (or (if backend | |
1857 | (let ((sym (vc-make-backend-sym | |
1858 | backend (intern (concat (symbol-name op) | |
1859 | "-switches"))))) | |
1860 | (if (boundp sym) (symbol-value sym)))) | |
1861 | (let ((sym (intern (format "vc-%s-switches" (symbol-name op))))) | |
1862 | (if (boundp sym) (symbol-value sym))) | |
1863 | (cond | |
1864 | ((eq op 'diff) diff-switches))))) | |
1865 | (if (stringp switches) (list switches) | |
1866 | ;; If not a list, return nil. | |
1867 | ;; This is so we can set vc-diff-switches to t to override | |
1868 | ;; any switches in diff-switches. | |
1869 | (if (listp switches) switches)))) | |
594722a8 | 1870 | |
2765044b DN |
1871 | ;; Old def for compatibility with Emacs-21.[123]. |
1872 | (defmacro vc-diff-switches-list (backend) `(vc-switches ',backend 'diff)) | |
1873 | (make-obsolete 'vc-diff-switches-list 'vc-switches "22.1") | |
1874 | ||
d7b60083 | 1875 | (defun vc-diff-sentinel (verbose rev1-name rev2-name) |
17f3909f SM |
1876 | ;; The empty sync output case has already been handled, so the only |
1877 | ;; possibility of an empty output is for an async process, in which case | |
1878 | ;; it's important to insert the "diffs end here" message in the buffer | |
1879 | ;; since the user may miss a message in the echo area. | |
1880 | (when verbose | |
1881 | (let ((inhibit-read-only t)) | |
1882 | (if (eq (buffer-size) 0) | |
1883 | (insert "No differences found.\n") | |
1884 | (insert (format "\n\nDiffs between %s and %s end here." rev1-name rev2-name))))) | |
1885 | (goto-char (point-min)) | |
1886 | (shrink-window-if-larger-than-buffer)) | |
d7b60083 ER |
1887 | |
1888 | (defun vc-diff-internal (backend async files rev1 rev2 &optional verbose) | |
1889 | "Report diffs between two revisions of a fileset. | |
1890 | Diff output goes to the *vc-diff* buffer. The function | |
1891 | returns t if the buffer had changes, nil otherwise." | |
1892 | (let* ((filenames (vc-delistify files)) | |
ac3f4c6f | 1893 | (rev1-name (or rev1 "working revision")) |
d7b60083 ER |
1894 | (rev2-name (or rev2 "workfile")) |
1895 | ;; Set coding system based on the first file. It's a kluge, | |
1896 | ;; but the only way to set it for each file included would | |
1897 | ;; be to call the back end separately for each file. | |
1898 | (coding-system-for-read | |
1899 | (if files (vc-coding-system-for-diff (car files)) 'undecided))) | |
1900 | (vc-setup-buffer "*vc-diff*") | |
ebd0c5ba | 1901 | (message "Finding changes in %s..." filenames) |
d7b60083 ER |
1902 | ;; Many backends don't handle well the case of a file that has been |
1903 | ;; added but not yet committed to the repo (notably CVS and Subversion). | |
1904 | ;; Do that work here so the backends don't have to futz with it. | |
1905 | (let ((filtered '())) | |
1906 | (dolist (file files) | |
ac3f4c6f | 1907 | (cond ((and (not (file-directory-p file)) (string= (vc-working-revision file) "0")) |
d7b60083 ER |
1908 | (progn |
1909 | ;; This file is added but not yet committed; | |
1910 | ;; there is no master file to diff against. | |
1911 | (if (or rev1 rev2) | |
1912 | (error "No revisions of %s exist" file) | |
1913 | ;; We regard this as "changed". | |
1914 | ;; Diff it against /dev/null. | |
1915 | (apply 'vc-do-command "*vc-diff*" | |
1916 | 1 "diff" file | |
1917 | (append (vc-switches nil 'diff) '("/dev/null")))))) | |
1918 | (t | |
1919 | (add-to-list 'filtered file t)))) | |
1920 | (let ((vc-disable-async-diff (not async))) | |
1921 | (vc-call-backend backend 'diff filtered rev1 rev2 "*vc-diff*"))) | |
1922 | (set-buffer "*vc-diff*") | |
17f3909f SM |
1923 | (if (and (zerop (buffer-size)) |
1924 | (not (get-buffer-process (current-buffer)))) | |
1925 | ;; Treat this case specially so as not to pop the buffer. | |
1926 | (progn | |
1927 | (message "No changes between %s and %s" rev1-name rev2-name) | |
1928 | nil) | |
1929 | (pop-to-buffer (current-buffer)) | |
1930 | ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's | |
1931 | ;; not available. Work around that. | |
1932 | (if (require 'diff-mode nil t) (diff-mode)) | |
1933 | (vc-exec-after `(vc-diff-sentinel ,verbose ,rev1-name ,rev2-name)) | |
1934 | ;; In the async case, we return t even if there are no differences | |
1935 | ;; because we don't know that yet. | |
1936 | t))) | |
594722a8 | 1937 | |
637a8ae9 | 1938 | ;;;###autoload |
d7b60083 ER |
1939 | (defun vc-history-diff (backend files rev1 rev2) |
1940 | "Report diffs between revisions of the fileset in the repository history." | |
0e362f54 | 1941 | (interactive |
d7b60083 ER |
1942 | (let* ((files (vc-deduce-fileset t)) |
1943 | (first (car files)) | |
1944 | (backend (vc-backend first)) | |
1945 | (completion-table | |
1946 | (vc-call-backend backend 'revision-completion-table first)) | |
1947 | (rev1-default nil) | |
1948 | (rev2-default nil)) | |
c0d66cb2 | 1949 | (cond |
ac3f4c6f | 1950 | ;; someday we may be able to do revision completion on non-singleton |
d7b60083 ER |
1951 | ;; filesets, but not yet. |
1952 | ((/= (length files) 1) | |
1953 | nil) | |
ac3f4c6f | 1954 | ;; if it's a directory, don't supply any revision default |
d7b60083 | 1955 | ((file-directory-p first) |
c0d66cb2 | 1956 | nil) |
ac3f4c6f | 1957 | ;; if the file is not up-to-date, use working revision as older revision |
d7b60083 | 1958 | ((not (vc-up-to-date-p first)) |
ac3f4c6f ER |
1959 | (setq rev1-default (vc-working-revision first))) |
1960 | ;; if the file is not locked, use last and previous revisions as defaults | |
c0d66cb2 | 1961 | (t |
ac3f4c6f ER |
1962 | (setq rev1-default (vc-call previous-revision first |
1963 | (vc-working-revision first))) | |
c63f9a0e | 1964 | (if (string= rev1-default "") (setq rev1-default nil)) |
ac3f4c6f | 1965 | (setq rev2-default (vc-working-revision first)))) |
c0d66cb2 | 1966 | ;; construct argument list |
4d83a657 | 1967 | (let* ((rev1-prompt (if rev1-default |
ac3f4c6f | 1968 | (concat "Older revision (default " |
4d83a657 | 1969 | rev1-default "): ") |
ac3f4c6f ER |
1970 | "Older revision: ")) |
1971 | (rev2-prompt (concat "Newer revision (default " | |
4d83a657 SM |
1972 | (or rev2-default "current source") "): ")) |
1973 | (rev1 (if completion-table | |
1974 | (completing-read rev1-prompt completion-table | |
d7b60083 | 1975 | nil nil nil nil rev1-default) |
4d83a657 SM |
1976 | (read-string rev1-prompt nil nil rev1-default))) |
1977 | (rev2 (if completion-table | |
1978 | (completing-read rev2-prompt completion-table | |
d7b60083 | 1979 | nil nil nil nil rev2-default) |
4d83a657 | 1980 | (read-string rev2-prompt nil nil rev2-default)))) |
d7b60083 ER |
1981 | (if (string= rev1 "") (setq rev1 nil)) |
1982 | (if (string= rev2 "") (setq rev2 nil)) | |
1983 | (list backend files rev1 rev2)))) | |
1984 | (if (and (not rev1) rev2) | |
1985 | (error "Not a valid revision range.")) | |
1986 | (vc-diff-internal backend t files rev1 rev2 (interactive-p))) | |
1987 | ||
727c4443 ER |
1988 | (defun vc-contains-version-controlled-file (dir) |
1989 | "Return t if DIR contains a version-controlled file, nil otherwise." | |
1990 | (catch 'found | |
1991 | (mapc (lambda (f) (and (not (file-directory-p f)) (vc-backend f) (throw 'found 't))) (directory-files dir)) | |
1992 | nil)) | |
1993 | ||
d7b60083 ER |
1994 | ;;;###autoload |
1995 | (defun vc-diff (historic) | |
ac3f4c6f | 1996 | "Display diffs between file revisions. |
727c4443 ER |
1997 | Normally this compares the currently selected fileset with their |
1998 | working revisions. With a prefix argument HISTORIC, it reads two revision | |
1999 | designators specifying which revisions to compare. | |
2000 | ||
2001 | If no current fileset is available (that is, we are not in | |
2002 | VC-Dired mode and the visited file of the current buffer is not | |
2003 | under version control) behave specially; if there are | |
2004 | version-controlled files in the current directory, treat all | |
2005 | version-controlled files recursively beneath the current | |
2006 | directory as the selected fileset. | |
2007 | " | |
2008 | ||
d7b60083 | 2009 | (interactive "P") |
ebd0c5ba ER |
2010 | (cond |
2011 | ;;((not (vc-contains-version-controlled-file default-directory)) | |
2012 | ;;(error "No version-controlled files directly beneath default directory")) | |
2013 | (historic | |
2014 | (call-interactively 'vc-history-diff)) | |
2015 | (t | |
2016 | (let* ((files (vc-deduce-fileset t)) | |
2017 | (first (car files)) | |
2018 | (backend | |
2019 | (cond ((file-directory-p first) | |
2020 | (vc-responsible-backend first)) | |
2021 | (t | |
2022 | (vc-backend first))))) | |
2023 | (vc-diff-internal backend t files nil nil (interactive-p)))))) | |
2c87edc1 | 2024 | |
f1818994 | 2025 | ;;;###autoload |
ac3f4c6f ER |
2026 | (defun vc-revision-other-window (rev) |
2027 | "Visit revision REV of the current file in another window. | |
2028 | If the current file is named `F', the revision is named `F.~REV~'. | |
6f1ecae4 | 2029 | If `F.~REV~' already exists, use it instead of checking it out again." |
4d83a657 SM |
2030 | (interactive |
2031 | (save-current-buffer | |
2032 | (vc-ensure-vc-buffer) | |
2033 | (let ((completion-table | |
2034 | (vc-call revision-completion-table buffer-file-name)) | |
ac3f4c6f | 2035 | (prompt "Revision to visit (default is working revision): ")) |
4d83a657 SM |
2036 | (list |
2037 | (if completion-table | |
2038 | (completing-read prompt completion-table) | |
2039 | (read-string prompt)))))) | |
b6909007 | 2040 | (vc-ensure-vc-buffer) |
5e011cb2 | 2041 | (let* ((file buffer-file-name) |
ac3f4c6f ER |
2042 | (revision (if (string-equal rev "") |
2043 | (vc-working-revision file) | |
ac0aae44 | 2044 | rev))) |
ac3f4c6f | 2045 | (switch-to-buffer-other-window (vc-find-revision file revision)))) |
ac0aae44 | 2046 | |
ac3f4c6f ER |
2047 | (defun vc-find-revision (file revision) |
2048 | "Read REVISION of FILE into a buffer and return the buffer." | |
2049 | (let ((automatic-backup (vc-version-backup-file-name file revision)) | |
fd8160f7 | 2050 | (filebuf (or (get-file-buffer file) (current-buffer))) |
ac3f4c6f | 2051 | (filename (vc-version-backup-file-name file revision 'manual))) |
fd8160f7 | 2052 | (unless (file-exists-p filename) |
10b48cc4 | 2053 | (if (file-exists-p automatic-backup) |
fd8160f7 SM |
2054 | (rename-file automatic-backup filename nil) |
2055 | (message "Checking out %s..." filename) | |
2056 | (with-current-buffer filebuf | |
2057 | (let ((failed t)) | |
2058 | (unwind-protect | |
2059 | (let ((coding-system-for-read 'no-conversion) | |
2060 | (coding-system-for-write 'no-conversion)) | |
2061 | (with-temp-file filename | |
2062 | (let ((outbuf (current-buffer))) | |
2063 | ;; Change buffer to get local value of | |
2064 | ;; vc-checkout-switches. | |
2065 | (with-current-buffer filebuf | |
ac3f4c6f | 2066 | (vc-call find-revision file revision outbuf)))) |
fd8160f7 SM |
2067 | (setq failed nil)) |
2068 | (if (and failed (file-exists-p filename)) | |
2069 | (delete-file filename)))) | |
2070 | (vc-mode-line file)) | |
2071 | (message "Checking out %s...done" filename))) | |
2072 | (find-file-noselect filename))) | |
2073 | ||
594722a8 ER |
2074 | ;; Header-insertion code |
2075 | ||
637a8ae9 | 2076 | ;;;###autoload |
594722a8 | 2077 | (defun vc-insert-headers () |
6f1ecae4 | 2078 | "Insert headers into a file for use with a version control system. |
b524ce9f | 2079 | Headers desired are inserted at point, and are pulled from |
0e362f54 | 2080 | the variable `vc-BACKEND-header'." |
594722a8 | 2081 | (interactive) |
b6909007 | 2082 | (vc-ensure-vc-buffer) |
594722a8 ER |
2083 | (save-excursion |
2084 | (save-restriction | |
2085 | (widen) | |
2086 | (if (or (not (vc-check-headers)) | |
820bde8d | 2087 | (y-or-n-p "Version headers already exist. Insert another set? ")) |
04864eb0 SM |
2088 | (let* ((delims (cdr (assq major-mode vc-comment-alist))) |
2089 | (comment-start-vc (or (car delims) comment-start "#")) | |
2090 | (comment-end-vc (or (car (cdr delims)) comment-end "")) | |
2091 | (hdsym (vc-make-backend-sym (vc-backend buffer-file-name) | |
2092 | 'header)) | |
2093 | (hdstrings (and (boundp hdsym) (symbol-value hdsym)))) | |
2094 | (dolist (s hdstrings) | |
2095 | (insert comment-start-vc "\t" s "\t" | |
2096 | comment-end-vc "\n")) | |
2097 | (if vc-static-header-alist | |
2098 | (dolist (f vc-static-header-alist) | |
2099 | (if (string-match (car f) buffer-file-name) | |
2100 | (insert (format (cdr f) (car hdstrings))))))))))) | |
594722a8 | 2101 | |
0e362f54 | 2102 | (defun vc-clear-headers (&optional file) |
099bd78a | 2103 | "Clear all version headers in the current buffer (or FILE). |
6f1ecae4 | 2104 | The headers are reset to their non-expanded form." |
0e362f54 GM |
2105 | (let* ((filename (or file buffer-file-name)) |
2106 | (visited (find-buffer-visiting filename)) | |
2107 | (backend (vc-backend filename))) | |
2108 | (when (vc-find-backend-function backend 'clear-headers) | |
6f41eeb5 | 2109 | (if visited |
0e362f54 GM |
2110 | (let ((context (vc-buffer-context))) |
2111 | ;; save-excursion may be able to relocate point and mark | |
2112 | ;; properly. If it fails, vc-restore-buffer-context | |
2113 | ;; will give it a second try. | |
2114 | (save-excursion | |
2115 | (vc-call-backend backend 'clear-headers)) | |
2116 | (vc-restore-buffer-context context)) | |
7849e179 | 2117 | (set-buffer (find-file-noselect filename)) |
0e362f54 GM |
2118 | (vc-call-backend backend 'clear-headers) |
2119 | (kill-buffer filename))))) | |
c8de1d91 | 2120 | |
b6909007 | 2121 | ;;;###autoload |
099bd78a | 2122 | (defun vc-merge () |
ac3f4c6f ER |
2123 | "Merge changes between two revisions into the current buffer's file. |
2124 | This asks for two revisions to merge from in the minibuffer. If the | |
2125 | first revision is a branch number, then merge all changes from that | |
2126 | branch. If the first revision is empty, merge news, i.e. recent changes | |
099bd78a | 2127 | from the current branch. |
0e362f54 GM |
2128 | |
2129 | See Info node `Merging'." | |
099bd78a | 2130 | (interactive) |
ccb141e8 AS |
2131 | (vc-ensure-vc-buffer) |
2132 | (vc-buffer-sync) | |
2133 | (let* ((file buffer-file-name) | |
2134 | (backend (vc-backend file)) | |
0e362f54 | 2135 | (state (vc-state file)) |
ac3f4c6f | 2136 | first-revision second-revision status) |
0e362f54 | 2137 | (cond |
61de26cb | 2138 | ((stringp state) ;; Locking VCses only |
0e362f54 GM |
2139 | (error "File is locked by %s" state)) |
2140 | ((not (vc-editable-p file)) | |
2141 | (if (y-or-n-p | |
2142 | "File must be checked out for merging. Check out now? ") | |
2143 | (vc-checkout file t) | |
2144 | (error "Merge aborted")))) | |
ac3f4c6f ER |
2145 | (setq first-revision |
2146 | (read-string (concat "Branch or revision to merge from " | |
5b76833f | 2147 | "(default news on current branch): "))) |
ac3f4c6f | 2148 | (if (string= first-revision "") |
099bd78a SM |
2149 | (if (not (vc-find-backend-function backend 'merge-news)) |
2150 | (error "Sorry, merging news is not implemented for %s" backend) | |
2151 | (setq status (vc-call merge-news file))) | |
2152 | (if (not (vc-find-backend-function backend 'merge)) | |
2153 | (error "Sorry, merging is not implemented for %s" backend) | |
ac3f4c6f ER |
2154 | (if (not (vc-branch-p first-revision)) |
2155 | (setq second-revision | |
2156 | (read-string "Second revision: " | |
2157 | (concat (vc-branch-part first-revision) "."))) | |
2158 | ;; We want to merge an entire branch. Set revisions | |
099bd78a | 2159 | ;; accordingly, so that vc-BACKEND-merge understands us. |
ac3f4c6f ER |
2160 | (setq second-revision first-revision) |
2161 | ;; first-revision must be the starting point of the branch | |
2162 | (setq first-revision (vc-branch-part first-revision))) | |
2163 | (setq status (vc-call merge file first-revision second-revision)))) | |
099bd78a | 2164 | (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE"))) |
0e362f54 GM |
2165 | |
2166 | (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B) | |
2167 | (vc-resynch-buffer file t (not (buffer-modified-p))) | |
2168 | (if (zerop status) (message "Merge successful") | |
928ef6d9 | 2169 | (smerge-mode 1) |
8dc87047 | 2170 | (message "File contains conflicts."))) |
ccb141e8 AS |
2171 | |
2172 | ;;;###autoload | |
1168d6c2 | 2173 | (defalias 'vc-resolve-conflicts 'smerge-ediff) |
18483cf0 | 2174 | |
2f119435 | 2175 | ;; The VC directory major mode. Coopt Dired for this. |
e1f297e6 ER |
2176 | ;; All VC commands get mapped into logical equivalents. |
2177 | ||
beba4bd9 AS |
2178 | (defvar vc-dired-switches) |
2179 | (defvar vc-dired-terse-mode) | |
2180 | ||
0e362f54 GM |
2181 | (defvar vc-dired-mode-map |
2182 | (let ((map (make-sparse-keymap)) | |
2183 | (vmap (make-sparse-keymap))) | |
ec402ad4 | 2184 | (define-key map "\C-xv" vmap) |
0e362f54 | 2185 | (define-key map "v" vmap) |
ec402ad4 | 2186 | (set-keymap-parent vmap vc-prefix-map) |
0e362f54 GM |
2187 | (define-key vmap "t" 'vc-dired-toggle-terse-mode) |
2188 | map)) | |
2189 | ||
3827b532 | 2190 | (define-derived-mode vc-dired-mode dired-mode "Dired under " |
0e362f54 GM |
2191 | "The major mode used in VC directory buffers. |
2192 | ||
2193 | It works like Dired, but lists only files under version control, with | |
2194 | the current VC state of each file being indicated in the place of the | |
2195 | file's link count, owner, group and size. Subdirectories are also | |
2196 | listed, and you may insert them into the buffer as desired, like in | |
2197 | Dired. | |
2198 | ||
2199 | All Dired commands operate normally, with the exception of `v', which | |
2200 | is redefined as the version control prefix, so that you can type | |
3d30b8bc RS |
2201 | `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on |
2202 | the file named in the current Dired buffer line. `vv' invokes | |
2203 | `vc-next-action' on this file, or on all files currently marked. | |
2204 | There is a special command, `*l', to mark all files currently locked." | |
099bd78a SM |
2205 | ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20. |
2206 | ;; We do it here because dired might not be loaded yet | |
2207 | ;; when vc-dired-mode-map is initialized. | |
2208 | (set-keymap-parent vc-dired-mode-map dired-mode-map) | |
421f0bfe | 2209 | (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) |
9bc260cf | 2210 | ;; The following is slightly modified from files.el, |
62c2e775 AS |
2211 | ;; because file lines look a bit different in vc-dired-mode |
2212 | ;; (the column before the date does not end in a digit). | |
ead91593 MA |
2213 | ;; albinus: It should be done in the original declaration. Problem |
2214 | ;; is the optional empty state-info; otherwise ")" would be good | |
2215 | ;; enough as delimeter. | |
9bc260cf | 2216 | (set (make-local-variable 'directory-listing-before-filename-regexp) |
62c2e775 | 2217 | (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)") |
570050dc AS |
2218 | ;; In some locales, month abbreviations are as short as 2 letters, |
2219 | ;; and they can be followed by ".". | |
2220 | (month (concat l l "+\\.?")) | |
2221 | (s " ") | |
2222 | (yyyy "[0-9][0-9][0-9][0-9]") | |
2223 | (dd "[ 0-3][0-9]") | |
2224 | (HH:MM "[ 0-2][0-9]:[0-5][0-9]") | |
2225 | (seconds "[0-6][0-9]\\([.,][0-9]+\\)?") | |
2226 | (zone "[-+][0-2][0-9][0-5][0-9]") | |
2227 | (iso-mm-dd "[01][0-9]-[0-3][0-9]") | |
2228 | (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?")) | |
2229 | (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time | |
2230 | "\\|" yyyy "-" iso-mm-dd "\\)")) | |
2231 | (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)" | |
2232 | s "+" | |
2233 | "\\(" HH:MM "\\|" yyyy "\\)")) | |
2234 | (western-comma (concat month s "+" dd "," s "+" yyyy)) | |
2235 | ;; Japanese MS-Windows ls-lisp has one-digit months, and | |
2236 | ;; omits the Kanji characters after month and day-of-month. | |
2237 | (mm "[ 0-1]?[0-9]") | |
2238 | (japanese | |
2239 | (concat mm l "?" s dd l "?" s "+" | |
2240 | "\\(" HH:MM "\\|" yyyy l "?" "\\)"))) | |
2241 | ;; the .* below ensures that we find the last match on a line | |
62c2e775 | 2242 | (concat ".*" s |
570050dc AS |
2243 | "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)" |
2244 | s "+"))) | |
a0019b45 AS |
2245 | (and (boundp 'vc-dired-switches) |
2246 | vc-dired-switches | |
2247 | (set (make-local-variable 'dired-actual-switches) | |
2248 | vc-dired-switches)) | |
3b574573 | 2249 | (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) |
9d2aebf6 MY |
2250 | (let ((backend-name (symbol-name (vc-responsible-backend |
2251 | default-directory)))) | |
2252 | (setq mode-name (concat mode-name backend-name)) | |
2253 | ;; Add menu after `vc-dired-mode-map' has `dired-mode-map' as the parent. | |
2254 | (let ((vc-dire-menu-map (copy-keymap vc-menu-map))) | |
2255 | (define-key-after (lookup-key vc-dired-mode-map [menu-bar]) [vc] | |
2256 | (cons backend-name vc-dire-menu-map) 'subdir))) | |
2f119435 AS |
2257 | (setq vc-dired-mode t)) |
2258 | ||
3b574573 AS |
2259 | (defun vc-dired-toggle-terse-mode () |
2260 | "Toggle terse display in VC Dired." | |
2261 | (interactive) | |
2262 | (if (not vc-dired-mode) | |
2263 | nil | |
2264 | (setq vc-dired-terse-mode (not vc-dired-terse-mode)) | |
2265 | (if vc-dired-terse-mode | |
2266 | (vc-dired-hook) | |
2267 | (revert-buffer)))) | |
2268 | ||
3d30b8bc RS |
2269 | (defun vc-dired-mark-locked () |
2270 | "Mark all files currently locked." | |
2271 | (interactive) | |
2272 | (dired-mark-if (let ((f (dired-get-filename nil t))) | |
2273 | (and f | |
2274 | (not (file-directory-p f)) | |
0e362f54 | 2275 | (not (vc-up-to-date-p f)))) |
3d30b8bc RS |
2276 | "locked file")) |
2277 | ||
2278 | (define-key vc-dired-mode-map "*l" 'vc-dired-mark-locked) | |
2279 | ||
b9a35ba5 | 2280 | (defun vc-dired-reformat-line (vc-info) |
0e362f54 | 2281 | "Reformat a directory-listing line. |
b9a35ba5 | 2282 | Replace various columns with version control information, VC-INFO. |
0e362f54 | 2283 | This code, like dired, assumes UNIX -l format." |
3d30b8bc | 2284 | (beginning-of-line) |
f1180544 | 2285 | (when (re-search-forward |
685e7bca AS |
2286 | ;; Match link count, owner, group, size. Group may be missing, |
2287 | ;; and only the size is present in OS/2 -l format. | |
2288 | "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) " | |
2289 | (line-end-position) t) | |
2290 | (replace-match (substring (concat vc-info " ") 0 10) | |
2291 | t t nil 1))) | |
3d30b8bc RS |
2292 | |
2293 | (defun vc-dired-hook () | |
0e362f54 GM |
2294 | "Reformat the listing according to version control. |
2295 | Called by dired after any portion of a vc-dired buffer has been read in." | |
3d30b8bc | 2296 | (message "Getting version information... ") |
100edb42 | 2297 | (let (subdir filename (inhibit-read-only t)) |
3d30b8bc | 2298 | (goto-char (point-min)) |
0e362f54 GM |
2299 | (while (not (eobp)) |
2300 | (cond | |
3d30b8bc RS |
2301 | ;; subdir header line |
2302 | ((setq subdir (dired-get-subdir)) | |
0e362f54 GM |
2303 | ;; if the backend supports it, get the state |
2304 | ;; of all files in this directory at once | |
2305 | (let ((backend (vc-responsible-backend subdir))) | |
1bd8df7e MY |
2306 | ;; check `backend' can really handle `subdir'. |
2307 | (if (and (vc-call-backend backend 'responsible-p subdir) | |
2308 | (vc-find-backend-function backend 'dir-state)) | |
0e362f54 | 2309 | (vc-call-backend backend 'dir-state subdir))) |
3d30b8bc RS |
2310 | (forward-line 1) |
2311 | ;; erase (but don't remove) the "total" line | |
0e362f54 GM |
2312 | (delete-region (point) (line-end-position)) |
2313 | (beginning-of-line) | |
2314 | (forward-line 1)) | |
2315 | ;; file line | |
3d30b8bc RS |
2316 | ((setq filename (dired-get-filename nil t)) |
2317 | (cond | |
3b574573 | 2318 | ;; subdir |
3d30b8bc | 2319 | ((file-directory-p filename) |
0e362f54 GM |
2320 | (cond |
2321 | ((member (file-name-nondirectory filename) | |
3b574573 AS |
2322 | vc-directory-exclusion-list) |
2323 | (let ((pos (point))) | |
2324 | (dired-kill-tree filename) | |
2325 | (goto-char pos) | |
2326 | (dired-kill-line))) | |
2327 | (vc-dired-terse-mode | |
633cee46 AS |
2328 | ;; Don't show directories in terse mode. Don't use |
2329 | ;; dired-kill-line to remove it, because in recursive listings, | |
2330 | ;; that would remove the directory contents as well. | |
0e362f54 | 2331 | (delete-region (line-beginning-position) |
633cee46 | 2332 | (progn (forward-line 1) (point)))) |
3b574573 AS |
2333 | ((string-match "\\`\\.\\.?\\'" (file-name-nondirectory filename)) |
2334 | (dired-kill-line)) | |
2335 | (t | |
3d30b8bc | 2336 | (vc-dired-reformat-line nil) |
3b574573 AS |
2337 | (forward-line 1)))) |
2338 | ;; ordinary file | |
0e362f54 GM |
2339 | ((and (vc-backend filename) |
2340 | (not (and vc-dired-terse-mode | |
2341 | (vc-up-to-date-p filename)))) | |
2342 | (vc-dired-reformat-line (vc-call dired-state-info filename)) | |
3d30b8bc | 2343 | (forward-line 1)) |
0e362f54 | 2344 | (t |
3d30b8bc RS |
2345 | (dired-kill-line)))) |
2346 | ;; any other line | |
3b574573 AS |
2347 | (t (forward-line 1)))) |
2348 | (vc-dired-purge)) | |
2349 | (message "Getting version information... done") | |
2350 | (save-restriction | |
2351 | (widen) | |
633cee46 AS |
2352 | (cond ((eq (count-lines (point-min) (point-max)) 1) |
2353 | (goto-char (point-min)) | |
2354 | (message "No files locked under %s" default-directory))))) | |
3b574573 AS |
2355 | |
2356 | (defun vc-dired-purge () | |
0e362f54 | 2357 | "Remove empty subdirs." |
b4e4e3a8 SM |
2358 | (goto-char (point-min)) |
2359 | (while (dired-get-subdir) | |
2360 | (forward-line 2) | |
2361 | (if (dired-get-filename nil t) | |
2362 | (if (not (dired-next-subdir 1 t)) | |
2363 | (goto-char (point-max))) | |
2364 | (forward-line -2) | |
2365 | (if (not (string= (dired-current-directory) default-directory)) | |
2366 | (dired-do-kill-lines t "") | |
2367 | ;; We cannot remove the top level directory. | |
2368 | ;; Just make it look a little nicer. | |
2369 | (forward-line 1) | |
3c85843f | 2370 | (or (eobp) (kill-line)) |
b4e4e3a8 SM |
2371 | (if (not (dired-next-subdir 1 t)) |
2372 | (goto-char (point-max)))))) | |
2373 | (goto-char (point-min))) | |
2f119435 | 2374 | |
0e362f54 GM |
2375 | (defun vc-dired-buffers-for-dir (dir) |
2376 | "Return a list of all vc-dired buffers that currently display DIR." | |
2377 | (let (result) | |
099bd78a SM |
2378 | ;; Check whether dired is loaded. |
2379 | (when (fboundp 'dired-buffers-for-dir) | |
a549ce70 | 2380 | (mapc (lambda (buffer) |
099bd78a SM |
2381 | (with-current-buffer buffer |
2382 | (if vc-dired-mode | |
2383 | (setq result (append result (list buffer)))))) | |
2384 | (dired-buffers-for-dir dir))) | |
0e362f54 GM |
2385 | result)) |
2386 | ||
2387 | (defun vc-dired-resynch-file (file) | |
2388 | "Update the entries for FILE in any VC Dired buffers that list it." | |
2389 | (let ((buffers (vc-dired-buffers-for-dir (file-name-directory file)))) | |
2390 | (when buffers | |
2391 | (mapcar (lambda (buffer) | |
2392 | (with-current-buffer buffer | |
2393 | (if (dired-goto-file file) | |
2394 | ;; bind vc-dired-terse-mode to nil so that | |
2395 | ;; files won't vanish when they are checked in | |
2396 | (let ((vc-dired-terse-mode nil)) | |
2397 | (dired-do-redisplay 1))))) | |
2398 | buffers)))) | |
2399 | ||
637a8ae9 | 2400 | ;;;###autoload |
0e362f54 GM |
2401 | (defun vc-directory (dir read-switches) |
2402 | "Create a buffer in VC Dired Mode for directory DIR. | |
2403 | ||
2404 | See Info node `VC Dired Mode'. | |
2405 | ||
2406 | With prefix arg READ-SWITCHES, specify a value to override | |
2407 | `dired-listing-switches' when generating the listing." | |
2f119435 | 2408 | (interactive "DDired under VC (directory): \nP") |
0e362f54 | 2409 | (let ((vc-dired-switches (concat vc-dired-listing-switches |
3b574573 | 2410 | (if vc-dired-recurse "R" "")))) |
ca3c2096 AS |
2411 | (if (eq (string-match tramp-file-name-regexp dir) 0) |
2412 | (error "Sorry, vc-directory does not work over Tramp")) | |
0e362f54 | 2413 | (if read-switches |
3b574573 AS |
2414 | (setq vc-dired-switches |
2415 | (read-string "Dired listing switches: " | |
2416 | vc-dired-switches))) | |
3d30b8bc RS |
2417 | (require 'dired) |
2418 | (require 'dired-aux) | |
0e362f54 GM |
2419 | (switch-to-buffer |
2420 | (dired-internal-noselect (expand-file-name (file-name-as-directory dir)) | |
2421 | vc-dired-switches | |
3d30b8bc | 2422 | 'vc-dired-mode)))) |
e70bdc98 | 2423 | |
594722a8 ER |
2424 | |
2425 | ;; Named-configuration entry points | |
2426 | ||
0e362f54 | 2427 | (defun vc-snapshot-precondition (dir) |
6f1ecae4 | 2428 | "Scan the tree below DIR, looking for files not up-to-date. |
099bd78a SM |
2429 | If any file is not up-to-date, return the name of the first such file. |
2430 | \(This means, neither snapshot creation nor retrieval is allowed.\) | |
2431 | If one or more of the files are currently visited, return `visited'. | |
2432 | Otherwise, return nil." | |
503b5c85 RS |
2433 | (let ((status nil)) |
2434 | (catch 'vc-locked-example | |
2435 | (vc-file-tree-walk | |
0e362f54 GM |
2436 | dir |
2437 | (lambda (f) | |
2438 | (if (not (vc-up-to-date-p f)) (throw 'vc-locked-example f) | |
2439 | (if (get-file-buffer f) (setq status 'visited))))) | |
503b5c85 | 2440 | status))) |
594722a8 | 2441 | |
637a8ae9 | 2442 | ;;;###autoload |
0e362f54 | 2443 | (defun vc-create-snapshot (dir name branchp) |
6f41eeb5 | 2444 | "Descending recursively from DIR, make a snapshot called NAME. |
ac3f4c6f ER |
2445 | For each registered file, the working revision becomes part of |
2446 | the named configuration. If the prefix argument BRANCHP is | |
2447 | given, the snapshot is made as a new branch and the files are | |
2448 | checked out in that new branch." | |
0e362f54 GM |
2449 | (interactive |
2450 | (list (read-file-name "Directory: " default-directory default-directory t) | |
2451 | (read-string "New snapshot name: ") | |
2452 | current-prefix-arg)) | |
2453 | (message "Making %s... " (if branchp "branch" "snapshot")) | |
2454 | (if (file-directory-p dir) (setq dir (file-name-as-directory dir))) | |
2455 | (vc-call-backend (vc-responsible-backend dir) | |
2456 | 'create-snapshot dir name branchp) | |
2457 | (message "Making %s... done" (if branchp "branch" "snapshot"))) | |
2458 | ||
637a8ae9 | 2459 | ;;;###autoload |
0e362f54 | 2460 | (defun vc-retrieve-snapshot (dir name) |
099bd78a | 2461 | "Descending recursively from DIR, retrieve the snapshot called NAME. |
ac3f4c6f | 2462 | If NAME is empty, it refers to the latest revisions. |
099bd78a SM |
2463 | If locking is used for the files in DIR, then there must not be any |
2464 | locked files at or below DIR (but if NAME is empty, locked files are | |
2465 | allowed and simply skipped)." | |
0e362f54 GM |
2466 | (interactive |
2467 | (list (read-file-name "Directory: " default-directory default-directory t) | |
ac3f4c6f | 2468 | (read-string "Snapshot name to retrieve (default latest revisions): "))) |
0e362f54 GM |
2469 | (let ((update (yes-or-no-p "Update any affected buffers? ")) |
2470 | (msg (if (or (not name) (string= name "")) | |
2471 | (format "Updating %s... " (abbreviate-file-name dir)) | |
2472 | (format "Retrieving snapshot into %s... " | |
2473 | (abbreviate-file-name dir))))) | |
8a26c165 | 2474 | (message "%s" msg) |
0e362f54 GM |
2475 | (vc-call-backend (vc-responsible-backend dir) |
2476 | 'retrieve-snapshot dir name update) | |
8a26c165 | 2477 | (message "%s" (concat msg "done")))) |
0e362f54 | 2478 | |
594722a8 ER |
2479 | ;; Miscellaneous other entry points |
2480 | ||
637a8ae9 | 2481 | ;;;###autoload |
ac3f4c6f | 2482 | (defun vc-print-log (&optional working-revision) |
d7b60083 | 2483 | "List the change log of the current fileset in a window. |
ac3f4c6f | 2484 | If WORKING-REVISION is non-nil, leave the point at that revision." |
594722a8 | 2485 | (interactive) |
d7b60083 ER |
2486 | (let* ((files (vc-deduce-fileset)) |
2487 | (backend (vc-backend (car files))) | |
ac3f4c6f | 2488 | (working-revision (or working-revision (vc-working-revision (car files))))) |
5217a76a SS |
2489 | ;; Don't switch to the output buffer before running the command, |
2490 | ;; so that any buffer-local settings in the vc-controlled | |
ac9ff209 | 2491 | ;; buffer can be accessed by the command. |
d7b60083 ER |
2492 | (vc-call-backend backend 'print-log files "*vc-change-log*") |
2493 | (pop-to-buffer "*vc-change-log*") | |
0e362f54 | 2494 | (vc-exec-after |
99cb8c8b | 2495 | `(let ((inhibit-read-only t)) |
d7b60083 | 2496 | (vc-call-backend ',backend 'log-view-mode) |
0e362f54 GM |
2497 | (goto-char (point-max)) (forward-line -1) |
2498 | (while (looking-at "=*\n") | |
2499 | (delete-char (- (match-end 0) (match-beginning 0))) | |
2500 | (forward-line -1)) | |
2501 | (goto-char (point-min)) | |
2502 | (if (looking-at "[\b\t\n\v\f\r ]+") | |
2503 | (delete-char (- (match-end 0) (match-beginning 0)))) | |
d7b60083 | 2504 | (shrink-window-if-larger-than-buffer) |
ac3f4c6f ER |
2505 | ;; move point to the log entry for the working revision |
2506 | (vc-call-backend ',backend 'show-log-entry ',working-revision) | |
86e80023 | 2507 | (setq vc-sentinel-movepoint (point)) |
99cb8c8b | 2508 | (set-buffer-modified-p nil))))) |
594722a8 | 2509 | |
637a8ae9 | 2510 | ;;;###autoload |
e4d26892 | 2511 | (defun vc-revert () |
d7b60083 | 2512 | "Revert working copies of the selected fileset to their repository contents. |
9c95ac44 | 2513 | This asks for confirmation if the buffer contents are not identical |
ac3f4c6f | 2514 | to the working revision (except for keyword expansion)." |
594722a8 | 2515 | (interactive) |
d7b60083 ER |
2516 | (let* ((files (vc-deduce-fileset)) |
2517 | (backend (vc-backend (car files)))) | |
2518 | ;; If any of the files is visited by the current buffer, make | |
2519 | ;; sure buffer is saved. If the user says `no', abort since | |
2520 | ;; we cannot show the changes and ask for confirmation to | |
2521 | ;; discard them. | |
2522 | (if (or (not files) (memq (buffer-file-name) files)) | |
2523 | (vc-buffer-sync nil)) | |
2524 | (dolist (file files) | |
2525 | (let (buf (get-file-buffer file)) | |
2526 | (if (and buf (buffer-modified-p buf)) | |
2527 | (error "Please kill or save all modified buffers before reverting."))) | |
2528 | (if (vc-up-to-date-p file) | |
2529 | (unless (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file)) | |
2530 | (error "Revert canceled")))) | |
2531 | (if (vc-diff-internal backend vc-allow-async-revert files nil nil) | |
2532 | (progn | |
2533 | (unless (yes-or-no-p (format "Discard changes in %s? " (vc-delistify files))) | |
2534 | (error "Revert canceled")) | |
2535 | (delete-windows-on "*vc-diff*") | |
2536 | (kill-buffer "*vc-diff*"))) | |
2537 | (dolist (file files) | |
2538 | (progn | |
2539 | (message "Reverting %s..." (vc-delistify files)) | |
2540 | (vc-revert-file file) | |
2541 | (message "Reverting %s...done" (vc-delistify files)))))) | |
594722a8 | 2542 | |
637a8ae9 | 2543 | ;;;###autoload |
d7b60083 ER |
2544 | (defun vc-rollback () |
2545 | "Roll back (remove) the most recent changeset committed to the repository. | |
2546 | This may be either a file-level or a repository-level operation, | |
2547 | depending on the underlying version-control system." | |
2548 | (interactive) | |
2549 | (let* ((files (vc-deduce-fileset)) | |
2550 | (backend (vc-backend (car files))) | |
2551 | (granularity (vc-call-backend backend 'revision-granularity))) | |
2552 | (unless (vc-find-backend-function backend 'rollback) | |
2553 | (error "Rollback is not supported in %s" backend)) | |
2554 | (if (and (not (eq granularity 'repository)) (/= (length files) 1)) | |
2555 | (error "Rollback requires a singleton fileset or repository versioning")) | |
2556 | (if (not (vc-call latest-on-branch-p (car files))) | |
2557 | (error "Rollback is only possible at the tip revision.")) | |
2558 | ;; If any of the files is visited by the current buffer, make | |
2559 | ;; sure buffer is saved. If the user says `no', abort since | |
2560 | ;; we cannot show the changes and ask for confirmation to | |
2561 | ;; discard them. | |
2562 | (if (or (not files) (memq (buffer-file-name) files)) | |
2563 | (vc-buffer-sync nil)) | |
2564 | (dolist (file files) | |
2565 | (if (buffer-modified-p (get-file-buffer file)) | |
2566 | (error "Please kill or save all modified buffers before rollback.")) | |
2567 | (if (not (vc-up-to-date-p file)) | |
2568 | (error "Please revert all modified workfiles before rollback."))) | |
2569 | ;; Accumulate changes associated with the fileset | |
2570 | (vc-setup-buffer "*vc-diff*") | |
2571 | (not-modified) | |
2572 | (message "Finding changes...") | |
ac3f4c6f ER |
2573 | (let* ((tip (vc-working-revision (car files))) |
2574 | (previous (vc-call previous-revision (car files) tip))) | |
d7b60083 ER |
2575 | (vc-diff-internal backend nil files previous tip)) |
2576 | ;; Display changes | |
2577 | (unless (yes-or-no-p "Discard these revisions? ") | |
2578 | (error "Rollback canceled")) | |
2579 | (delete-windows-on "*vc-diff*") | |
2580 | (kill-buffer"*vc-diff*") | |
2581 | ;; Do the actual reversions | |
2582 | (message "Rolling back %s..." (vc-delistify files)) | |
2583 | (with-vc-properties | |
2584 | files | |
2585 | (vc-call-backend backend 'rollback files) | |
2586 | `((vc-state . ,'up-to-date) | |
2587 | (vc-checkout-time . , (nth 5 (file-attributes file))) | |
ac3f4c6f | 2588 | (vc-working-revision . nil))) |
d7b60083 ER |
2589 | (mapc (lambda (f) (vc-resynch-buffer f t t)) files) |
2590 | (message "Rolling back %s...done" (vc-delistify files)))) | |
0e362f54 | 2591 | |
2765044b DN |
2592 | ;;;###autoload |
2593 | (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1") | |
2594 | ||
2595 | ;;;###autoload | |
2596 | (defun vc-update () | |
ac3f4c6f | 2597 | "Update the current fileset's files to their tip revisions. |
d7b60083 | 2598 | For each one that contains no changes, and is not locked, then this simply |
ac3f4c6f | 2599 | replaces the work file with the latest revision on its branch. If the file |
d7b60083 ER |
2600 | contains changes, and the backend supports merging news, then any recent |
2601 | changes from the current branch are merged into the working file." | |
2765044b | 2602 | (interactive) |
d7b60083 ER |
2603 | (dolist (file (vc-deduce-fileset)) |
2604 | (if (buffer-modified-p (get-file-buffer file)) | |
2605 | (error "Please kill or save all modified buffers before updating.")) | |
2765044b | 2606 | (if (vc-up-to-date-p file) |
d7b60083 | 2607 | (vc-checkout file nil "") |
2765044b | 2608 | (if (eq (vc-checkout-model file) 'locking) |
d7b60083 ER |
2609 | (if (eq (vc-state file) 'edited) |
2610 | (error | |
2611 | (substitute-command-keys | |
2612 | "File is locked--type \\[vc-revert] to discard changes")) | |
2613 | (error | |
2614 | (substitute-command-keys | |
2615 | "Unexpected file state (%s)--type \\[vc-next-action] to correct") | |
2616 | (vc-state file))) | |
2617 | (if (not (vc-find-backend-function (vc-backend file) 'merge-news)) | |
2618 | (error "Sorry, merging news is not implemented for %s" | |
2619 | (vc-backend file)) | |
2620 | (vc-call merge-news file) | |
2621 | (vc-resynch-buffer file t t)))))) | |
2765044b DN |
2622 | |
2623 | (defun vc-version-backup-file (file &optional rev) | |
2624 | "Return name of backup file for revision REV of FILE. | |
2625 | If version backups should be used for FILE, and there exists | |
ac3f4c6f | 2626 | such a backup for REV or the working revision of file, return |
0d0e9356 | 2627 | its name; otherwise return nil." |
2765044b DN |
2628 | (when (vc-call make-version-backups-p file) |
2629 | (let ((backup-file (vc-version-backup-file-name file rev))) | |
2630 | (if (file-exists-p backup-file) | |
2631 | backup-file | |
2632 | ;; there is no automatic backup, but maybe the user made one manually | |
2633 | (setq backup-file (vc-version-backup-file-name file rev 'manual)) | |
2634 | (if (file-exists-p backup-file) | |
2635 | backup-file))))) | |
2636 | ||
2637 | (defun vc-revert-file (file) | |
ac3f4c6f | 2638 | "Revert FILE back to the repository working revision it was based on." |
2765044b | 2639 | (with-vc-properties |
d7b60083 | 2640 | (list file) |
2765044b DN |
2641 | (let ((backup-file (vc-version-backup-file file))) |
2642 | (when backup-file | |
2643 | (copy-file backup-file file 'ok-if-already-exists 'keep-date) | |
2644 | (vc-delete-automatic-version-backups file)) | |
2645 | (vc-call revert file backup-file)) | |
2646 | `((vc-state . up-to-date) | |
2647 | (vc-checkout-time . ,(nth 5 (file-attributes file))))) | |
2648 | (vc-resynch-buffer file t t)) | |
2649 | ||
76e5906d | 2650 | ;;;###autoload |
1d502d5a | 2651 | (defun vc-switch-backend (file backend) |
7849e179 | 2652 | "Make BACKEND the current version control system for FILE. |
1d502d5a AS |
2653 | FILE must already be registered in BACKEND. The change is not |
2654 | permanent, only for the current session. This function only changes | |
7849e179 SM |
2655 | VC's perspective on FILE, it does not register or unregister it. |
2656 | By default, this command cycles through the registered backends. | |
2657 | To get a prompt, use a prefix argument." | |
2658 | (interactive | |
1d502d5a | 2659 | (list |
94ca88e3 AS |
2660 | (or buffer-file-name |
2661 | (error "There is no version-controlled file in this buffer")) | |
7849e179 SM |
2662 | (let ((backend (vc-backend buffer-file-name)) |
2663 | (backends nil)) | |
d7b60083 ER |
2664 | (unless backend |
2665 | (error "File %s is not under version control" buffer-file-name)) | |
2666 | ;; Find the registered backends. | |
2667 | (dolist (backend vc-handled-backends) | |
2668 | (when (vc-call-backend backend 'registered buffer-file-name) | |
2669 | (push backend backends))) | |
2670 | ;; Find the next backend. | |
2671 | (let ((def (car (delq backend (append (memq backend backends) backends)))) | |
2672 | (others (delete backend backends))) | |
2673 | (cond | |
2674 | ((null others) (error "No other backend to switch to")) | |
2675 | (current-prefix-arg | |
2676 | (intern | |
2677 | (upcase | |
2678 | (completing-read | |
2679 | (format "Switch to backend [%s]: " def) | |
2680 | (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends) | |
2681 | nil t nil nil (downcase (symbol-name def)))))) | |
2682 | (t def)))))) | |
ceec5a0c | 2683 | (unless (eq backend (vc-backend file)) |
ceec5a0c SM |
2684 | (vc-file-clearprops file) |
2685 | (vc-file-setprop file 'vc-backend backend) | |
2686 | ;; Force recomputation of the state | |
a3255400 SM |
2687 | (unless (vc-call-backend backend 'registered file) |
2688 | (vc-file-clearprops file) | |
2689 | (error "%s is not registered in %s" file backend)) | |
ceec5a0c | 2690 | (vc-mode-line file))) |
1d502d5a | 2691 | |
21b50296 | 2692 | ;;;###autoload |
1d502d5a | 2693 | (defun vc-transfer-file (file new-backend) |
ceec5a0c | 2694 | "Transfer FILE to another version control system NEW-BACKEND. |
1d502d5a | 2695 | If NEW-BACKEND has a higher precedence than FILE's current backend |
ceec5a0c | 2696 | \(i.e. it comes earlier in `vc-handled-backends'), then register FILE in |
ac3f4c6f | 2697 | NEW-BACKEND, using the revision number from the current backend as the |
1d502d5a AS |
2698 | base level. If NEW-BACKEND has a lower precedence than the current |
2699 | backend, then commit all changes that were made under the current | |
2700 | backend to NEW-BACKEND, and unregister FILE from the current backend. | |
2701 | \(If FILE is not yet registered under NEW-BACKEND, register it.)" | |
72cfc5fb AS |
2702 | (let* ((old-backend (vc-backend file)) |
2703 | (edited (memq (vc-state file) '(edited needs-merge))) | |
2704 | (registered (vc-call-backend new-backend 'registered file)) | |
2705 | (move | |
2706 | (and registered ; Never move if not registered in new-backend yet. | |
2707 | ;; move if new-backend comes later in vc-handled-backends | |
2708 | (or (memq new-backend (memq old-backend vc-handled-backends)) | |
ffda0460 | 2709 | (y-or-n-p "Final transfer? ")))) |
72cfc5fb | 2710 | (comment nil)) |
1d502d5a | 2711 | (if (eq old-backend new-backend) |
72cfc5fb AS |
2712 | (error "%s is the current backend of %s" new-backend file)) |
2713 | (if registered | |
2714 | (set-file-modes file (logior (file-modes file) 128)) | |
2715 | ;; `registered' might have switched under us. | |
2716 | (vc-switch-backend file old-backend) | |
ac3f4c6f | 2717 | (let* ((rev (vc-working-revision file)) |
c1b1b393 | 2718 | (modified-file (and edited (make-temp-file file))) |
ffda0460 | 2719 | (unmodified-file (and modified-file (vc-version-backup-file file)))) |
72cfc5fb AS |
2720 | ;; Go back to the base unmodified file. |
2721 | (unwind-protect | |
2722 | (progn | |
ffda0460 | 2723 | (when modified-file |
c1b1b393 | 2724 | (copy-file file modified-file 'ok-if-already-exists) |
ffda0460 AS |
2725 | ;; If we have a local copy of the unmodified file, handle that |
2726 | ;; here and not in vc-revert-file because we don't want to | |
2727 | ;; delete that copy -- it is still useful for OLD-BACKEND. | |
2728 | (if unmodified-file | |
b4e4e3a8 SM |
2729 | (copy-file unmodified-file file |
2730 | 'ok-if-already-exists 'keep-date) | |
ac3f4c6f | 2731 | (if (y-or-n-p "Get base revision from master? ") |
ffda0460 | 2732 | (vc-revert-file file)))) |
72cfc5fb | 2733 | (vc-call-backend new-backend 'receive-file file rev)) |
ffda0460 | 2734 | (when modified-file |
72cfc5fb AS |
2735 | (vc-switch-backend file new-backend) |
2736 | (unless (eq (vc-checkout-model file) 'implicit) | |
2737 | (vc-checkout file t nil)) | |
ffda0460 AS |
2738 | (rename-file modified-file file 'ok-if-already-exists) |
2739 | (vc-file-setprop file 'vc-checkout-time nil))))) | |
72cfc5fb AS |
2740 | (when move |
2741 | (vc-switch-backend file old-backend) | |
2742 | (setq comment (vc-call comment-history file)) | |
2743 | (vc-call unregister file)) | |
2744 | (vc-switch-backend file new-backend) | |
2745 | (when (or move edited) | |
1d502d5a | 2746 | (vc-file-setprop file 'vc-state 'edited) |
ffda0460 | 2747 | (vc-mode-line file) |
0ab66291 | 2748 | (vc-checkin file nil comment (stringp comment))))) |
1d502d5a | 2749 | |
0e362f54 GM |
2750 | (defun vc-rename-master (oldmaster newfile templates) |
2751 | "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES." | |
2752 | (let* ((dir (file-name-directory (expand-file-name oldmaster))) | |
2753 | (newdir (or (file-name-directory newfile) "")) | |
2754 | (newbase (file-name-nondirectory newfile)) | |
2755 | (masters | |
2756 | ;; List of potential master files for `newfile' | |
2757 | (mapcar | |
2758 | (lambda (s) (vc-possible-master s newdir newbase)) | |
2759 | templates))) | |
2760 | (if (or (file-symlink-p oldmaster) | |
2761 | (file-symlink-p (file-name-directory oldmaster))) | |
6f1ecae4 | 2762 | (error "This is unsafe in the presence of symbolic links")) |
0e362f54 GM |
2763 | (rename-file |
2764 | oldmaster | |
2765 | (catch 'found | |
2766 | ;; If possible, keep the master file in the same directory. | |
b4e4e3a8 SM |
2767 | (dolist (f masters) |
2768 | (if (and f (string= (file-name-directory (expand-file-name f)) dir)) | |
2769 | (throw 'found f))) | |
0e362f54 | 2770 | ;; If not, just use the first possible place. |
b4e4e3a8 SM |
2771 | (dolist (f masters) |
2772 | (and f (or (not (setq dir (file-name-directory f))) | |
2773 | (file-directory-p dir)) | |
2774 | (throw 'found f))) | |
0e362f54 | 2775 | (error "New file lacks a version control directory"))))) |
594722a8 | 2776 | |
a36319a4 SM |
2777 | (defun vc-delete-file (file) |
2778 | "Delete file and mark it as such in the version control system." | |
2779 | (interactive "fVC delete file: ") | |
c6e44350 AS |
2780 | (let ((buf (get-file-buffer file)) |
2781 | (backend (vc-backend file))) | |
2782 | (unless backend | |
86a65190 | 2783 | (error "File %s is not under version control" |
c6e44350 | 2784 | (file-name-nondirectory file))) |
a36319a4 | 2785 | (unless (vc-find-backend-function backend 'delete-file) |
c6e44350 | 2786 | (error "Deleting files under %s is not supported in VC" backend)) |
a36319a4 SM |
2787 | (if (and buf (buffer-modified-p buf)) |
2788 | (error "Please save files before deleting them")) | |
ce5a3ac0 | 2789 | (unless (y-or-n-p (format "Really want to delete %s? " |
a36319a4 SM |
2790 | (file-name-nondirectory file))) |
2791 | (error "Abort!")) | |
2792 | (unless (or (file-directory-p file) (null make-backup-files)) | |
2793 | (with-current-buffer (or buf (find-file-noselect file)) | |
2794 | (let ((backup-inhibited nil)) | |
2795 | (backup-buffer)))) | |
2796 | (vc-call delete-file file) | |
2797 | ;; If the backend hasn't deleted the file itself, let's do it for him. | |
2798 | (if (file-exists-p file) (delete-file file)))) | |
2799 | ||
29fc1ce9 | 2800 | ;;;###autoload |
594722a8 | 2801 | (defun vc-rename-file (old new) |
34291cd2 RS |
2802 | "Rename file OLD to NEW, and rename its master file likewise." |
2803 | (interactive "fVC rename file: \nFRename to: ") | |
a36319a4 | 2804 | (let ((oldbuf (get-file-buffer old))) |
d52f0de9 | 2805 | (if (and oldbuf (buffer-modified-p oldbuf)) |
590cc449 | 2806 | (error "Please save files before moving them")) |
594722a8 | 2807 | (if (get-file-buffer new) |
590cc449 | 2808 | (error "Already editing new file name")) |
d52f0de9 RS |
2809 | (if (file-exists-p new) |
2810 | (error "New file already exists")) | |
86a65190 | 2811 | (let ((state (vc-state old))) |
a36319a4 SM |
2812 | (unless (memq state '(up-to-date edited)) |
2813 | (error "Please %s files before moving them" | |
2814 | (if (stringp state) "check in" "update")))) | |
2815 | (vc-call rename-file old new) | |
b4e4e3a8 | 2816 | (vc-file-clearprops old) |
0e362f54 | 2817 | ;; Move the actual file (unless the backend did it already) |
a36319a4 | 2818 | (if (file-exists-p old) (rename-file old new)) |
0e362f54 GM |
2819 | ;; ?? Renaming a file might change its contents due to keyword expansion. |
2820 | ;; We should really check out a new copy if the old copy was precisely equal | |
ac3f4c6f | 2821 | ;; to some checked-in revision. However, testing for this is tricky.... |
594722a8 | 2822 | (if oldbuf |
0e362f54 | 2823 | (with-current-buffer oldbuf |
4c145b9e RS |
2824 | (let ((buffer-read-only buffer-read-only)) |
2825 | (set-visited-file-name new)) | |
2826 | (vc-backend new) | |
2827 | (vc-mode-line new) | |
0e362f54 GM |
2828 | (set-buffer-modified-p nil))))) |
2829 | ||
637a8ae9 | 2830 | ;;;###autoload |
f35ecf88 | 2831 | (defun vc-update-change-log (&rest args) |
0e362f54 | 2832 | "Find change log file and add entries from recent version control logs. |
d68e6990 | 2833 | Normally, find log entries for all registered files in the default |
0e362f54 | 2834 | directory. |
d68e6990 | 2835 | |
099bd78a | 2836 | With prefix arg of \\[universal-argument], only find log entries for the current buffer's file. |
d68e6990 RS |
2837 | |
2838 | With any numeric prefix arg, find log entries for all currently visited | |
2839 | files that are under version control. This puts all the entries in the | |
2840 | log for the default directory, which may not be appropriate. | |
2841 | ||
099bd78a | 2842 | From a program, any ARGS are assumed to be filenames for which |
0e362f54 | 2843 | log entries should be gathered." |
67242a23 RM |
2844 | (interactive |
2845 | (cond ((consp current-prefix-arg) ;C-u | |
2846 | (list buffer-file-name)) | |
2847 | (current-prefix-arg ;Numeric argument. | |
2848 | (let ((files nil) | |
2849 | (buffers (buffer-list)) | |
2850 | file) | |
2851 | (while buffers | |
2852 | (setq file (buffer-file-name (car buffers))) | |
f3c61d82 | 2853 | (and file (vc-backend file) |
4b40fdea | 2854 | (setq files (cons file files))) |
67242a23 | 2855 | (setq buffers (cdr buffers))) |
4b40fdea PE |
2856 | files)) |
2857 | (t | |
0e362f54 GM |
2858 | ;; Don't supply any filenames to backend; this means |
2859 | ;; it should find all relevant files relative to | |
2860 | ;; the default-directory. | |
73a9679c | 2861 | nil))) |
ca3c2096 AS |
2862 | (dolist (file (or args (list default-directory))) |
2863 | (if (eq (string-match tramp-file-name-regexp file) 0) | |
2864 | (error "Sorry, vc-update-change-log does not work over Tramp"))) | |
0e362f54 GM |
2865 | (vc-call-backend (vc-responsible-backend default-directory) |
2866 | 'update-changelog args)) | |
2867 | ||
ac3f4c6f | 2868 | ;;; The default back end. Assumes RCS-like revision numbering. |
61de26cb ER |
2869 | |
2870 | (defun vc-default-revision-granularity () | |
2871 | (error "Your backend will not work with this version of VC mode.")) | |
2872 | ||
2765044b DN |
2873 | ;; functions that operate on RCS revision numbers. This code should |
2874 | ;; also be moved into the backends. It stays for now, however, since | |
2875 | ;; it is used in code below. | |
2876 | ;;;###autoload | |
2877 | (defun vc-trunk-p (rev) | |
2878 | "Return t if REV is a revision on the trunk." | |
2879 | (not (eq nil (string-match "\\`[0-9]+\\.[0-9]+\\'" rev)))) | |
2880 | ||
2881 | (defun vc-branch-p (rev) | |
2882 | "Return t if REV is a branch revision." | |
2883 | (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) | |
2884 | ||
2885 | ;;;###autoload | |
2886 | (defun vc-branch-part (rev) | |
2887 | "Return the branch part of a revision number REV." | |
2888 | (let ((index (string-match "\\.[0-9]+\\'" rev))) | |
2889 | (if index | |
2890 | (substring rev 0 index)))) | |
2891 | ||
2892 | (defun vc-minor-part (rev) | |
ac3f4c6f | 2893 | "Return the minor revision number of a revision number REV." |
2765044b DN |
2894 | (string-match "[0-9]+\\'" rev) |
2895 | (substring rev (match-beginning 0) (match-end 0))) | |
2896 | ||
ac3f4c6f ER |
2897 | (defun vc-default-previous-revision (backend file rev) |
2898 | "Return the revision number immediately preceding REV for FILE, | |
2899 | or nil if there is no previous revision. This default | |
2900 | implementation works for MAJOR.MINOR-style revision numbers as | |
2765044b DN |
2901 | used by RCS and CVS." |
2902 | (let ((branch (vc-branch-part rev)) | |
2903 | (minor-num (string-to-number (vc-minor-part rev)))) | |
2904 | (when branch | |
2905 | (if (> minor-num 1) | |
ac3f4c6f | 2906 | ;; revision does probably not start a branch or release |
2765044b DN |
2907 | (concat branch "." (number-to-string (1- minor-num))) |
2908 | (if (vc-trunk-p rev) | |
2909 | ;; we are at the beginning of the trunk -- | |
2910 | ;; don't know anything to return here | |
2911 | nil | |
2912 | ;; we are at the beginning of a branch -- | |
ac3f4c6f | 2913 | ;; return revision of starting point |
2765044b DN |
2914 | (vc-branch-part branch)))))) |
2915 | ||
ac3f4c6f ER |
2916 | (defun vc-default-next-revision (backend file rev) |
2917 | "Return the revision number immediately following REV for FILE, | |
2918 | or nil if there is no next revision. This default implementation | |
2919 | works for MAJOR.MINOR-style revision numbers as used by RCS | |
2765044b | 2920 | and CVS." |
ac3f4c6f | 2921 | (when (not (string= rev (vc-working-revision file))) |
2765044b DN |
2922 | (let ((branch (vc-branch-part rev)) |
2923 | (minor-num (string-to-number (vc-minor-part rev)))) | |
2924 | (concat branch "." (number-to-string (1+ minor-num)))))) | |
2925 | ||
2926 | (defun vc-default-responsible-p (backend file) | |
2927 | "Indicate whether BACKEND is reponsible for FILE. | |
2928 | The default is to return nil always." | |
2929 | nil) | |
2930 | ||
2931 | (defun vc-default-could-register (backend file) | |
2932 | "Return non-nil if BACKEND could be used to register FILE. | |
2933 | The default implementation returns t for all files." | |
2934 | t) | |
2935 | ||
2936 | (defun vc-default-latest-on-branch-p (backend file) | |
2937 | "Return non-nil if FILE is the latest on its branch. | |
2938 | This default implementation always returns non-nil, which means that | |
ac3f4c6f | 2939 | editing non-current revisions is not supported by default." |
2765044b DN |
2940 | t) |
2941 | ||
ac3f4c6f | 2942 | (defun vc-default-init-revision (backend) vc-default-init-revision) |
2765044b | 2943 | |
45fd3a00 SM |
2944 | (defalias 'vc-cvs-update-changelog 'vc-update-changelog-rcs2log) |
2945 | (defalias 'vc-rcs-update-changelog 'vc-update-changelog-rcs2log) | |
2946 | ;; FIXME: This should probably be moved to vc-rcs.el and replaced in | |
2947 | ;; vc-cvs.el by code using cvs2cl. | |
d7b60083 | 2948 | (defun vc-update-changelog-rcs2log (backend files) |
099bd78a SM |
2949 | "Default implementation of update-changelog. |
2950 | Uses `rcs2log' which only works for RCS and CVS." | |
0e362f54 | 2951 | ;; FIXME: We (c|sh)ould add support for cvs2cl |
449decf5 | 2952 | (let ((odefault default-directory) |
124c852b RS |
2953 | (changelog (find-change-log)) |
2954 | ;; Presumably not portable to non-Unixy systems, along with rcs2log: | |
c1b1b393 | 2955 | (tempfile (make-temp-file |
57c298c4 EZ |
2956 | (expand-file-name "vc" |
2957 | (or small-temporary-file-directory | |
2958 | temporary-file-directory)))) | |
510f6466 AS |
2959 | (login-name (or user-login-name |
2960 | (format "uid%d" (number-to-string (user-uid))))) | |
b91916f3 | 2961 | (full-name (or add-log-full-name |
8172cd86 AS |
2962 | (user-full-name) |
2963 | (user-login-name) | |
2964 | (format "uid%d" (number-to-string (user-uid))))) | |
b91916f3 RS |
2965 | (mailing-address (or add-log-mailing-address |
2966 | user-mail-address))) | |
124c852b | 2967 | (find-file-other-window changelog) |
41dfb835 RS |
2968 | (barf-if-buffer-read-only) |
2969 | (vc-buffer-sync) | |
2970 | (undo-boundary) | |
2971 | (goto-char (point-min)) | |
2972 | (push-mark) | |
2973 | (message "Computing change log entries...") | |
4b40fdea | 2974 | (message "Computing change log entries... %s" |
124c852b RS |
2975 | (unwind-protect |
2976 | (progn | |
0e362f54 | 2977 | (setq default-directory odefault) |
6f41eeb5 DL |
2978 | (if (eq 0 (apply 'call-process |
2979 | (expand-file-name "rcs2log" | |
2980 | exec-directory) | |
0e362f54 GM |
2981 | nil (list t tempfile) nil |
2982 | "-c" changelog | |
510f6466 | 2983 | "-u" (concat login-name |
0e362f54 GM |
2984 | "\t" full-name |
2985 | "\t" mailing-address) | |
2986 | (mapcar | |
2987 | (lambda (f) | |
2988 | (file-relative-name | |
d7b60083 | 2989 | (expand-file-name f odefault))) |
0e362f54 GM |
2990 | files))) |
2991 | "done" | |
04864eb0 | 2992 | (pop-to-buffer (get-buffer-create "*vc*")) |
124c852b | 2993 | (erase-buffer) |
54ebae28 | 2994 | (insert-file-contents tempfile) |
124c852b | 2995 | "failed")) |
0e362f54 | 2996 | (setq default-directory (file-name-directory changelog)) |
124c852b | 2997 | (delete-file tempfile))))) |
7d2d9482 | 2998 | |
ac3f4c6f ER |
2999 | (defun vc-default-find-revision (backend file rev buffer) |
3000 | "Provide the new `find-revision' op based on the old `checkout' op. | |
2765044b | 3001 | This is only for compatibility with old backends. They should be updated |
ac3f4c6f | 3002 | to provide the `find-revision' operation instead." |
2765044b DN |
3003 | (let ((tmpfile (make-temp-file (expand-file-name file)))) |
3004 | (unwind-protect | |
3005 | (progn | |
3006 | (vc-call-backend backend 'checkout file nil rev tmpfile) | |
3007 | (with-current-buffer buffer | |
3008 | (insert-file-contents-literally tmpfile))) | |
3009 | (delete-file tmpfile)))) | |
3010 | ||
3011 | (defun vc-default-dired-state-info (backend file) | |
d7b60083 ER |
3012 | (let* ((state (vc-state file)) |
3013 | (statestring | |
3014 | (cond | |
3015 | ((stringp state) (concat "(" state ")")) | |
3016 | ((eq state 'edited) (concat "(" (vc-user-login-name file) ")")) | |
3017 | ((eq state 'needs-merge) "(merge)") | |
3018 | ((eq state 'needs-patch) "(patch)") | |
3019 | ((eq state 'unlocked-changes) "(stale)"))) | |
3020 | (buffer | |
3021 | (get-file-buffer file)) | |
3022 | (modflag | |
3023 | (if (and buffer (buffer-modified-p buffer)) "+" ""))) | |
3024 | (concat statestring modflag))) | |
2765044b DN |
3025 | |
3026 | (defun vc-default-rename-file (backend old new) | |
3027 | (condition-case nil | |
3028 | (add-name-to-file old new) | |
3029 | (error (rename-file old new))) | |
3030 | (vc-delete-file old) | |
3031 | (with-current-buffer (find-file-noselect new) | |
3032 | (vc-register))) | |
3033 | ||
3034 | (defalias 'vc-default-logentry-check 'ignore) | |
17f3909f | 3035 | (defalias 'vc-default-check-headers 'ignore) |
2765044b DN |
3036 | |
3037 | (defun vc-default-log-view-mode (backend) (log-view-mode)) | |
3038 | ||
3039 | (defun vc-default-show-log-entry (backend rev) | |
3040 | (with-no-warnings | |
3041 | (log-view-goto-rev rev))) | |
3042 | ||
3043 | (defun vc-default-comment-history (backend file) | |
3044 | "Return a string with all log entries stored in BACKEND for FILE." | |
3045 | (if (vc-find-backend-function backend 'print-log) | |
3046 | (with-current-buffer "*vc*" | |
3047 | (vc-call print-log (list file)) | |
3f57aeb7 | 3048 | (vc-call-backend backend 'wash-log) |
2765044b DN |
3049 | (buffer-string)))) |
3050 | ||
3051 | (defun vc-default-unregister (backend file) | |
3052 | "Default implementation of `vc-unregister', signals an error." | |
3053 | (error "Unregistering files is not supported for %s" backend)) | |
3054 | ||
3055 | (defun vc-default-receive-file (backend file rev) | |
3056 | "Let BACKEND receive FILE from another version control system." | |
3057 | (vc-call-backend backend 'register file rev "")) | |
3058 | ||
3059 | (defun vc-default-create-snapshot (backend dir name branchp) | |
3060 | (when branchp | |
3061 | (error "VC backend %s does not support module branches" backend)) | |
3062 | (let ((result (vc-snapshot-precondition dir))) | |
3063 | (if (stringp result) | |
3064 | (error "File %s is not up-to-date" result) | |
3065 | (vc-file-tree-walk | |
3066 | dir | |
3067 | (lambda (f) | |
3068 | (vc-call assign-name f name)))))) | |
3069 | ||
3070 | (defun vc-default-retrieve-snapshot (backend dir name update) | |
3071 | (if (string= name "") | |
3072 | (progn | |
3073 | (vc-file-tree-walk | |
3074 | dir | |
3075 | (lambda (f) (and | |
3076 | (vc-up-to-date-p f) | |
3077 | (vc-error-occurred | |
3078 | (vc-call checkout f nil "") | |
3079 | (if update (vc-resynch-buffer f t t))))))) | |
3080 | (let ((result (vc-snapshot-precondition dir))) | |
3081 | (if (stringp result) | |
3082 | (error "File %s is locked" result) | |
3083 | (setq update (and (eq result 'visited) update)) | |
3084 | (vc-file-tree-walk | |
3085 | dir | |
3086 | (lambda (f) (vc-error-occurred | |
3087 | (vc-call checkout f nil name) | |
3088 | (if update (vc-resynch-buffer f t t))))))))) | |
3089 | ||
3090 | (defun vc-default-revert (backend file contents-done) | |
3091 | (unless contents-done | |
ac3f4c6f | 3092 | (let ((rev (vc-working-revision file)) |
2765044b DN |
3093 | (file-buffer (or (get-file-buffer file) (current-buffer)))) |
3094 | (message "Checking out %s..." file) | |
3095 | (let ((failed t) | |
3096 | (backup-name (car (find-backup-file-name file)))) | |
3097 | (when backup-name | |
3098 | (copy-file file backup-name 'ok-if-already-exists 'keep-date) | |
3099 | (unless (file-writable-p file) | |
3100 | (set-file-modes file (logior (file-modes file) 128)))) | |
3101 | (unwind-protect | |
3102 | (let ((coding-system-for-read 'no-conversion) | |
3103 | (coding-system-for-write 'no-conversion)) | |
3104 | (with-temp-file file | |
3105 | (let ((outbuf (current-buffer))) | |
3106 | ;; Change buffer to get local value of vc-checkout-switches. | |
3107 | (with-current-buffer file-buffer | |
3108 | (let ((default-directory (file-name-directory file))) | |
ac3f4c6f | 3109 | (vc-call find-revision file rev outbuf))))) |
2765044b DN |
3110 | (setq failed nil)) |
3111 | (when backup-name | |
3112 | (if failed | |
3113 | (rename-file backup-name file 'ok-if-already-exists) | |
3114 | (and (not vc-make-backup-files) (delete-file backup-name)))))) | |
3115 | (message "Checking out %s...done" file)))) | |
3116 | ||
17f3909f | 3117 | (defalias 'vc-default-revision-completion-table 'ignore) |
2765044b DN |
3118 | |
3119 | (defun vc-check-headers () | |
3120 | "Check if the current file has any headers in it." | |
3121 | (interactive) | |
3122 | (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) | |
3123 | ||
3124 | ;;; Annotate functionality | |
7d2d9482 | 3125 | |
f80f7bc2 RS |
3126 | ;; Declare globally instead of additional parameter to |
3127 | ;; temp-buffer-show-function (not possible to pass more than one | |
75665141 AS |
3128 | ;; parameter). The use of annotate-ratio is deprecated in favor of |
3129 | ;; annotate-mode, which replaces it with the more sensible "span-to | |
3130 | ;; days", along with autoscaling support. | |
099bd78a | 3131 | (defvar vc-annotate-ratio nil "Global variable.") |
0e362f54 | 3132 | |
1b5a7343 | 3133 | ;; internal buffer-local variables |
04864eb0 | 3134 | (defvar vc-annotate-backend nil) |
1b5a7343 AS |
3135 | (defvar vc-annotate-parent-file nil) |
3136 | (defvar vc-annotate-parent-rev nil) | |
3137 | (defvar vc-annotate-parent-display-mode nil) | |
1b5a7343 | 3138 | |
f66a6225 SM |
3139 | (defconst vc-annotate-font-lock-keywords |
3140 | ;; The fontification is done by vc-annotate-lines instead of font-lock. | |
3141 | '((vc-annotate-lines))) | |
3142 | ||
93113211 | 3143 | (define-derived-mode vc-annotate-mode fundamental-mode "Annotate" |
6f1ecae4 | 3144 | "Major mode for output buffers of the `vc-annotate' command. |
7d2d9482 RS |
3145 | |
3146 | You can use the mode-specific menu to alter the time-span of the used | |
3147 | colors. See variable `vc-annotate-menu-elements' for customizing the | |
3148 | menu items." | |
f66a6225 SM |
3149 | (set (make-local-variable 'truncate-lines) t) |
3150 | (set (make-local-variable 'font-lock-defaults) | |
3151 | '(vc-annotate-font-lock-keywords t)) | |
04864eb0 | 3152 | (view-mode 1)) |
7d2d9482 | 3153 | |
97461c84 | 3154 | (defun vc-annotate-display-default (ratio) |
6f1ecae4 | 3155 | "Display the output of \\[vc-annotate] using the default color range. |
97461c84 SM |
3156 | The color range is given by `vc-annotate-color-map', scaled by RATIO. |
3157 | The current time is used as the offset." | |
3158 | (interactive (progn (kill-local-variable 'vc-annotate-color-map) '(1.0))) | |
f80f7bc2 | 3159 | (message "Redisplaying annotation...") |
97461c84 | 3160 | (vc-annotate-display ratio) |
f80f7bc2 | 3161 | (message "Redisplaying annotation...done")) |
7d2d9482 | 3162 | |
97461c84 SM |
3163 | (defun vc-annotate-oldest-in-map (color-map) |
3164 | "Return the oldest time in the COLOR-MAP." | |
3165 | ;; Since entries should be sorted, we can just use the last one. | |
3166 | (caar (last color-map))) | |
6149bbfb | 3167 | |
75665141 | 3168 | (defun vc-annotate-display-autoscale (&optional full) |
946b248f | 3169 | "Highlight the output of \\[vc-annotate] using an autoscaled color map. |
6f1ecae4 | 3170 | Autoscaling means that the map is scaled from the current time to the |
f36e4afe | 3171 | oldest annotation in the buffer, or, with prefix argument FULL, to |
6f1ecae4 | 3172 | cover the range from the oldest annotation to the newest." |
f36e4afe | 3173 | (interactive "P") |
75665141 AS |
3174 | (let ((newest 0.0) |
3175 | (oldest 999999.) ;Any CVS users at the founding of Rome? | |
3176 | (current (vc-annotate-convert-time (current-time))) | |
3177 | date) | |
3178 | (message "Redisplaying annotation...") | |
3179 | ;; Run through this file and find the oldest and newest dates annotated. | |
3180 | (save-excursion | |
3181 | (goto-char (point-min)) | |
7c33af85 SM |
3182 | (while (not (eobp)) |
3183 | (when (setq date (vc-call-backend vc-annotate-backend 'annotate-time)) | |
3184 | (if (> date newest) | |
3185 | (setq newest date)) | |
3186 | (if (< date oldest) | |
3187 | (setq oldest date))) | |
3188 | (forward-line 1))) | |
75665141 | 3189 | (vc-annotate-display |
97461c84 SM |
3190 | (/ (- (if full newest current) oldest) |
3191 | (vc-annotate-oldest-in-map vc-annotate-color-map)) | |
75665141 | 3192 | (if full newest)) |
99cb8c8b SS |
3193 | (message "Redisplaying annotation...done \(%s\)" |
3194 | (if full | |
3195 | (format "Spanned from %.1f to %.1f days old" | |
75665141 AS |
3196 | (- current oldest) |
3197 | (- current newest)) | |
3198 | (format "Spanned to %.1f days old" (- current oldest)))))) | |
3199 | ||
3200 | ;; Menu -- Using easymenu.el | |
04864eb0 SM |
3201 | (easy-menu-define vc-annotate-mode-menu vc-annotate-mode-map |
3202 | "VC Annotate Display Menu" | |
3203 | `("VC-Annotate" | |
da7c8a12 | 3204 | ["By Color Map Range" (unless (null vc-annotate-display-mode) |
04864eb0 SM |
3205 | (setq vc-annotate-display-mode nil) |
3206 | (vc-annotate-display-select)) | |
3207 | :style toggle :selected (null vc-annotate-display-mode)] | |
97461c84 | 3208 | ,@(let ((oldest-in-map (vc-annotate-oldest-in-map vc-annotate-color-map))) |
04864eb0 SM |
3209 | (mapcar (lambda (element) |
3210 | (let ((days (* element oldest-in-map))) | |
07a95b81 SM |
3211 | `[,(format "Span %.1f days" days) |
3212 | (vc-annotate-display-select nil ,days) | |
3213 | :style toggle :selected | |
3214 | (eql vc-annotate-display-mode ,days) ])) | |
04864eb0 SM |
3215 | vc-annotate-menu-elements)) |
3216 | ["Span ..." | |
07a95b81 SM |
3217 | (vc-annotate-display-select |
3218 | nil (float (string-to-number (read-string "Span how many days? "))))] | |
04864eb0 SM |
3219 | "--" |
3220 | ["Span to Oldest" | |
3221 | (unless (eq vc-annotate-display-mode 'scale) | |
3222 | (vc-annotate-display-select nil 'scale)) | |
3223 | :style toggle :selected | |
3224 | (eq vc-annotate-display-mode 'scale)] | |
3225 | ["Span Oldest->Newest" | |
3226 | (unless (eq vc-annotate-display-mode 'fullscale) | |
3227 | (vc-annotate-display-select nil 'fullscale)) | |
3228 | :style toggle :selected | |
3229 | (eq vc-annotate-display-mode 'fullscale)] | |
3230 | "--" | |
ac3f4c6f ER |
3231 | ["Annotate previous revision" vc-annotate-prev-revision] |
3232 | ["Annotate next revision" vc-annotate-next-revision] | |
04864eb0 SM |
3233 | ["Annotate revision at line" vc-annotate-revision-at-line] |
3234 | ["Annotate revision previous to line" vc-annotate-revision-previous-to-line] | |
ac3f4c6f | 3235 | ["Annotate latest revision" vc-annotate-working-revision] |
04864eb0 SM |
3236 | ["Show log of revision at line" vc-annotate-show-log-revision-at-line] |
3237 | ["Show diff of revision at line" vc-annotate-show-diff-revision-at-line])) | |
75665141 AS |
3238 | |
3239 | (defun vc-annotate-display-select (&optional buffer mode) | |
6f1ecae4 AS |
3240 | "Highlight the output of \\[vc-annotate]. |
3241 | By default, the current buffer is highlighted, unless overridden by | |
3242 | BUFFER. `vc-annotate-display-mode' specifies the highlighting mode to | |
3243 | use; you may override this using the second optional arg MODE." | |
3244 | (interactive) | |
75665141 | 3245 | (if mode (setq vc-annotate-display-mode mode)) |
8a8f8697 | 3246 | (pop-to-buffer (or buffer (current-buffer))) |
f66a6225 | 3247 | (cond ((null vc-annotate-display-mode) |
07a95b81 SM |
3248 | ;; The ratio is global, thus relative to the global color-map. |
3249 | (kill-local-variable 'vc-annotate-color-map) | |
97461c84 SM |
3250 | (vc-annotate-display-default (or vc-annotate-ratio 1.0))) |
3251 | ;; One of the auto-scaling modes | |
f66a6225 | 3252 | ((eq vc-annotate-display-mode 'scale) |
7c33af85 | 3253 | (vc-exec-after `(vc-annotate-display-autoscale))) |
f66a6225 | 3254 | ((eq vc-annotate-display-mode 'fullscale) |
7c33af85 | 3255 | (vc-exec-after `(vc-annotate-display-autoscale t))) |
75665141 AS |
3256 | ((numberp vc-annotate-display-mode) ; A fixed number of days lookback |
3257 | (vc-annotate-display-default | |
97461c84 SM |
3258 | (/ vc-annotate-display-mode |
3259 | (vc-annotate-oldest-in-map vc-annotate-color-map)))) | |
f66a6225 SM |
3260 | (t (error "No such display mode: %s" |
3261 | vc-annotate-display-mode)))) | |
0e362f54 | 3262 | |
7d2d9482 | 3263 | ;;;###autoload |
04864eb0 | 3264 | (defun vc-annotate (file rev &optional display-mode buf) |
aa406465 | 3265 | "Display the edit history of the current file using colors. |
1cec418c AS |
3266 | |
3267 | This command creates a buffer that shows, for each line of the current | |
aa406465 | 3268 | file, when it was last edited and by whom. Additionally, colors are |
1cec418c | 3269 | used to show the age of each line--blue means oldest, red means |
aa406465 | 3270 | youngest, and intermediate colors indicate intermediate ages. By |
1cec418c AS |
3271 | default, the time scale stretches back one year into the past; |
3272 | everything that is older than that is shown in blue. | |
3273 | ||
3274 | With a prefix argument, this command asks two questions in the | |
ac3f4c6f ER |
3275 | minibuffer. First, you may enter a revision number; then the buffer |
3276 | displays and annotates that revision instead of the working revision | |
eb407e67 | 3277 | \(type RET in the minibuffer to leave that default unchanged). Then, |
ecd50f65 AS |
3278 | you are prompted for the time span in days which the color range |
3279 | should cover. For example, a time span of 20 days means that changes | |
3280 | over the past 20 days are shown in red to blue, according to their | |
3281 | age, and everything that is older than that is shown in blue. | |
1cec418c AS |
3282 | |
3283 | Customization variables: | |
7d2d9482 RS |
3284 | |
3285 | `vc-annotate-menu-elements' customizes the menu elements of the | |
3286 | mode-specific menu. `vc-annotate-color-map' and | |
3287 | `vc-annotate-very-old-color' defines the mapping of time to | |
3288 | colors. `vc-annotate-background' specifies the background color." | |
04864eb0 SM |
3289 | (interactive |
3290 | (save-current-buffer | |
3291 | (vc-ensure-vc-buffer) | |
3292 | (list buffer-file-name | |
ac3f4c6f | 3293 | (let ((def (vc-working-revision buffer-file-name))) |
04864eb0 SM |
3294 | (if (null current-prefix-arg) def |
3295 | (read-string | |
ac3f4c6f | 3296 | (format "Annotate from revision (default %s): " def) |
04864eb0 SM |
3297 | nil nil def))) |
3298 | (if (null current-prefix-arg) | |
3299 | vc-annotate-display-mode | |
3300 | (float (string-to-number | |
3301 | (read-string "Annotate span days (default 20): " | |
3302 | nil nil "20"))))))) | |
b6909007 | 3303 | (vc-ensure-vc-buffer) |
04864eb0 SM |
3304 | (setq vc-annotate-display-mode display-mode) ;Not sure why. --Stef |
3305 | (let* ((temp-buffer-name (format "*Annotate %s (rev %s)*" (buffer-name) rev)) | |
1867d8cb TTN |
3306 | (temp-buffer-show-function 'vc-annotate-display-select) |
3307 | ;; If BUF is specified, we presume the caller maintains current line, | |
3308 | ;; so we don't need to do it here. This implementation may give | |
3309 | ;; strange results occasionally in the case of REV != WORKFILE-REV. | |
3310 | (current-line (unless buf (line-number-at-pos)))) | |
afe35502 | 3311 | (message "Annotating...") |
04864eb0 SM |
3312 | ;; If BUF is specified it tells in which buffer we should put the |
3313 | ;; annotations. This is used when switching annotations to another | |
3314 | ;; revision, so we should update the buffer's name. | |
3315 | (if buf (with-current-buffer buf | |
3316 | (rename-buffer temp-buffer-name t) | |
3317 | ;; In case it had to be uniquified. | |
3318 | (setq temp-buffer-name (buffer-name)))) | |
46e33aee | 3319 | (with-output-to-temp-buffer temp-buffer-name |
da7c8a12 S |
3320 | (vc-call annotate-command file (get-buffer temp-buffer-name) rev) |
3321 | ;; we must setup the mode first, and then set our local | |
3322 | ;; variables before the show-function is called at the exit of | |
3323 | ;; with-output-to-temp-buffer | |
3324 | (with-current-buffer temp-buffer-name | |
3325 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3326 | (vc-annotate-mode)) | |
3327 | (set (make-local-variable 'vc-annotate-backend) (vc-backend file)) | |
3328 | (set (make-local-variable 'vc-annotate-parent-file) file) | |
3329 | (set (make-local-variable 'vc-annotate-parent-rev) rev) | |
3330 | (set (make-local-variable 'vc-annotate-parent-display-mode) | |
3331 | display-mode))) | |
cd42ec7d | 3332 | |
ebaac04d SM |
3333 | (with-current-buffer temp-buffer-name |
3334 | (vc-exec-after | |
3335 | `(progn | |
3336 | ;; Ideally, we'd rather not move point if the user has already | |
3337 | ;; moved it elsewhere, but really point here is not the position | |
3338 | ;; of the user's cursor :-( | |
3339 | (when ,current-line ;(and (bobp)) | |
86e80023 SM |
3340 | (goto-line ,current-line) |
3341 | (setq vc-sentinel-movepoint)) | |
ebaac04d SM |
3342 | (unless (active-minibuffer-window) |
3343 | (message "Annotating... done"))))))) | |
7d2d9482 | 3344 | |
ac3f4c6f ER |
3345 | (defun vc-annotate-prev-revision (prefix) |
3346 | "Visit the annotation of the revision previous to this one. | |
1b5a7343 | 3347 | |
ac3f4c6f ER |
3348 | With a numeric prefix argument, annotate the revision that many |
3349 | revisions previous." | |
1b5a7343 | 3350 | (interactive "p") |
ac3f4c6f | 3351 | (vc-annotate-warp-revision (- 0 prefix))) |
1b5a7343 | 3352 | |
ac3f4c6f ER |
3353 | (defun vc-annotate-next-revision (prefix) |
3354 | "Visit the annotation of the revision after this one. | |
1b5a7343 | 3355 | |
ac3f4c6f ER |
3356 | With a numeric prefix argument, annotate the revision that many |
3357 | revisions after." | |
1b5a7343 | 3358 | (interactive "p") |
ac3f4c6f | 3359 | (vc-annotate-warp-revision prefix)) |
1b5a7343 | 3360 | |
ac3f4c6f ER |
3361 | (defun vc-annotate-working-revision () |
3362 | "Visit the annotation of the working revision of this file." | |
1b5a7343 AS |
3363 | (interactive) |
3364 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3365 | (message "Cannot be invoked outside of a vc annotate buffer") | |
ac3f4c6f | 3366 | (let ((warp-rev (vc-working-revision vc-annotate-parent-file))) |
1b5a7343 | 3367 | (if (equal warp-rev vc-annotate-parent-rev) |
ac3f4c6f ER |
3368 | (message "Already at revision %s" warp-rev) |
3369 | (vc-annotate-warp-revision warp-rev))))) | |
1b5a7343 AS |
3370 | |
3371 | (defun vc-annotate-extract-revision-at-line () | |
3372 | "Extract the revision number of the current line." | |
3373 | ;; This function must be invoked from a buffer in vc-annotate-mode | |
1b5a7343 AS |
3374 | (vc-call-backend vc-annotate-backend 'annotate-extract-revision-at-line)) |
3375 | ||
3376 | (defun vc-annotate-revision-at-line () | |
ac3f4c6f | 3377 | "Visit the annotation of the revision identified in the current line." |
1b5a7343 AS |
3378 | (interactive) |
3379 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3380 | (message "Cannot be invoked outside of a vc annotate buffer") | |
3381 | (let ((rev-at-line (vc-annotate-extract-revision-at-line))) | |
3382 | (if (not rev-at-line) | |
3383 | (message "Cannot extract revision number from the current line") | |
3384 | (if (equal rev-at-line vc-annotate-parent-rev) | |
ac3f4c6f ER |
3385 | (message "Already at revision %s" rev-at-line) |
3386 | (vc-annotate-warp-revision rev-at-line)))))) | |
1b5a7343 AS |
3387 | |
3388 | (defun vc-annotate-revision-previous-to-line () | |
ac3f4c6f | 3389 | "Visit the annotation of the revision before the revision at line." |
1b5a7343 AS |
3390 | (interactive) |
3391 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3392 | (message "Cannot be invoked outside of a vc annotate buffer") | |
3393 | (let ((rev-at-line (vc-annotate-extract-revision-at-line)) | |
3394 | (prev-rev nil)) | |
3395 | (if (not rev-at-line) | |
3396 | (message "Cannot extract revision number from the current line") | |
3397 | (setq prev-rev | |
ac3f4c6f ER |
3398 | (vc-call previous-revision vc-annotate-parent-file rev-at-line)) |
3399 | (vc-annotate-warp-revision prev-rev))))) | |
1b5a7343 AS |
3400 | |
3401 | (defun vc-annotate-show-log-revision-at-line () | |
ac3f4c6f | 3402 | "Visit the log of the revision at line." |
1b5a7343 AS |
3403 | (interactive) |
3404 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3405 | (message "Cannot be invoked outside of a vc annotate buffer") | |
3406 | (let ((rev-at-line (vc-annotate-extract-revision-at-line))) | |
3407 | (if (not rev-at-line) | |
3408 | (message "Cannot extract revision number from the current line") | |
3409 | (vc-print-log rev-at-line))))) | |
3410 | ||
3411 | (defun vc-annotate-show-diff-revision-at-line () | |
ac3f4c6f | 3412 | "Visit the diff of the revision at line from its previous revision." |
1b5a7343 AS |
3413 | (interactive) |
3414 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3415 | (message "Cannot be invoked outside of a vc annotate buffer") | |
3416 | (let ((rev-at-line (vc-annotate-extract-revision-at-line)) | |
3417 | (prev-rev nil)) | |
3418 | (if (not rev-at-line) | |
3419 | (message "Cannot extract revision number from the current line") | |
3420 | (setq prev-rev | |
ac3f4c6f | 3421 | (vc-call previous-revision vc-annotate-parent-file rev-at-line)) |
1b5a7343 | 3422 | (if (not prev-rev) |
ac3f4c6f | 3423 | (message "Cannot diff from any revision prior to %s" rev-at-line) |
1b5a7343 | 3424 | (save-window-excursion |
d7b60083 ER |
3425 | (vc-diff-internal |
3426 | (vc-backend vc-annotate-parent-file) | |
3427 | nil | |
3428 | (list vc-annotate-parent-file) | |
3429 | prev-rev rev-at-line)) | |
1b5a7343 AS |
3430 | (switch-to-buffer "*vc-diff*")))))) |
3431 | ||
ac3f4c6f ER |
3432 | (defun vc-annotate-warp-revision (revspec) |
3433 | "Annotate the revision described by REVSPEC. | |
1b5a7343 | 3434 | |
ac3f4c6f | 3435 | If REVSPEC is a positive integer, warp that many revisions |
1b5a7343 | 3436 | forward, if possible, otherwise echo a warning message. If |
ac3f4c6f | 3437 | REVSPEC is a negative integer, warp that many revisions backward, |
1b5a7343 AS |
3438 | if possible, otherwise echo a warning message. If REVSPEC is a |
3439 | string, then it describes a revision number, so warp to that | |
3440 | revision." | |
3441 | (if (not (equal major-mode 'vc-annotate-mode)) | |
3442 | (message "Cannot be invoked outside of a vc annotate buffer") | |
da7c8a12 S |
3443 | (let* ((buf (current-buffer)) |
3444 | (oldline (line-number-at-pos)) | |
1b5a7343 AS |
3445 | (revspeccopy revspec) |
3446 | (newrev nil)) | |
3447 | (cond | |
3448 | ((and (integerp revspec) (> revspec 0)) | |
3449 | (setq newrev vc-annotate-parent-rev) | |
3450 | (while (and (> revspec 0) newrev) | |
ac3f4c6f | 3451 | (setq newrev (vc-call next-revision |
1b5a7343 AS |
3452 | vc-annotate-parent-file newrev)) |
3453 | (setq revspec (1- revspec))) | |
3454 | (if (not newrev) | |
ac3f4c6f | 3455 | (message "Cannot increment %d revisions from revision %s" |
1b5a7343 AS |
3456 | revspeccopy vc-annotate-parent-rev))) |
3457 | ((and (integerp revspec) (< revspec 0)) | |
3458 | (setq newrev vc-annotate-parent-rev) | |
3459 | (while (and (< revspec 0) newrev) | |
ac3f4c6f | 3460 | (setq newrev (vc-call previous-revision |
1b5a7343 AS |
3461 | vc-annotate-parent-file newrev)) |
3462 | (setq revspec (1+ revspec))) | |
3463 | (if (not newrev) | |
ac3f4c6f | 3464 | (message "Cannot decrement %d revisions from revision %s" |
1b5a7343 AS |
3465 | (- 0 revspeccopy) vc-annotate-parent-rev))) |
3466 | ((stringp revspec) (setq newrev revspec)) | |
ac3f4c6f | 3467 | (t (error "Invalid argument to vc-annotate-warp-revision"))) |
1b5a7343 | 3468 | (when newrev |
04864eb0 SM |
3469 | (vc-annotate vc-annotate-parent-file newrev |
3470 | vc-annotate-parent-display-mode | |
da7c8a12 | 3471 | buf) |
1b5a7343 | 3472 | (goto-line (min oldline (progn (goto-char (point-max)) |
79f47f38 | 3473 | (forward-line -1) |
da7c8a12 | 3474 | (line-number-at-pos))) buf))))) |
1b5a7343 | 3475 | |
f70419a8 | 3476 | (defun vc-annotate-compcar (threshold a-list) |
6f1ecae4 AS |
3477 | "Test successive cons cells of A-LIST against THRESHOLD. |
3478 | Return the first cons cell with a car that is not less than THRESHOLD, | |
3479 | nil if no such cell exists." | |
f70419a8 RS |
3480 | (let ((i 1) |
3481 | (tmp-cons (car a-list))) | |
3482 | (while (and tmp-cons (< (car tmp-cons) threshold)) | |
3483 | (setq tmp-cons (car (nthcdr i a-list))) | |
3484 | (setq i (+ i 1))) | |
3485 | tmp-cons)) ; Return the appropriate value | |
3486 | ||
75665141 | 3487 | (defun vc-annotate-convert-time (time) |
6f1ecae4 AS |
3488 | "Convert a time value to a floating-point number of days. |
3489 | The argument TIME is a list as returned by `current-time' or | |
3490 | `encode-time', only the first two elements of that list are considered." | |
75665141 AS |
3491 | (/ (+ (* (float (car time)) (lsh 1 16)) (cadr time)) 24 3600)) |
3492 | ||
3493 | (defun vc-annotate-difference (&optional offset) | |
6f1ecae4 AS |
3494 | "Return the time span in days to the next annotation. |
3495 | This calls the backend function annotate-time, and returns the | |
3496 | difference in days between the time returned and the current time, | |
3497 | or OFFSET if present." | |
75665141 AS |
3498 | (let ((next-time (vc-call-backend vc-annotate-backend 'annotate-time))) |
3499 | (if next-time | |
99cb8c8b | 3500 | (- (or offset |
75665141 AS |
3501 | (vc-call-backend vc-annotate-backend 'annotate-current-time)) |
3502 | next-time)))) | |
3503 | ||
3504 | (defun vc-default-annotate-current-time (backend) | |
3505 | "Return the current time, encoded as fractional days." | |
3506 | (vc-annotate-convert-time (current-time))) | |
99cb8c8b | 3507 | |
07577777 JPW |
3508 | (defvar vc-annotate-offset nil) |
3509 | ||
97461c84 | 3510 | (defun vc-annotate-display (ratio &optional offset) |
6f1ecae4 | 3511 | "Highlight `vc-annotate' output in the current buffer. |
97461c84 | 3512 | RATIO, is the expansion that should be applied to `vc-annotate-color-map'. |
bf142f28 | 3513 | The annotations are relative to the current time, unless overridden by OFFSET." |
97461c84 SM |
3514 | (if (/= ratio 1.0) |
3515 | (set (make-local-variable 'vc-annotate-color-map) | |
3516 | (mapcar (lambda (elem) (cons (* (car elem) ratio) (cdr elem))) | |
3517 | vc-annotate-color-map))) | |
f66a6225 SM |
3518 | (set (make-local-variable 'vc-annotate-offset) offset) |
3519 | (font-lock-mode 1)) | |
3520 | ||
f66a6225 | 3521 | (defun vc-annotate-lines (limit) |
7c33af85 SM |
3522 | (while (< (point) limit) |
3523 | (let ((difference (vc-annotate-difference vc-annotate-offset)) | |
3524 | (start (point)) | |
3525 | (end (progn (forward-line 1) (point)))) | |
3526 | (when difference | |
3527 | (let* ((color (or (vc-annotate-compcar difference vc-annotate-color-map) | |
3528 | (cons nil vc-annotate-very-old-color))) | |
3529 | ;; substring from index 1 to remove any leading `#' in the name | |
3530 | (face-name (concat "vc-annotate-face-" | |
3531 | (if (string-equal | |
3532 | (substring (cdr color) 0 1) "#") | |
3533 | (substring (cdr color) 1) | |
3534 | (cdr color)))) | |
3535 | ;; Make the face if not done. | |
3536 | (face (or (intern-soft face-name) | |
3537 | (let ((tmp-face (make-face (intern face-name)))) | |
3538 | (set-face-foreground tmp-face (cdr color)) | |
3539 | (if vc-annotate-background | |
3540 | (set-face-background tmp-face | |
3541 | vc-annotate-background)) | |
3542 | tmp-face)))) ; Return the face | |
3543 | (put-text-property start end 'face face))))) | |
3544 | ;; Pretend to font-lock there were no matches. | |
3545 | nil) | |
7d2d9482 | 3546 | \f |
594722a8 ER |
3547 | |
3548 | ;; Set up key bindings for use while editing log messages | |
3549 | ||
d7b60083 | 3550 | (defun vc-log-edit (fileset) |
928ef6d9 | 3551 | "Set up `log-edit' for use with VC on FILE." |
099bd78a | 3552 | (setq default-directory |
d7b60083 ER |
3553 | (with-current-buffer vc-parent-buffer default-directory)) |
3554 | (log-edit 'vc-finish-logentry nil `(lambda () ',fileset)) | |
3555 | (set (make-local-variable 'vc-log-fileset) fileset) | |
ac3f4c6f | 3556 | (make-local-variable 'vc-log-revision) |
099bd78a | 3557 | (set-buffer-modified-p nil) |
0e362f54 | 3558 | (setq buffer-file-name nil)) |
594722a8 | 3559 | |
ec402ad4 | 3560 | ;; These things should probably be generally available |
594722a8 | 3561 | |
2f119435 AS |
3562 | (defun vc-file-tree-walk (dirname func &rest args) |
3563 | "Walk recursively through DIRNAME. | |
0e362f54 | 3564 | Invoke FUNC f ARGS on each VC-managed file f underneath it." |
2f119435 AS |
3565 | (vc-file-tree-walk-internal (expand-file-name dirname) func args) |
3566 | (message "Traversing directory %s...done" dirname)) | |
02da6253 PE |
3567 | |
3568 | (defun vc-file-tree-walk-internal (file func args) | |
3569 | (if (not (file-directory-p file)) | |
0e362f54 | 3570 | (if (vc-backend file) (apply func file args)) |
993a1a44 | 3571 | (message "Traversing directory %s..." (abbreviate-file-name file)) |
02da6253 PE |
3572 | (let ((dir (file-name-as-directory file))) |
3573 | (mapcar | |
0e362f54 | 3574 | (lambda (f) (or |
d1a607bc SM |
3575 | (string-equal f ".") |
3576 | (string-equal f "..") | |
3577 | (member f vc-directory-exclusion-list) | |
3578 | (let ((dirf (expand-file-name f dir))) | |
3579 | (or | |
3580 | (file-symlink-p dirf) ;; Avoid possible loops. | |
3581 | (vc-file-tree-walk-internal dirf func args))))) | |
02da6253 | 3582 | (directory-files dir))))) |
594722a8 ER |
3583 | |
3584 | (provide 'vc) | |
3585 | ||
ec402ad4 SM |
3586 | ;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE |
3587 | ;; | |
ec402ad4 SM |
3588 | ;; These may be useful to anyone who has to debug or extend the package. |
3589 | ;; (Note that this information corresponds to versions 5.x. Some of it | |
3590 | ;; might have been invalidated by the additions to support branching | |
3591 | ;; and RCS keyword lookup. AS, 1995/03/24) | |
3592 | ;; | |
3593 | ;; A fundamental problem in VC is that there are time windows between | |
3594 | ;; vc-next-action's computations of the file's version-control state and | |
3595 | ;; the actions that change it. This is a window open to lossage in a | |
3596 | ;; multi-user environment; someone else could nip in and change the state | |
3597 | ;; of the master during it. | |
3598 | ;; | |
3599 | ;; The performance problem is that rlog/prs calls are very expensive; we want | |
3600 | ;; to avoid them as much as possible. | |
3601 | ;; | |
3602 | ;; ANALYSIS: | |
3603 | ;; | |
3604 | ;; The performance problem, it turns out, simplifies in practice to the | |
3605 | ;; problem of making vc-state fast. The two other functions that call | |
3606 | ;; prs/rlog will not be so commonly used that the slowdown is a problem; one | |
3607 | ;; makes snapshots, the other deletes the calling user's last change in the | |
3608 | ;; master. | |
3609 | ;; | |
3610 | ;; The race condition implies that we have to either (a) lock the master | |
3611 | ;; during the entire execution of vc-next-action, or (b) detect and | |
3612 | ;; recover from errors resulting from dispatch on an out-of-date state. | |
3613 | ;; | |
3614 | ;; Alternative (a) appears to be infeasible. The problem is that we can't | |
3615 | ;; guarantee that the lock will ever be removed. Suppose a user starts a | |
3616 | ;; checkin, the change message buffer pops up, and the user, having wandered | |
3617 | ;; off to do something else, simply forgets about it? | |
3618 | ;; | |
3619 | ;; Alternative (b), on the other hand, works well with a cheap way to speed up | |
3620 | ;; vc-state. Usually, if a file is registered, we can read its locked/ | |
3621 | ;; unlocked state and its current owner from its permissions. | |
3622 | ;; | |
3623 | ;; This shortcut will fail if someone has manually changed the workfile's | |
3624 | ;; permissions; also if developers are munging the workfile in several | |
3625 | ;; directories, with symlinks to a master (in this latter case, the | |
3626 | ;; permissions shortcut will fail to detect a lock asserted from another | |
3627 | ;; directory). | |
3628 | ;; | |
3629 | ;; Note that these cases correspond exactly to the errors which could happen | |
3630 | ;; because of a competing checkin/checkout race in between two instances of | |
3631 | ;; vc-next-action. | |
3632 | ;; | |
3633 | ;; For VC's purposes, a workfile/master pair may have the following states: | |
3634 | ;; | |
3635 | ;; A. Unregistered. There is a workfile, there is no master. | |
3636 | ;; | |
3637 | ;; B. Registered and not locked by anyone. | |
3638 | ;; | |
3639 | ;; C. Locked by calling user and unchanged. | |
3640 | ;; | |
3641 | ;; D. Locked by the calling user and changed. | |
3642 | ;; | |
3643 | ;; E. Locked by someone other than the calling user. | |
3644 | ;; | |
3645 | ;; This makes for 25 states and 20 error conditions. Here's the matrix: | |
3646 | ;; | |
3647 | ;; VC's idea of state | |
3648 | ;; | | |
3649 | ;; V Actual state RCS action SCCS action Effect | |
3650 | ;; A B C D E | |
3651 | ;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin | |
3652 | ;; B 5 . 6 7 8 co -l get -e checkout | |
3653 | ;; C 9 10 . 11 12 co -u unget; get revert | |
3654 | ;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin | |
3655 | ;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock | |
3656 | ;; | |
3657 | ;; All commands take the master file name as a last argument (not shown). | |
3658 | ;; | |
3659 | ;; In the discussion below, a "self-race" is a pathological situation in | |
3660 | ;; which VC operations are being attempted simultaneously by two or more | |
3661 | ;; Emacsen running under the same username. | |
3662 | ;; | |
3663 | ;; The vc-next-action code has the following windows: | |
3664 | ;; | |
3665 | ;; Window P: | |
3666 | ;; Between the check for existence of a master file and the call to | |
3667 | ;; admin/checkin in vc-buffer-admin (apparent state A). This window may | |
3668 | ;; never close if the initial-comment feature is on. | |
3669 | ;; | |
3670 | ;; Window Q: | |
3671 | ;; Between the call to vc-workfile-unchanged-p in and the immediately | |
3672 | ;; following revert (apparent state C). | |
3673 | ;; | |
3674 | ;; Window R: | |
3675 | ;; Between the call to vc-workfile-unchanged-p in and the following | |
3676 | ;; checkin (apparent state D). This window may never close. | |
3677 | ;; | |
3678 | ;; Window S: | |
3679 | ;; Between the unlock and the immediately following checkout during a | |
3680 | ;; revert operation (apparent state C). Included in window Q. | |
3681 | ;; | |
3682 | ;; Window T: | |
3683 | ;; Between vc-state and the following checkout (apparent state B). | |
3684 | ;; | |
3685 | ;; Window U: | |
3686 | ;; Between vc-state and the following revert (apparent state C). | |
3687 | ;; Includes windows Q and S. | |
3688 | ;; | |
3689 | ;; Window V: | |
3690 | ;; Between vc-state and the following checkin (apparent state | |
3691 | ;; D). This window may never be closed if the user fails to complete the | |
3692 | ;; checkin message. Includes window R. | |
3693 | ;; | |
3694 | ;; Window W: | |
3695 | ;; Between vc-state and the following steal-lock (apparent | |
3696 | ;; state E). This window may never close if the user fails to complete | |
3697 | ;; the steal-lock message. Includes window X. | |
3698 | ;; | |
3699 | ;; Window X: | |
3700 | ;; Between the unlock and the immediately following re-lock during a | |
3701 | ;; steal-lock operation (apparent state E). This window may never close | |
3702 | ;; if the user fails to complete the steal-lock message. | |
3703 | ;; | |
3704 | ;; Errors: | |
3705 | ;; | |
3706 | ;; Apparent state A --- | |
3707 | ;; | |
3708 | ;; 1. File looked unregistered but is actually registered and not locked. | |
3709 | ;; | |
3710 | ;; Potential cause: someone else's admin during window P, with | |
3711 | ;; caller's admin happening before their checkout. | |
3712 | ;; | |
3713 | ;; RCS: Prior to version 5.6.4, ci fails with message | |
3714 | ;; "no lock set by <user>". From 5.6.4 onwards, VC uses the new | |
3715 | ;; ci -i option and the message is "<file>,v: already exists". | |
3716 | ;; SCCS: admin will fail with error (ad19). | |
3717 | ;; | |
3718 | ;; We can let these errors be passed up to the user. | |
3719 | ;; | |
3720 | ;; 2. File looked unregistered but is actually locked by caller, unchanged. | |
3721 | ;; | |
3722 | ;; Potential cause: self-race during window P. | |
3723 | ;; | |
3724 | ;; RCS: Prior to version 5.6.4, reverts the file to the last saved | |
3725 | ;; version and unlocks it. From 5.6.4 onwards, VC uses the new | |
3726 | ;; ci -i option, failing with message "<file>,v: already exists". | |
3727 | ;; SCCS: will fail with error (ad19). | |
3728 | ;; | |
3729 | ;; Either of these consequences is acceptable. | |
3730 | ;; | |
3731 | ;; 3. File looked unregistered but is actually locked by caller, changed. | |
3732 | ;; | |
3733 | ;; Potential cause: self-race during window P. | |
3734 | ;; | |
3735 | ;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as | |
3736 | ;; a delta with a null change comment (the -t- switch will be | |
3737 | ;; ignored). From 5.6.4 onwards, VC uses the new ci -i option, | |
3738 | ;; failing with message "<file>,v: already exists". | |
3739 | ;; SCCS: will fail with error (ad19). | |
3740 | ;; | |
3741 | ;; 4. File looked unregistered but is locked by someone else. | |
0e362f54 | 3742 | ;;; |
ec402ad4 SM |
3743 | ;; Potential cause: someone else's admin during window P, with |
3744 | ;; caller's admin happening *after* their checkout. | |
3745 | ;; | |
3746 | ;; RCS: Prior to version 5.6.4, ci fails with a | |
3747 | ;; "no lock set by <user>" message. From 5.6.4 onwards, | |
3748 | ;; VC uses the new ci -i option, failing with message | |
3749 | ;; "<file>,v: already exists". | |
3750 | ;; SCCS: will fail with error (ad19). | |
3751 | ;; | |
3752 | ;; We can let these errors be passed up to the user. | |
3753 | ;; | |
3754 | ;; Apparent state B --- | |
3755 | ;; | |
3756 | ;; 5. File looked registered and not locked, but is actually unregistered. | |
3757 | ;; | |
3758 | ;; Potential cause: master file got nuked during window P. | |
3759 | ;; | |
3760 | ;; RCS: will fail with "RCS/<file>: No such file or directory" | |
3761 | ;; SCCS: will fail with error ut4. | |
3762 | ;; | |
3763 | ;; We can let these errors be passed up to the user. | |
3764 | ;; | |
3765 | ;; 6. File looked registered and not locked, but is actually locked by the | |
3766 | ;; calling user and unchanged. | |
3767 | ;; | |
3768 | ;; Potential cause: self-race during window T. | |
3769 | ;; | |
3770 | ;; RCS: in the same directory as the previous workfile, co -l will fail | |
3771 | ;; with "co error: writable foo exists; checkout aborted". In any other | |
3772 | ;; directory, checkout will succeed. | |
3773 | ;; SCCS: will fail with ge17. | |
3774 | ;; | |
3775 | ;; Either of these consequences is acceptable. | |
3776 | ;; | |
3777 | ;; 7. File looked registered and not locked, but is actually locked by the | |
3778 | ;; calling user and changed. | |
3779 | ;; | |
3780 | ;; As case 6. | |
3781 | ;; | |
3782 | ;; 8. File looked registered and not locked, but is actually locked by another | |
3783 | ;; user. | |
3784 | ;; | |
3785 | ;; Potential cause: someone else checks it out during window T. | |
3786 | ;; | |
3787 | ;; RCS: co error: revision 1.3 already locked by <user> | |
3788 | ;; SCCS: fails with ge4 (in directory) or ut7 (outside it). | |
3789 | ;; | |
3790 | ;; We can let these errors be passed up to the user. | |
3791 | ;; | |
3792 | ;; Apparent state C --- | |
3793 | ;; | |
3794 | ;; 9. File looks locked by calling user and unchanged, but is unregistered. | |
3795 | ;; | |
3796 | ;; As case 5. | |
3797 | ;; | |
3798 | ;; 10. File looks locked by calling user and unchanged, but is actually not | |
3799 | ;; locked. | |
3800 | ;; | |
3801 | ;; Potential cause: a self-race in window U, or by the revert's | |
3802 | ;; landing during window X of some other user's steal-lock or window S | |
3803 | ;; of another user's revert. | |
3804 | ;; | |
3805 | ;; RCS: succeeds, refreshing the file from the identical version in | |
3806 | ;; the master. | |
3807 | ;; SCCS: fails with error ut4 (p file nonexistent). | |
3808 | ;; | |
3809 | ;; Either of these consequences is acceptable. | |
3810 | ;; | |
3811 | ;; 11. File is locked by calling user. It looks unchanged, but is actually | |
3812 | ;; changed. | |
3813 | ;; | |
3814 | ;; Potential cause: the file would have to be touched by a self-race | |
3815 | ;; during window Q. | |
3816 | ;; | |
3817 | ;; The revert will succeed, removing whatever changes came with | |
3818 | ;; the touch. It is theoretically possible that work could be lost. | |
3819 | ;; | |
3820 | ;; 12. File looks like it's locked by the calling user and unchanged, but | |
3821 | ;; it's actually locked by someone else. | |
3822 | ;; | |
3823 | ;; Potential cause: a steal-lock in window V. | |
3824 | ;; | |
3825 | ;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u | |
3826 | ;; SCCS: fails with error un2 | |
3827 | ;; | |
3828 | ;; We can pass these errors up to the user. | |
3829 | ;; | |
3830 | ;; Apparent state D --- | |
3831 | ;; | |
3832 | ;; 13. File looks like it's locked by the calling user and changed, but it's | |
3833 | ;; actually unregistered. | |
3834 | ;; | |
3835 | ;; Potential cause: master file got nuked during window P. | |
3836 | ;; | |
3837 | ;; RCS: Prior to version 5.6.4, checks in the user's version as an | |
3838 | ;; initial delta. From 5.6.4 onwards, VC uses the new ci -j | |
3839 | ;; option, failing with message "no such file or directory". | |
3840 | ;; SCCS: will fail with error ut4. | |
3841 | ;; | |
3842 | ;; This case is kind of nasty. Under RCS prior to version 5.6.4, | |
3843 | ;; VC may fail to detect the loss of previous version information. | |
3844 | ;; | |
3845 | ;; 14. File looks like it's locked by the calling user and changed, but it's | |
3846 | ;; actually unlocked. | |
3847 | ;; | |
3848 | ;; Potential cause: self-race in window V, or the checkin happening | |
3849 | ;; during the window X of someone else's steal-lock or window S of | |
3850 | ;; someone else's revert. | |
3851 | ;; | |
3852 | ;; RCS: ci will fail with "no lock set by <user>". | |
3853 | ;; SCCS: delta will fail with error ut4. | |
3854 | ;; | |
3855 | ;; 15. File looks like it's locked by the calling user and changed, but it's | |
3856 | ;; actually locked by the calling user and unchanged. | |
3857 | ;; | |
3858 | ;; Potential cause: another self-race --- a whole checkin/checkout | |
3859 | ;; sequence by the calling user would have to land in window R. | |
3860 | ;; | |
3861 | ;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. | |
3862 | ;; RCS: reverts to the file state as of the second user's checkin, leaving | |
3863 | ;; the file unlocked. | |
3864 | ;; | |
3865 | ;; It is theoretically possible that work could be lost under RCS. | |
3866 | ;; | |
3867 | ;; 16. File looks like it's locked by the calling user and changed, but it's | |
3868 | ;; actually locked by a different user. | |
3869 | ;; | |
3870 | ;; RCS: ci error: no lock set by <user> | |
3871 | ;; SCCS: unget will fail with error un2 | |
3872 | ;; | |
3873 | ;; We can pass these errors up to the user. | |
3874 | ;; | |
3875 | ;; Apparent state E --- | |
3876 | ;; | |
3877 | ;; 17. File looks like it's locked by some other user, but it's actually | |
3878 | ;; unregistered. | |
3879 | ;; | |
3880 | ;; As case 13. | |
3881 | ;; | |
3882 | ;; 18. File looks like it's locked by some other user, but it's actually | |
3883 | ;; unlocked. | |
3884 | ;; | |
3885 | ;; Potential cause: someone released a lock during window W. | |
3886 | ;; | |
3887 | ;; RCS: The calling user will get the lock on the file. | |
3888 | ;; SCCS: unget -n will fail with cm4. | |
3889 | ;; | |
3890 | ;; Either of these consequences will be OK. | |
3891 | ;; | |
3892 | ;; 19. File looks like it's locked by some other user, but it's actually | |
3893 | ;; locked by the calling user and unchanged. | |
3894 | ;; | |
3895 | ;; Potential cause: the other user relinquishing a lock followed by | |
3896 | ;; a self-race, both in window W. | |
3897 | ;; | |
3898 | ;; Under both RCS and SCCS, both unlock and lock will succeed, making | |
3899 | ;; the sequence a no-op. | |
3900 | ;; | |
3901 | ;; 20. File looks like it's locked by some other user, but it's actually | |
3902 | ;; locked by the calling user and changed. | |
3903 | ;; | |
3904 | ;; As case 19. | |
3905 | ;; | |
3906 | ;; PROBLEM CASES: | |
3907 | ;; | |
3908 | ;; In order of decreasing severity: | |
3909 | ;; | |
3910 | ;; Cases 11 and 15 are the only ones that potentially lose work. | |
3911 | ;; They would require a self-race for this to happen. | |
3912 | ;; | |
3913 | ;; Case 13 in RCS loses information about previous deltas, retaining | |
3914 | ;; only the information in the current workfile. This can only happen | |
3915 | ;; if the master file gets nuked in window P. | |
3916 | ;; | |
3917 | ;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with | |
3918 | ;; no change comment in the master. This would require a self-race in | |
3919 | ;; window P or R respectively. | |
3920 | ;; | |
3921 | ;; Cases 2, 10, 19 and 20 do extra work, but make no changes. | |
3922 | ;; | |
3923 | ;; Unfortunately, it appears to me that no recovery is possible in these | |
3924 | ;; cases. They don't yield error messages, so there's no way to tell that | |
3925 | ;; a race condition has occurred. | |
3926 | ;; | |
3927 | ;; All other cases don't change either the workfile or the master, and | |
3928 | ;; trigger command errors which the user will see. | |
3929 | ;; | |
3930 | ;; Thus, there is no explicit recovery code. | |
594722a8 | 3931 | |
0452b6e7 | 3932 | ;; arch-tag: ca82c1de-3091-4e26-af92-460abc6213a6 |
594722a8 | 3933 | ;;; vc.el ends here |