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