Commit | Line | Data |
---|---|---|
0d42eb3e | 1 | ;;; vc.el --- drive a version-control system from within Emacs -*- lexical-binding: t -*- |
594722a8 | 2 | |
ba318903 | 3 | ;; Copyright (C) 1992-1998, 2000-2014 Free Software Foundation, Inc. |
594722a8 | 4 | |
0e362f54 GM |
5 | ;; Author: FSF (see below for full credits) |
6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | |
9766adfb | 7 | ;; Keywords: vc tools |
594722a8 ER |
8 | |
9 | ;; This file is part of GNU Emacs. | |
10 | ||
eb3fa2cf | 11 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
594722a8 | 12 | ;; it under the terms of the GNU General Public License as published by |
eb3fa2cf GM |
13 | ;; the Free Software Foundation, either version 3 of the License, or |
14 | ;; (at your option) any later version. | |
594722a8 ER |
15 | |
16 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 | ;; GNU General Public License for more details. | |
20 | ||
21 | ;; You should have received a copy of the GNU General Public License | |
eb3fa2cf | 22 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
594722a8 | 23 | |
0e362f54 GM |
24 | ;;; Credits: |
25 | ||
26 | ;; VC was initially designed and implemented by Eric S. Raymond | |
61de26cb | 27 | ;; <esr@thyrsus.com> in 1992. Over the years, many other people have |
0e362f54 | 28 | ;; contributed substantial amounts of work to VC. These include: |
61de26cb | 29 | ;; |
0e362f54 GM |
30 | ;; Per Cederqvist <ceder@lysator.liu.se> |
31 | ;; Paul Eggert <eggert@twinsun.com> | |
32 | ;; Sebastian Kremer <sk@thp.uni-koeln.de> | |
33 | ;; Martin Lorentzson <martinl@gnu.org> | |
166a0ef7 | 34 | ;; Dave Love <fx@gnu.org> |
0e362f54 | 35 | ;; Stefan Monnier <monnier@cs.yale.edu> |
7fbb4797 DN |
36 | ;; Thien-Thi Nguyen <ttn@gnu.org> |
37 | ;; Dan Nicolaescu <dann@ics.uci.edu> | |
6f1ecae4 | 38 | ;; J.D. Smith <jdsmith@alum.mit.edu> |
0e362f54 GM |
39 | ;; Andre Spiegel <spiegel@gnu.org> |
40 | ;; Richard Stallman <rms@gnu.org> | |
61de26cb ER |
41 | ;; |
42 | ;; In July 2007 ESR returned and redesigned the mode to cope better | |
43 | ;; with modern version-control systems that do commits by fileset | |
44 | ;; rather than per individual file. | |
45 | ;; | |
a7192ddb SM |
46 | ;; If you maintain a client of the mode or customize it in your .emacs, |
47 | ;; note that some backend functions which formerly took single file arguments | |
61de26cb ER |
48 | ;; now take a list of files. These include: register, checkin, print-log, |
49 | ;; rollback, and diff. | |
0e362f54 | 50 | |
594722a8 ER |
51 | ;;; Commentary: |
52 | ||
1a2f456b ER |
53 | ;; This mode is fully documented in the Emacs user's manual. |
54 | ;; | |
c0edfa75 | 55 | ;; Supported version-control systems presently include CVS, RCS, GNU |
6aa5d910 | 56 | ;; Arch, Subversion, Bzr, Git, Mercurial, Monotone and SCCS |
5e8c0b8b | 57 | ;; (or its free replacement, CSSC). |
b0c9bc8c | 58 | ;; |
1a2f456b | 59 | ;; If your site uses the ChangeLog convention supported by Emacs, the |
93a142e1 DN |
60 | ;; function `log-edit-comment-to-change-log' could prove a useful checkin hook, |
61 | ;; although you might prefer to use C-c C-a (i.e. `log-edit-insert-changelog') | |
1cca5da4 | 62 | ;; from the commit buffer instead or to set `log-edit-setup-invert'. |
1a2f456b | 63 | ;; |
004f9b3f ER |
64 | ;; When using SCCS, RCS, CVS: be careful not to do repo surgery, or |
65 | ;; operations like registrations and deletions and renames, outside VC | |
66 | ;; while VC is running. The support for these systems was designed | |
67 | ;; when disks were much slower, and the code maintains a lot of | |
68 | ;; internal state in order to reduce expensive operations to a | |
69 | ;; minimum. Thus, if you mess with the repo while VC's back is turned, | |
70 | ;; VC may get seriously confused. | |
71 | ;; | |
72 | ;; When using Subversion or a later system, anything you do outside VC | |
73 | ;; *through the VCS tools* should safely interlock with VC | |
74 | ;; operations. Under these VC does little state caching, because local | |
75 | ;; operations are assumed to be fast. The dividing line is | |
594722a8 | 76 | ;; |
fcb500ea AS |
77 | ;; ADDING SUPPORT FOR OTHER BACKENDS |
78 | ;; | |
79 | ;; VC can use arbitrary version control systems as a backend. To add | |
80 | ;; support for a new backend named SYS, write a library vc-sys.el that | |
81 | ;; contains functions of the form `vc-sys-...' (note that SYS is in lower | |
82 | ;; case for the function and library names). VC will use that library if | |
83 | ;; you put the symbol SYS somewhere into the list of | |
84 | ;; `vc-handled-backends'. Then, for example, if `vc-sys-registered' | |
85 | ;; returns non-nil for a file, all SYS-specific versions of VC commands | |
86 | ;; will be available for that file. | |
87 | ;; | |
88 | ;; VC keeps some per-file information in the form of properties (see | |
89 | ;; vc-file-set/getprop in vc-hooks.el). The backend-specific functions | |
90 | ;; do not generally need to be aware of these properties. For example, | |
ac3f4c6f | 91 | ;; `vc-sys-working-revision' should compute the working revision and |
fcb500ea AS |
92 | ;; return it; it should not look it up in the property, and it needn't |
93 | ;; store it there either. However, if a backend-specific function does | |
94 | ;; store a value in a property, that value takes precedence over any | |
99cb8c8b | 95 | ;; value that the generic code might want to set (check for uses of |
fcb500ea AS |
96 | ;; the macro `with-vc-properties' in vc.el). |
97 | ;; | |
98 | ;; In the list of functions below, each identifier needs to be prepended | |
99 | ;; with `vc-sys-'. Some of the functions are mandatory (marked with a | |
100 | ;; `*'), others are optional (`-'). | |
2c3160c5 | 101 | |
8cdd17b4 ER |
102 | ;; BACKEND PROPERTIES |
103 | ;; | |
104 | ;; * revision-granularity | |
105 | ;; | |
61de26cb ER |
106 | ;; Takes no arguments. Returns either 'file or 'repository. Backends |
107 | ;; that return 'file have per-file revision numbering; backends | |
108 | ;; that return 'repository have per-repository revision numbering, | |
109 | ;; so a revision level implicitly identifies a changeset | |
2c3160c5 | 110 | |
fcb500ea AS |
111 | ;; STATE-QUERYING FUNCTIONS |
112 | ;; | |
0e362f54 | 113 | ;; * registered (file) |
fcb500ea | 114 | ;; |
37a5e97a | 115 | ;; Return non-nil if FILE is registered in this backend. Both this |
73770b03 DN |
116 | ;; function as well as `state' should be careful to fail gracefully |
117 | ;; in the event that the backend executable is absent. It is | |
931a2762 | 118 | ;; preferable that this function's *body* is autoloaded, that way only |
73770b03 DN |
119 | ;; calling vc-registered does not cause the backend to be loaded |
120 | ;; (all the vc-FOO-registered functions are called to try to find | |
931a2762 | 121 | ;; the controlling backend for FILE). |
fcb500ea | 122 | ;; |
99cb8c8b | 123 | ;; * state (file) |
fcb500ea AS |
124 | ;; |
125 | ;; Return the current version control state of FILE. For a list of | |
126 | ;; possible values, see `vc-state'. This function should do a full and | |
127 | ;; reliable state computation; it is usually called immediately after | |
128 | ;; C-x v v. If you want to use a faster heuristic when visiting a | |
3702367b | 129 | ;; file, put that into `state-heuristic' below. Note that under most |
4903369a | 130 | ;; VCSes this won't be called at all, dir-status is used instead. |
fcb500ea | 131 | ;; |
0e362f54 | 132 | ;; - state-heuristic (file) |
fcb500ea AS |
133 | ;; |
134 | ;; If provided, this function is used to estimate the version control | |
135 | ;; state of FILE at visiting time. It should be considerably faster | |
136 | ;; than the implementation of `state'. For a list of possible values, | |
137 | ;; see the doc string of `vc-state'. | |
138 | ;; | |
c1b51374 | 139 | ;; - dir-status (dir update-function) |
00ca5ce2 | 140 | ;; |
1b3f2d4e DN |
141 | ;; Produce RESULT: a list of lists of the form (FILE VC-STATE EXTRA) |
142 | ;; for the files in DIR. | |
143 | ;; EXTRA can be used for backend specific information about FILE. | |
144 | ;; If a command needs to be run to compute this list, it should be | |
145 | ;; run asynchronously using (current-buffer) as the buffer for the | |
146 | ;; command. When RESULT is computed, it should be passed back by | |
c1b51374 | 147 | ;; doing: (funcall UPDATE-FUNCTION RESULT nil). |
d63aa41f | 148 | ;; If the backend uses a process filter, hence it produces partial results, |
5a84a937 | 149 | ;; they can be passed back by doing: |
c1b51374 SM |
150 | ;; (funcall UPDATE-FUNCTION RESULT t) |
151 | ;; and then do a (funcall UPDATE-FUNCTION RESULT nil) | |
5a84a937 | 152 | ;; when all the results have been computed. |
e1aec6fb | 153 | ;; To provide more backend specific functionality for `vc-dir' |
13ad7457 DN |
154 | ;; the following functions might be needed: `dir-extra-headers', |
155 | ;; `dir-printer', `extra-dir-menu' and `dir-status-files'. | |
00ca5ce2 | 156 | ;; |
fb0ac090 AJ |
157 | ;; - dir-status-files (dir files default-state update-function) |
158 | ;; | |
159 | ;; This function is identical to dir-status except that it should | |
160 | ;; only report status for the specified FILES. Also it needs to | |
161 | ;; report on all requested files, including up-to-date or ignored | |
162 | ;; files. If not provided, the default is to consider that the files | |
163 | ;; are in DEFAULT-STATE. | |
164 | ;; | |
13ad7457 | 165 | ;; - dir-extra-headers (dir) |
115c0061 | 166 | ;; |
e1aec6fb | 167 | ;; Return a string that will be added to the *vc-dir* buffer header. |
15c5c970 | 168 | ;; |
13ad7457 | 169 | ;; - dir-printer (fileinfo) |
58f10bff | 170 | ;; |
e1aec6fb | 171 | ;; Pretty print the `vc-dir-fileinfo' FILEINFO. |
58f10bff | 172 | ;; If a backend needs to show more information than the default FILE |
e1aec6fb SM |
173 | ;; and STATE in the vc-dir listing, it can store that extra |
174 | ;; information in `vc-dir-fileinfo->extra'. This function can be | |
175 | ;; used to display that extra information in the *vc-dir* buffer. | |
58f10bff | 176 | ;; |
5a84a937 DN |
177 | ;; - status-fileinfo-extra (file) |
178 | ;; | |
e1aec6fb | 179 | ;; Compute `vc-dir-fileinfo->extra' for FILE. |
5a84a937 | 180 | ;; |
ac3f4c6f | 181 | ;; * working-revision (file) |
fcb500ea | 182 | ;; |
ac3f4c6f | 183 | ;; Return the working revision of FILE. This is the revision fetched |
ee7683eb | 184 | ;; by the last checkout or update, not necessarily the same thing as the |
a7192ddb | 185 | ;; head or tip revision. Should return "0" for a file added but not yet |
61de26cb | 186 | ;; committed. |
fcb500ea AS |
187 | ;; |
188 | ;; - latest-on-branch-p (file) | |
189 | ;; | |
ac3f4c6f ER |
190 | ;; Return non-nil if the working revision of FILE is the latest revision |
191 | ;; on its branch (many VCSes call this the 'tip' or 'head' revision). | |
0d0e9356 | 192 | ;; The default implementation always returns t, which means that |
ac3f4c6f | 193 | ;; working with non-current revisions is not supported by default. |
fcb500ea | 194 | ;; |
e0607aaa | 195 | ;; * checkout-model (files) |
fcb500ea | 196 | ;; |
e0607aaa | 197 | ;; Indicate whether FILES need to be "checked out" before they can be |
fcb500ea AS |
198 | ;; edited. See `vc-checkout-model' for a list of possible values. |
199 | ;; | |
aae91380 | 200 | ;; - workfile-unchanged-p (file) |
fcb500ea | 201 | ;; |
ac3f4c6f ER |
202 | ;; Return non-nil if FILE is unchanged from the working revision. |
203 | ;; This function should do a brief comparison of FILE's contents | |
004f9b3f | 204 | ;; with those of the repository copy of the working revision. If |
ac3f4c6f ER |
205 | ;; the backend does not have such a brief-comparison feature, the |
206 | ;; default implementation of this function can be used, which | |
207 | ;; delegates to a full vc-BACKEND-diff. (Note that vc-BACKEND-diff | |
208 | ;; must not run asynchronously in this case, see variable | |
0d0e9356 | 209 | ;; `vc-disable-async-diff'.) |
fcb500ea | 210 | ;; |
0e362f54 | 211 | ;; - mode-line-string (file) |
fcb500ea | 212 | ;; |
3a12f9f8 | 213 | ;; If provided, this function should return the VC-specific mode |
a7192ddb | 214 | ;; line string for FILE. The returned string should have a |
3a12f9f8 DN |
215 | ;; `help-echo' property which is the text to be displayed as a |
216 | ;; tooltip when the mouse hovers over the VC entry on the mode-line. | |
217 | ;; The default implementation deals well with all states that | |
218 | ;; `vc-state' can return. | |
fcb500ea | 219 | ;; |
fcb500ea AS |
220 | ;; STATE-CHANGING FUNCTIONS |
221 | ;; | |
61de26cb | 222 | ;; * create-repo (backend) |
8cdd17b4 | 223 | ;; |
a7192ddb SM |
224 | ;; Create an empty repository in the current directory and initialize |
225 | ;; it so VC mode can add files to it. For file-oriented systems, this | |
8cdd17b4 ER |
226 | ;; need do no more than create a subdirectory with the right name. |
227 | ;; | |
228 | ;; * register (files &optional rev comment) | |
fcb500ea | 229 | ;; |
8cdd17b4 ER |
230 | ;; Register FILES in this backend. Optionally, an initial revision REV |
231 | ;; and an initial description of the file, COMMENT, may be specified, | |
232 | ;; but it is not guaranteed that the backend will do anything with this. | |
ecd50f65 | 233 | ;; The implementation should pass the value of vc-register-switches |
a7192ddb | 234 | ;; to the backend command. (Note: in older versions of VC, this |
8cdd17b4 | 235 | ;; command took a single file argument and not a list.) |
931a2762 | 236 | ;; The REV argument is a historical leftover and is never used. |
fcb500ea | 237 | ;; |
ac3f4c6f | 238 | ;; - init-revision (file) |
b470cb65 | 239 | ;; |
ac3f4c6f | 240 | ;; The initial revision to use when registering FILE if one is not |
b470cb65 | 241 | ;; specified by the user. If not provided, the variable |
ac3f4c6f | 242 | ;; vc-default-init-revision is used instead. |
b470cb65 | 243 | ;; |
099bd78a | 244 | ;; - responsible-p (file) |
fcb500ea AS |
245 | ;; |
246 | ;; Return non-nil if this backend considers itself "responsible" for | |
247 | ;; FILE, which can also be a directory. This function is used to find | |
248 | ;; out what backend to use for registration of new files and for things | |
249 | ;; like change log generation. The default implementation always | |
250 | ;; returns nil. | |
251 | ;; | |
0e362f54 | 252 | ;; - could-register (file) |
fcb500ea AS |
253 | ;; |
254 | ;; Return non-nil if FILE could be registered under this backend. The | |
255 | ;; default implementation always returns t. | |
256 | ;; | |
aae91380 | 257 | ;; - receive-file (file rev) |
fcb500ea AS |
258 | ;; |
259 | ;; Let this backend "receive" a file that is already registered under | |
260 | ;; another backend. The default implementation simply calls `register' | |
261 | ;; for FILE, but it can be overridden to do something more specific, | |
262 | ;; e.g. keep revision numbers consistent or choose editing modes for | |
263 | ;; FILE that resemble those of the other backend. | |
264 | ;; | |
265 | ;; - unregister (file) | |
266 | ;; | |
267 | ;; Unregister FILE from this backend. This is only needed if this | |
268 | ;; backend may be used as a "more local" backend for temporary editing. | |
269 | ;; | |
e97a42c1 | 270 | ;; * checkin (files rev comment) |
fcb500ea | 271 | ;; |
e97a42c1 SM |
272 | ;; Commit changes in FILES to this backend. REV is a historical artifact |
273 | ;; and should be ignored. COMMENT is used as a check-in comment. | |
274 | ;; The implementation should pass the value of vc-checkin-switches to | |
275 | ;; the backend command. | |
fcb500ea | 276 | ;; |
ac3f4c6f | 277 | ;; * find-revision (file rev buffer) |
fd8160f7 SM |
278 | ;; |
279 | ;; Fetch revision REV of file FILE and put it into BUFFER. | |
280 | ;; If REV is the empty string, fetch the head of the trunk. | |
281 | ;; The implementation should pass the value of vc-checkout-switches | |
282 | ;; to the backend command. | |
283 | ;; | |
9e6da495 | 284 | ;; * checkout (file &optional editable rev) |
fcb500ea AS |
285 | ;; |
286 | ;; Check out revision REV of FILE into the working area. If EDITABLE | |
287 | ;; is non-nil, FILE should be writable by the user and if locking is | |
288 | ;; used for FILE, a lock should also be set. If REV is non-nil, that | |
ac3f4c6f | 289 | ;; is the revision to check out (default is the working revision). |
4279775b AS |
290 | ;; If REV is t, that means to check out the head of the current branch; |
291 | ;; if it is the empty string, check out the head of the trunk. | |
292 | ;; The implementation should pass the value of vc-checkout-switches | |
fd8160f7 | 293 | ;; to the backend command. |
fcb500ea | 294 | ;; |
bbfc07d3 | 295 | ;; * revert (file &optional contents-done) |
fcb500ea | 296 | ;; |
ac3f4c6f | 297 | ;; Revert FILE back to the working revision. If optional |
bbfc07d3 AS |
298 | ;; arg CONTENTS-DONE is non-nil, then the contents of FILE have |
299 | ;; already been reverted from a version backup, and this function | |
300 | ;; only needs to update the status of FILE within the backend. | |
239b3340 DN |
301 | ;; If FILE is in the `added' state it should be returned to the |
302 | ;; `unregistered' state. | |
fcb500ea | 303 | ;; |
8cdd17b4 | 304 | ;; - rollback (files) |
fcb500ea | 305 | ;; |
ac3f4c6f ER |
306 | ;; Remove the tip revision of each of FILES from the repository. If |
307 | ;; this function is not provided, trying to cancel a revision is | |
8cdd17b4 ER |
308 | ;; caught as an error. (Most backends don't provide it.) (Also |
309 | ;; note that older versions of this backend command were called | |
310 | ;; 'cancel-version' and took a single file arg, not a list of | |
311 | ;; files.) | |
fcb500ea | 312 | ;; |
aae91380 | 313 | ;; - merge (file rev1 rev2) |
fcb500ea | 314 | ;; |
2c3160c5 CY |
315 | ;; Merge the changes between REV1 and REV2 into the current working file |
316 | ;; (for non-distributed VCS). | |
317 | ;; | |
3d92f44e | 318 | ;; - merge-branch () |
2c3160c5 | 319 | ;; |
3d92f44e CY |
320 | ;; Merge another branch into the current one, prompting for a |
321 | ;; location to merge from. | |
fcb500ea | 322 | ;; |
aae91380 | 323 | ;; - merge-news (file) |
fcb500ea AS |
324 | ;; |
325 | ;; Merge recent changes from the current branch into FILE. | |
2c3160c5 CY |
326 | ;; (for non-distributed VCS). |
327 | ;; | |
328 | ;; - pull (prompt) | |
329 | ;; | |
330 | ;; Pull "upstream" changes into the current branch (for distributed | |
331 | ;; VCS). If PROMPT is non-nil, or if necessary, prompt for a | |
332 | ;; location to pull from. | |
fcb500ea | 333 | ;; |
ac3f4c6f | 334 | ;; - steal-lock (file &optional revision) |
fcb500ea | 335 | ;; |
ac3f4c6f | 336 | ;; Steal any lock on the working revision of FILE, or on REVISION if |
0d0e9356 ER |
337 | ;; that is provided. This function is only needed if locking is |
338 | ;; used for files under this backend, and if files can indeed be | |
339 | ;; locked by other users. | |
fcb500ea | 340 | ;; |
9b64a7f0 ER |
341 | ;; - modify-change-comment (files rev comment) |
342 | ;; | |
df49d02e | 343 | ;; Modify the change comments associated with the files at the |
9b64a7f0 ER |
344 | ;; given revision. This is optional, many backends do not support it. |
345 | ;; | |
7fbb4797 DN |
346 | ;; - mark-resolved (files) |
347 | ;; | |
348 | ;; Mark conflicts as resolved. Some VC systems need to run a | |
349 | ;; command to mark conflicts as resolved. | |
34ca0f4c XF |
350 | ;; |
351 | ;; - find-admin-dir (file) | |
352 | ;; | |
353 | ;; Return the administrative directory of FILE. | |
2c3160c5 | 354 | |
fcb500ea AS |
355 | ;; HISTORY FUNCTIONS |
356 | ;; | |
662c5698 | 357 | ;; * print-log (files buffer &optional shortlog start-revision limit) |
fcb500ea | 358 | ;; |
6616006b | 359 | ;; Insert the revision log for FILES into BUFFER. |
32ba3abc | 360 | ;; If SHORTLOG is true insert a short version of the log. |
48b27575 DN |
361 | ;; If LIMIT is true insert only insert LIMIT log entries. If the |
362 | ;; backend does not support limiting the number of entries to show | |
363 | ;; it should return `limit-unsupported'. | |
bb7cdf58 GM |
364 | ;; If START-REVISION is given, then show the log starting from that |
365 | ;; revision ("starting" in the sense of it being the _newest_ | |
366 | ;; revision shown, rather than the working revision, which is normally | |
367 | ;; the case). Not all backends support this. At present, this is | |
368 | ;; only ever used with LIMIT = 1 (by vc-annotate-show-log-revision-at-line). | |
fcb500ea | 369 | ;; |
31527c56 DN |
370 | ;; * log-outgoing (backend remote-location) |
371 | ;; | |
372 | ;; Insert in BUFFER the revision log for the changes that will be | |
373 | ;; sent when performing a push operation to REMOTE-LOCATION. | |
374 | ;; | |
375 | ;; * log-incoming (backend remote-location) | |
376 | ;; | |
377 | ;; Insert in BUFFER the revision log for the changes that will be | |
378 | ;; received when performing a pull operation from REMOTE-LOCATION. | |
379 | ;; | |
37a5e97a SM |
380 | ;; - log-view-mode () |
381 | ;; | |
382 | ;; Mode to use for the output of print-log. This defaults to | |
383 | ;; `log-view-mode' and is expected to be changed (if at all) to a derived | |
384 | ;; mode of `log-view-mode'. | |
385 | ;; | |
ac3f4c6f | 386 | ;; - show-log-entry (revision) |
fcb500ea | 387 | ;; |
ac3f4c6f | 388 | ;; If provided, search the log entry for REVISION in the current buffer, |
fcb500ea AS |
389 | ;; and make sure it is displayed in the buffer's window. The default |
390 | ;; implementation of this function works for RCS-style logs. | |
391 | ;; | |
aae91380 | 392 | ;; - comment-history (file) |
fcb500ea | 393 | ;; |
d6ba9c39 | 394 | ;; Return a string containing all log entries that were made for FILE. |
fcb500ea | 395 | ;; This is used for transferring a file from one backend to another, |
f0fbfd43 | 396 | ;; retaining comment information. |
fcb500ea | 397 | ;; |
aae91380 | 398 | ;; - update-changelog (files) |
fcb500ea AS |
399 | ;; |
400 | ;; Using recent log entries, create ChangeLog entries for FILES, or for | |
401 | ;; all files at or below the default-directory if FILES is nil. The | |
402 | ;; default implementation runs rcs2log, which handles RCS- and | |
403 | ;; CVS-style logs. | |
404 | ;; | |
d7b60083 | 405 | ;; * diff (files &optional rev1 rev2 buffer) |
fcb500ea | 406 | ;; |
ac9ff209 AS |
407 | ;; Insert the diff for FILE into BUFFER, or the *vc-diff* buffer if |
408 | ;; BUFFER is nil. If REV1 and REV2 are non-nil, report differences | |
ac3f4c6f ER |
409 | ;; from REV1 to REV2. If REV1 is nil, use the working revision (as |
410 | ;; found in the repository) as the older revision; if REV2 is nil, | |
411 | ;; use the current working-copy contents as the newer revision. This | |
412 | ;; function should pass the value of (vc-switches BACKEND 'diff) to | |
413 | ;; the backend command. It should return a status of either 0 (no | |
414 | ;; differences found), or 1 (either non-empty diff or the diff is | |
415 | ;; run asynchronously). | |
fcb500ea | 416 | ;; |
a7192ddb | 417 | ;; - revision-completion-table (files) |
4d83a657 | 418 | ;; |
a7192ddb | 419 | ;; Return a completion table for existing revisions of FILES. |
4d83a657 SM |
420 | ;; The default is to not use any completion table. |
421 | ;; | |
3c42cc64 | 422 | ;; - annotate-command (file buf &optional rev) |
fcb500ea | 423 | ;; |
3c42cc64 | 424 | ;; If this function is provided, it should produce an annotated display |
ac3f4c6f | 425 | ;; of FILE in BUF, relative to revision REV. Annotation means each line |
3c42cc64 TTN |
426 | ;; of FILE displayed is prefixed with version information associated with |
427 | ;; its addition (deleted lines leave no history) and that the text of the | |
428 | ;; file is fontified according to age. | |
fcb500ea | 429 | ;; |
75665141 | 430 | ;; - annotate-time () |
fcb500ea AS |
431 | ;; |
432 | ;; Only required if `annotate-command' is defined for the backend. | |
75665141 AS |
433 | ;; Return the time of the next line of annotation at or after point, |
434 | ;; as a floating point fractional number of days. The helper | |
435 | ;; function `vc-annotate-convert-time' may be useful for converting | |
436 | ;; multi-part times as returned by `current-time' and `encode-time' | |
0ff9b955 | 437 | ;; to this format. Return nil if no more lines of annotation appear |
75665141 AS |
438 | ;; in the buffer. You can safely assume that point is placed at the |
439 | ;; beginning of each line, starting at `point-min'. The buffer that | |
440 | ;; point is placed in is the Annotate output, as defined by the | |
946b248f TTN |
441 | ;; relevant backend. This function also affects how much of the line |
442 | ;; is fontified; where it leaves point is where fontification begins. | |
75665141 AS |
443 | ;; |
444 | ;; - annotate-current-time () | |
445 | ;; | |
446 | ;; Only required if `annotate-command' is defined for the backend, | |
447 | ;; AND you'd like the current time considered to be anything besides | |
cb223bba | 448 | ;; (vc-annotate-convert-time (current-time)) -- i.e. the current |
75665141 AS |
449 | ;; time with hours, minutes, and seconds included. Probably safe to |
450 | ;; ignore. Return the current-time, in units of fractional days. | |
fcb500ea | 451 | ;; |
1b5a7343 AS |
452 | ;; - annotate-extract-revision-at-line () |
453 | ;; | |
454 | ;; Only required if `annotate-command' is defined for the backend. | |
455 | ;; Invoked from a buffer in vc-annotate-mode, return the revision | |
456 | ;; corresponding to the current line, or nil if there is no revision | |
457 | ;; corresponding to the current line. | |
d1e4c403 DN |
458 | ;; If the backend supports annotating through copies and renames, |
459 | ;; and displays a file name and a revision, then return a cons | |
460 | ;; (REVISION . FILENAME). | |
2c3160c5 | 461 | |
370fded4 | 462 | ;; TAG SYSTEM |
fcb500ea | 463 | ;; |
370fded4 | 464 | ;; - create-tag (dir name branchp) |
fcb500ea | 465 | ;; |
370fded4 ER |
466 | ;; Attach the tag NAME to the state of the working copy. This |
467 | ;; should make sure that files are up-to-date before proceeding with | |
468 | ;; the action. DIR can also be a file and if BRANCHP is specified, | |
469 | ;; NAME should be created as a branch and DIR should be checked out | |
470 | ;; under this new branch. The default implementation does not | |
471 | ;; support branches but does a sanity check, a tree traversal and | |
472 | ;; assigns the tag to each file. | |
fcb500ea | 473 | ;; |
370fded4 | 474 | ;; - retrieve-tag (dir name update) |
fcb500ea | 475 | ;; |
370fded4 | 476 | ;; Retrieve the version tagged by NAME of all registered files at or below DIR. |
fcb500ea | 477 | ;; If UPDATE is non-nil, then update buffers of any files in the |
370fded4 | 478 | ;; tag that are currently visited. The default implementation |
fcb500ea AS |
479 | ;; does a sanity check whether there aren't any uncommitted changes at |
480 | ;; or below DIR, and then performs a tree walk, using the `checkout' | |
ac3f4c6f | 481 | ;; function to retrieve the corresponding revisions. |
2c3160c5 | 482 | |
fcb500ea AS |
483 | ;; MISCELLANEOUS |
484 | ;; | |
aae91380 | 485 | ;; - make-version-backups-p (file) |
fcb500ea | 486 | ;; |
ac3f4c6f | 487 | ;; Return non-nil if unmodified repository revisions of FILE should be |
fcb500ea AS |
488 | ;; backed up locally. If this is done, VC can perform `diff' and |
489 | ;; `revert' operations itself, without calling the backend system. The | |
490 | ;; default implementation always returns nil. | |
491 | ;; | |
32ba3abc | 492 | ;; - root (file) |
8951efef | 493 | ;; |
32ba3abc DN |
494 | ;; Return the root of the VC controlled hierarchy for file. |
495 | ;; | |
a36319a4 SM |
496 | ;; - repository-hostname (dirname) |
497 | ;; | |
498 | ;; Return the hostname that the backend will have to contact | |
499 | ;; in order to operate on a file in DIRNAME. If the return value | |
0452b6e7 | 500 | ;; is nil, it means that the repository is local. |
a36319a4 SM |
501 | ;; This function is used in `vc-stay-local-p' which backends can use |
502 | ;; for their convenience. | |
503 | ;; | |
63191d9f XF |
504 | ;; - ignore (file &optional directory) |
505 | ;; | |
506 | ;; Ignore FILE under the VCS of DIRECTORY (default is `default-directory'). | |
507 | ;; FILE is a file wildcard. | |
508 | ;; When called interactively and with a prefix argument, remove FILE | |
509 | ;; from ignored files. | |
510 | ;; When called from Lisp code, if DIRECTORY is non-nil, the | |
511 | ;; repository to use will be deduced by DIRECTORY. | |
8951efef | 512 | ;; |
ab419665 | 513 | ;; - ignore-completion-table |
8951efef | 514 | ;; |
ab419665 XF |
515 | ;; Return the completion table for files ignored by the current |
516 | ;; version control system, e.g., the entries in `.gitignore' and | |
517 | ;; `.bzrignore'. | |
8951efef | 518 | ;; |
ac3f4c6f | 519 | ;; - previous-revision (file rev) |
869131a5 | 520 | ;; |
ac3f4c6f ER |
521 | ;; Return the revision number that precedes REV for FILE, or nil if no such |
522 | ;; revision exists. | |
1b5a7343 | 523 | ;; |
ac3f4c6f | 524 | ;; - next-revision (file rev) |
1b5a7343 | 525 | ;; |
ac3f4c6f ER |
526 | ;; Return the revision number that follows REV for FILE, or nil if no such |
527 | ;; revision exists. | |
869131a5 | 528 | ;; |
09158997 DN |
529 | ;; - log-edit-mode () |
530 | ;; | |
531 | ;; Turn on the mode used for editing the check in log. This | |
532 | ;; defaults to `log-edit-mode'. If changed, it should use a mode | |
533 | ;; derived from`log-edit-mode'. | |
534 | ;; | |
aae91380 | 535 | ;; - check-headers () |
fcb500ea AS |
536 | ;; |
537 | ;; Return non-nil if the current buffer contains any version headers. | |
538 | ;; | |
aae91380 | 539 | ;; - clear-headers () |
fcb500ea AS |
540 | ;; |
541 | ;; In the current buffer, reset all version headers to their unexpanded | |
542 | ;; form. This function should be provided if the state-querying code | |
543 | ;; for this backend uses the version headers to determine the state of | |
544 | ;; a file. This function will then be called whenever VC changes the | |
545 | ;; version control state in such a way that the headers would give | |
546 | ;; wrong information. | |
547 | ;; | |
a36319a4 SM |
548 | ;; - delete-file (file) |
549 | ;; | |
550 | ;; Delete FILE and mark it as deleted in the repository. If this | |
551 | ;; function is not provided, the command `vc-delete-file' will | |
552 | ;; signal an error. | |
553 | ;; | |
099bd78a | 554 | ;; - rename-file (old new) |
fcb500ea AS |
555 | ;; |
556 | ;; Rename file OLD to NEW, both in the working area and in the | |
a36319a4 SM |
557 | ;; repository. If this function is not provided, the renaming |
558 | ;; will be done by (vc-delete-file old) and (vc-register new). | |
86a65190 | 559 | ;; |
6e54fa53 SM |
560 | ;; - find-file-hook () |
561 | ;; | |
81c63b50 | 562 | ;; Operation called in current buffer when opening a file. This can |
6e54fa53 | 563 | ;; be used by the backend to setup some local variables it might need. |
cb223bba | 564 | ;; |
cb223bba DN |
565 | ;; - extra-menu () |
566 | ;; | |
567 | ;; Return a menu keymap, the items in the keymap will appear at the | |
568 | ;; end of the Version Control menu. The goal is to allow backends | |
569 | ;; to specify extra menu items that appear in the VC menu. This way | |
570 | ;; you can provide menu entries for functionality that is specific | |
571 | ;; to your backend and which does not map to any of the VC generic | |
572 | ;; concepts. | |
6656ecaa | 573 | ;; |
13ad7457 | 574 | ;; - extra-dir-menu () |
6656ecaa | 575 | ;; |
25a4ea6d DN |
576 | ;; Return a menu keymap, the items in the keymap will appear at the |
577 | ;; end of the VC Status menu. The goal is to allow backends to | |
578 | ;; specify extra menu items that appear in the VC Status menu. This | |
579 | ;; makes it possible to provide menu entries for functionality that | |
580 | ;; is specific to a backend and which does not map to any of the VC | |
581 | ;; generic concepts. | |
e97a42c1 SM |
582 | ;; |
583 | ;; - conflicted-files (dir) | |
584 | ;; | |
585 | ;; Return the list of files where conflict resolution is needed in | |
586 | ;; the project that contains DIR. | |
587 | ;; FIXME: what should it do with non-text conflicts? | |
aae91380 | 588 | |
ba463d9e DN |
589 | ;;; Todo: |
590 | ||
de7a9afa SM |
591 | ;; - Get rid of the "master file" terminology. |
592 | ||
ee91bfdf SM |
593 | ;; - Add key-binding for vc-delete-file. |
594 | ||
2e4f4469 ER |
595 | ;;;; New Primitives: |
596 | ;; | |
fc30d544 DN |
597 | ;; - deal with push/pull operations. |
598 | ;; | |
84cb74cf DN |
599 | ;;;; Primitives that need changing: |
600 | ;; | |
601 | ;; - vc-update/vc-merge should deal with VC systems that don't | |
602 | ;; update/merge on a file basis, but on a whole repository basis. | |
603 | ;; vc-update and vc-merge assume the arguments are always files, | |
604 | ;; they don't deal with directories. Make sure the *vc-dir* buffer | |
f0fbfd43 | 605 | ;; is updated after these operations. |
84cb74cf DN |
606 | ;; At least bzr, git and hg should benefit from this. |
607 | ;; | |
2e4f4469 | 608 | ;;;; Improved branch and tag handling: |
7fbb4797 | 609 | ;; |
fc30d544 DN |
610 | ;; - add a generic mechanism for remembering the current branch names, |
611 | ;; display the branch name in the mode-line. Replace | |
612 | ;; vc-cvs-sticky-tag with that. | |
613 | ;; | |
2e4f4469 ER |
614 | ;;;; Internal cleanups: |
615 | ;; | |
616 | ;; - backends that care about vc-stay-local should try to take it into | |
ee91bfdf | 617 | ;; account for vc-dir. Is this likely to be useful??? YES! |
2e4f4469 ER |
618 | ;; |
619 | ;; - vc-expand-dirs should take a backend parameter and only look for | |
620 | ;; files managed by that backend. | |
621 | ;; | |
622 | ;; - Another important thing: merge all the status-like backend operations. | |
623 | ;; We should remove dir-status, state, and dir-status-files, and | |
624 | ;; replace them with just `status' which takes a fileset and a continuation | |
625 | ;; (like dir-status) and returns a buffer in which the process(es) are run | |
626 | ;; (or nil if it worked synchronously). Hopefully we can define the old | |
627 | ;; 4 operations in term of this one. | |
628 | ;; | |
629 | ;;;; Other | |
630 | ;; | |
631 | ;; - when a file is in `conflict' state, turn on smerge-mode. | |
632 | ;; | |
633 | ;; - figure out what to do with conflicts that are not caused by the | |
634 | ;; file contents, but by metadata or other causes. Example: File A | |
635 | ;; gets renamed to B in one branch and to C in another and you merge | |
636 | ;; the two branches. Or you locally add file FOO and then pull a | |
637 | ;; change that also adds a new file FOO, ... | |
638 | ;; | |
fc30d544 DN |
639 | ;; - make it easier to write logs. Maybe C-x 4 a should add to the log |
640 | ;; buffer, if one is present, instead of adding to the ChangeLog. | |
ba463d9e | 641 | ;; |
5bd20ee6 | 642 | ;; - When vc-next-action calls vc-checkin it could pre-fill the |
ce1438d6 | 643 | ;; *vc-log* buffer with some obvious items: the list of files that |
5bd20ee6 DN |
644 | ;; were added, the list of files that were removed. If the diff is |
645 | ;; available, maybe it could even call something like | |
646 | ;; `diff-add-change-log-entries-other-window' to create a detailed | |
647 | ;; skeleton for the log... | |
648 | ;; | |
e1aec6fb | 649 | ;; - most vc-dir backends need more work. They might need to |
7fbb4797 DN |
650 | ;; provide custom headers, use the `extra' field and deal with all |
651 | ;; possible VC states. | |
652 | ;; | |
8234f5be | 653 | ;; - add a function that calls vc-dir to `find-directory-functions'. |
d6f47dff | 654 | ;; |
d3201e0b DN |
655 | ;; - vc-diff, vc-annotate, etc. need to deal better with unregistered |
656 | ;; files. Now that unregistered and ignored files are shown in | |
4903369a | 657 | ;; vc-dir, it is possible that these commands are called |
d3201e0b DN |
658 | ;; for unregistered/ignored files. |
659 | ;; | |
572aed3d DN |
660 | ;; - vc-next-action needs work in order to work with multiple |
661 | ;; backends: `vc-state' returns the state for the default backend, | |
662 | ;; not for the backend in the current *vc-dir* buffer. | |
18a083fd | 663 | ;; |
74d0991f DN |
664 | ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, |
665 | ;; it should work for other async commands done through vc-do-command | |
666 | ;; as well, | |
667 | ;; | |
668 | ;; - vc-dir toolbar needs more icons. | |
669 | ;; | |
f6ff0e87 DN |
670 | ;; - The backends should avoid using `vc-file-setprop' and `vc-file-getprop'. |
671 | ;; | |
fcb500ea | 672 | ;;; Code: |
0e362f54 | 673 | |
594722a8 | 674 | (require 'vc-hooks) |
92d1eebf | 675 | (require 'vc-dispatcher) |
64db3a90 | 676 | |
07875ee7 CY |
677 | (declare-function diff-setup-whitespace "diff-mode" ()) |
678 | ||
b1ddeeb7 | 679 | (eval-when-compile |
8de724f3 | 680 | (require 'dired)) |
b1ddeeb7 | 681 | |
58ba7b1b CY |
682 | (declare-function dired-get-filename "dired" (&optional localp noerror)) |
683 | (declare-function dired-move-to-filename "dired" (&optional err eol)) | |
684 | (declare-function dired-marker-regexp "dired" ()) | |
685 | ||
b5446276 DN |
686 | (unless (assoc 'vc-parent-buffer minor-mode-alist) |
687 | (setq minor-mode-alist | |
688 | (cons '(vc-parent-buffer vc-parent-buffer-name) | |
689 | minor-mode-alist))) | |
594722a8 ER |
690 | |
691 | ;; General customization | |
692 | ||
0101cc40 | 693 | (defgroup vc nil |
cf20dee0 | 694 | "Emacs interface to version control systems." |
0101cc40 RS |
695 | :group 'tools) |
696 | ||
0101cc40 | 697 | (defcustom vc-initial-comment nil |
04864eb0 | 698 | "If non-nil, prompt for initial comment when a file is registered." |
0101cc40 RS |
699 | :type 'boolean |
700 | :group 'vc) | |
701 | ||
80c6d77f GM |
702 | (make-obsolete-variable 'vc-initial-comment "it has no effect." "23.2") |
703 | ||
ac3f4c6f ER |
704 | (defcustom vc-default-init-revision "1.1" |
705 | "A string used as the default revision number when a new file is registered. | |
b470cb65 AS |
706 | This can be overridden by giving a prefix argument to \\[vc-register]. This |
707 | can also be overridden by a particular VC backend." | |
0d53f466 | 708 | :type 'string |
cd32a7ba DN |
709 | :group 'vc |
710 | :version "20.3") | |
0d53f466 | 711 | |
0101cc40 | 712 | (defcustom vc-checkin-switches nil |
04864eb0 | 713 | "A string or list of strings specifying extra switches for checkin. |
0101cc40 RS |
714 | These are passed to the checkin program by \\[vc-checkin]." |
715 | :type '(choice (const :tag "None" nil) | |
716 | (string :tag "Argument String") | |
717 | (repeat :tag "Argument List" | |
718 | :value ("") | |
719 | string)) | |
720 | :group 'vc) | |
721 | ||
722 | (defcustom vc-checkout-switches nil | |
04864eb0 | 723 | "A string or list of strings specifying extra switches for checkout. |
0101cc40 RS |
724 | These are passed to the checkout program by \\[vc-checkout]." |
725 | :type '(choice (const :tag "None" nil) | |
726 | (string :tag "Argument String") | |
727 | (repeat :tag "Argument List" | |
728 | :value ("") | |
729 | string)) | |
730 | :group 'vc) | |
731 | ||
732 | (defcustom vc-register-switches nil | |
04864eb0 | 733 | "A string or list of strings; extra switches for registering a file. |
0101cc40 RS |
734 | These are passed to the checkin program by \\[vc-register]." |
735 | :type '(choice (const :tag "None" nil) | |
736 | (string :tag "Argument String") | |
737 | (repeat :tag "Argument List" | |
738 | :value ("") | |
739 | string)) | |
740 | :group 'vc) | |
741 | ||
acc5b122 | 742 | (defcustom vc-diff-switches nil |
04864eb0 | 743 | "A string or list of strings specifying switches for diff under VC. |
d2ee9b13 GM |
744 | When running diff under a given BACKEND, VC uses the first |
745 | non-nil value of `vc-BACKEND-diff-switches', `vc-diff-switches', | |
746 | and `diff-switches', in that order. Since nil means to check the | |
747 | next variable in the sequence, either of the first two may use | |
748 | the value t to mean no switches at all. `vc-diff-switches' | |
749 | should contain switches that are specific to version control, but | |
750 | not specific to any particular backend." | |
751 | :type '(choice (const :tag "Unspecified" nil) | |
752 | (const :tag "None" t) | |
acc5b122 | 753 | (string :tag "Argument String") |
d2ee9b13 | 754 | (repeat :tag "Argument List" :value ("") string)) |
acc5b122 AS |
755 | :group 'vc |
756 | :version "21.1") | |
757 | ||
48b27575 | 758 | (defcustom vc-log-show-limit 2000 |
6616006b DN |
759 | "Limit the number of items shown by the VC log commands. |
760 | Zero means unlimited. | |
761 | Not all VC backends are able to support this feature." | |
762 | :type 'integer | |
763 | :group 'vc) | |
764 | ||
f1d1d46a | 765 | (defcustom vc-allow-async-revert nil |
e4d26892 | 766 | "Specifies whether the diff during \\[vc-revert] may be asynchronous. |
f1d1d46a AS |
767 | Enabling this option means that you can confirm a revert operation even |
768 | if the local changes in the file have not been found and displayed yet." | |
769 | :type '(choice (const :tag "No" nil) | |
770 | (const :tag "Yes" t)) | |
771 | :group 'vc | |
bf247b6e | 772 | :version "22.1") |
f1d1d46a | 773 | |
7cad930d AS |
774 | ;;;###autoload |
775 | (defcustom vc-checkout-hook nil | |
04864eb0 | 776 | "Normal hook (list of functions) run after checking out a file. |
7cad930d AS |
777 | See `run-hooks'." |
778 | :type 'hook | |
779 | :group 'vc | |
780 | :version "21.1") | |
781 | ||
0e362f54 GM |
782 | ;;;###autoload |
783 | (defcustom vc-checkin-hook nil | |
61de26cb | 784 | "Normal hook (list of functions) run after commit or file checkin. |
1cca5da4 | 785 | See also `log-edit-done-hook'." |
0e362f54 | 786 | :type 'hook |
1cca5da4 | 787 | :options '(log-edit-comment-to-change-log) |
0e362f54 GM |
788 | :group 'vc) |
789 | ||
790 | ;;;###autoload | |
791 | (defcustom vc-before-checkin-hook nil | |
61de26cb | 792 | "Normal hook (list of functions) run before a commit or a file checkin. |
0e362f54 GM |
793 | See `run-hooks'." |
794 | :type 'hook | |
795 | :group 'vc) | |
796 | ||
16f07dd7 | 797 | (defcustom vc-revert-show-diff t |
2afef60a CY |
798 | "If non-nil, `vc-revert' shows a `vc-diff' buffer before querying." |
799 | :type 'boolean | |
800 | :group 'vc | |
801 | :version "24.1") | |
802 | ||
594722a8 ER |
803 | ;; Header-insertion hair |
804 | ||
0101cc40 | 805 | (defcustom vc-static-header-alist |
04864eb0 | 806 | '(("\\.c\\'" . |
594722a8 | 807 | "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) |
9201cc28 | 808 | "Associate static header string templates with file types. |
0e362f54 | 809 | A \%s in the template is replaced with the first string associated with |
67141a37 | 810 | the file's version control type in `vc-BACKEND-header'." |
0101cc40 RS |
811 | :type '(repeat (cons :format "%v" |
812 | (regexp :tag "File Type") | |
813 | (string :tag "Header String"))) | |
814 | :group 'vc) | |
7b4f934d | 815 | |
0101cc40 | 816 | (defcustom vc-comment-alist |
594722a8 | 817 | '((nroff-mode ".\\\"" "")) |
9201cc28 | 818 | "Special comment delimiters for generating VC headers. |
099bd78a SM |
819 | Add an entry in this list if you need to override the normal `comment-start' |
820 | and `comment-end' variables. This will only be necessary if the mode language | |
0101cc40 RS |
821 | is sensitive to blank lines." |
822 | :type '(repeat (list :format "%v" | |
823 | (symbol :tag "Mode") | |
824 | (string :tag "Comment Start") | |
825 | (string :tag "Comment End"))) | |
826 | :group 'vc) | |
594722a8 | 827 | |
0e362f54 | 828 | \f |
83affd96 | 829 | ;; Variables users don't need to see |
594722a8 | 830 | |
f1d1d46a AS |
831 | (defvar vc-disable-async-diff nil |
832 | "VC sets this to t locally to disable some async diff operations. | |
833 | Backends that offer asynchronous diffs should respect this variable | |
834 | in their implementation of vc-BACKEND-diff.") | |
835 | ||
594722a8 ER |
836 | ;; File property caching |
837 | ||
8c0aaf40 | 838 | (defun vc-clear-context () |
11cdd167 | 839 | "Clear all cached file properties." |
8c0aaf40 | 840 | (interactive) |
11cdd167 | 841 | (fillarray vc-file-prop-obarray 0)) |
8c0aaf40 | 842 | |
d7b60083 ER |
843 | (defmacro with-vc-properties (files form settings) |
844 | "Execute FORM, then maybe set per-file properties for FILES. | |
7902c120 DN |
845 | If any of FILES is actually a directory, then do the same for all |
846 | buffers for files in that directory. | |
6f1ecae4 AS |
847 | SETTINGS is an association list of property/value pairs. After |
848 | executing FORM, set those properties from SETTINGS that have not yet | |
849 | been updated to their corresponding values." | |
b4e4e3a8 | 850 | (declare (debug t)) |
7902c120 DN |
851 | `(let ((vc-touched-properties (list t)) |
852 | (flist nil)) | |
d7b60083 | 853 | (dolist (file ,files) |
7902c120 DN |
854 | (if (file-directory-p file) |
855 | (dolist (buffer (buffer-list)) | |
856 | (let ((fname (buffer-file-name buffer))) | |
121b8917 | 857 | (when (and fname (string-prefix-p file fname)) |
7902c120 DN |
858 | (push fname flist)))) |
859 | (push file flist))) | |
860 | ,form | |
861 | (dolist (file flist) | |
a7192ddb SM |
862 | (dolist (setting ,settings) |
863 | (let ((property (car setting))) | |
864 | (unless (memq property vc-touched-properties) | |
865 | (put (intern file vc-file-prop-obarray) | |
866 | property (cdr setting)))))))) | |
099bd78a | 867 | |
d7b60083 ER |
868 | ;;; Code for deducing what fileset and backend to assume |
869 | ||
a9a2a6db | 870 | (defun vc-backend-for-registration (file) |
6ab196f9 DN |
871 | "Return a backend that can be used for registering FILE. |
872 | ||
873 | If no backend declares itself responsible for FILE, then FILE | |
874 | must not be in a version controlled directory, so try to create a | |
875 | repository, prompting for the directory and the VC backend to | |
876 | use." | |
877 | (catch 'found | |
878 | ;; First try: find a responsible backend, it must be a backend | |
879 | ;; under which FILE is not yet registered. | |
880 | (dolist (backend vc-handled-backends) | |
881 | (and (not (vc-call-backend backend 'registered file)) | |
882 | (vc-call-backend backend 'responsible-p file) | |
883 | (throw 'found backend))) | |
884 | ;; no responsible backend | |
885 | (let* ((possible-backends | |
886 | (let (pos) | |
887 | (dolist (crt vc-handled-backends) | |
888 | (when (vc-find-backend-function crt 'create-repo) | |
889 | (push crt pos))) | |
890 | pos)) | |
891 | (bk | |
892 | (intern | |
893 | ;; Read the VC backend from the user, only | |
894 | ;; complete with the backends that have the | |
895 | ;; 'create-repo method. | |
896 | (completing-read | |
897 | (format "%s is not in a version controlled directory.\nUse VC backend: " file) | |
898 | (mapcar 'symbol-name possible-backends) nil t))) | |
899 | (repo-dir | |
900 | (let ((def-dir (file-name-directory file))) | |
901 | ;; read the directory where to create the | |
902 | ;; repository, make sure it's a parent of | |
903 | ;; file. | |
904 | (read-file-name | |
905 | (format "create %s repository in: " bk) | |
906 | default-directory def-dir t nil | |
907 | (lambda (arg) | |
908 | (message "arg %s" arg) | |
909 | (and (file-directory-p arg) | |
121b8917 | 910 | (string-prefix-p (expand-file-name arg) def-dir))))))) |
6ab196f9 DN |
911 | (let ((default-directory repo-dir)) |
912 | (vc-call-backend bk 'create-repo)) | |
913 | (throw 'found bk)))) | |
914 | ||
915 | (defun vc-responsible-backend (file) | |
2765044b | 916 | "Return the name of a backend system that is responsible for FILE. |
2765044b | 917 | |
6ab196f9 | 918 | If FILE is already registered, return the |
b4e813ca | 919 | backend of FILE. If FILE is not registered, then the |
2765044b | 920 | first backend in `vc-handled-backends' that declares itself |
6ab196f9 DN |
921 | responsible for FILE is returned." |
922 | (or (and (not (file-directory-p file)) (vc-backend file)) | |
2765044b DN |
923 | (catch 'found |
924 | ;; First try: find a responsible backend. If this is for registration, | |
925 | ;; it must be a backend under which FILE is not yet registered. | |
926 | (dolist (backend vc-handled-backends) | |
6ab196f9 DN |
927 | (and (vc-call-backend backend 'responsible-p file) |
928 | (throw 'found backend)))) | |
929 | (error "No VC backend is responsible for %s" file))) | |
2765044b DN |
930 | |
931 | (defun vc-expand-dirs (file-or-dir-list) | |
932 | "Expands directories in a file list specification. | |
77c5055c | 933 | Within directories, only files already under version control are noticed." |
2765044b DN |
934 | (let ((flattened '())) |
935 | (dolist (node file-or-dir-list) | |
918e2ac4 DN |
936 | (when (file-directory-p node) |
937 | (vc-file-tree-walk | |
938 | node (lambda (f) (when (vc-backend f) (push f flattened))))) | |
939 | (unless (file-directory-p node) (push node flattened))) | |
2765044b DN |
940 | (nreverse flattened))) |
941 | ||
74d0991f | 942 | (defvar vc-dir-backend) |
a2f043d3 | 943 | (defvar log-view-vc-backend) |
9af57756 | 944 | (defvar log-edit-vc-backend) |
a2f043d3 CY |
945 | (defvar diff-vc-backend) |
946 | ||
947 | (defun vc-deduce-backend () | |
948 | (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend) | |
949 | ((derived-mode-p 'log-view-mode) log-view-vc-backend) | |
9af57756 | 950 | ((derived-mode-p 'log-edit-mode) log-edit-vc-backend) |
a2f043d3 | 951 | ((derived-mode-p 'diff-mode) diff-vc-backend) |
ebff325e SM |
952 | ;; Maybe we could even use comint-mode rather than shell-mode? |
953 | ((derived-mode-p 'dired-mode 'shell-mode 'compilation-mode) | |
a2f043d3 CY |
954 | (vc-responsible-backend default-directory)) |
955 | (vc-mode (vc-backend buffer-file-name)))) | |
114515eb | 956 | |
74d0991f | 957 | (declare-function vc-dir-current-file "vc-dir" ()) |
2913a58d | 958 | (declare-function vc-dir-deduce-fileset "vc-dir" (&optional state-model-only-files)) |
74d0991f | 959 | |
2913a58d DN |
960 | (defun vc-deduce-fileset (&optional observer allow-unregistered |
961 | state-model-only-files) | |
114515eb | 962 | "Deduce a set of files and a backend to which to apply an operation. |
2913a58d | 963 | Return (BACKEND FILESET FILESET-ONLY-FILES STATE CHECKOUT-MODEL). |
9cff91f8 | 964 | |
40e64f0c GM |
965 | If we're in VC-dir mode, FILESET is the list of marked files, |
966 | or the directory if no files are marked. | |
9cff91f8 CY |
967 | Otherwise, if in a buffer visiting a version-controlled file, |
968 | FILESET is a single-file fileset containing that file. | |
969 | Otherwise, if ALLOW-UNREGISTERED is non-nil and the visited file | |
970 | is unregistered, FILESET is a single-file fileset containing it. | |
de7a9afa | 971 | Otherwise, throw an error. |
2913a58d DN |
972 | |
973 | STATE-MODEL-ONLY-FILES if non-nil, means that the caller needs | |
974 | the FILESET-ONLY-FILES STATE and MODEL info. Otherwise, that | |
975 | part may be skipped. | |
976 | BEWARE: this function may change the | |
977 | current buffer." | |
114515eb | 978 | ;; FIXME: OBSERVER is unused. The name is not intuitive and is not |
de7a9afa | 979 | ;; documented. It's set to t when called from diff and print-log. |
114515eb DN |
980 | (let (backend) |
981 | (cond | |
982 | ((derived-mode-p 'vc-dir-mode) | |
2913a58d | 983 | (vc-dir-deduce-fileset state-model-only-files)) |
8de724f3 DN |
984 | ((derived-mode-p 'dired-mode) |
985 | (if observer | |
986 | (vc-dired-deduce-fileset) | |
987 | (error "State changing VC operations not supported in `dired-mode'"))) | |
114515eb | 988 | ((setq backend (vc-backend buffer-file-name)) |
2913a58d DN |
989 | (if state-model-only-files |
990 | (list backend (list buffer-file-name) | |
991 | (list buffer-file-name) | |
992 | (vc-state buffer-file-name) | |
993 | (vc-checkout-model backend buffer-file-name)) | |
994 | (list backend (list buffer-file-name)))) | |
de7a9afa SM |
995 | ((and (buffer-live-p vc-parent-buffer) |
996 | ;; FIXME: Why this test? --Stef | |
997 | (or (buffer-file-name vc-parent-buffer) | |
114515eb | 998 | (with-current-buffer vc-parent-buffer |
77bf3f54 | 999 | (derived-mode-p 'vc-dir-mode)))) |
de7a9afa | 1000 | (progn ;FIXME: Why not `with-current-buffer'? --Stef. |
114515eb | 1001 | (set-buffer vc-parent-buffer) |
2913a58d | 1002 | (vc-deduce-fileset observer allow-unregistered state-model-only-files))) |
39693840 DN |
1003 | ((not buffer-file-name) |
1004 | (error "Buffer %s is not associated with a file" (buffer-name))) | |
114515eb | 1005 | ((and allow-unregistered (not (vc-registered buffer-file-name))) |
2913a58d | 1006 | (if state-model-only-files |
a9a2a6db | 1007 | (list (vc-backend-for-registration (buffer-file-name)) |
2913a58d DN |
1008 | (list buffer-file-name) |
1009 | (list buffer-file-name) | |
1010 | (when state-model-only-files 'unregistered) | |
1011 | nil) | |
a9a2a6db | 1012 | (list (vc-backend-for-registration (buffer-file-name)) |
2913a58d | 1013 | (list buffer-file-name)))) |
931a2762 | 1014 | (t (error "File is not under version control"))))) |
d7b60083 | 1015 | |
8de724f3 DN |
1016 | (defun vc-dired-deduce-fileset () |
1017 | (let ((backend (vc-responsible-backend default-directory))) | |
1018 | (unless backend (error "Directory not under VC")) | |
1019 | (list backend | |
ebff325e | 1020 | (dired-map-over-marks (dired-get-filename nil t) nil)))) |
8de724f3 | 1021 | |
2765044b DN |
1022 | (defun vc-ensure-vc-buffer () |
1023 | "Make sure that the current buffer visits a version-controlled file." | |
ca8dfeda | 1024 | (cond |
2913a58d | 1025 | ((derived-mode-p 'vc-dir-mode) |
e1aec6fb | 1026 | (set-buffer (find-file-noselect (vc-dir-current-file)))) |
ca8dfeda | 1027 | (t |
772111be | 1028 | (while (and vc-parent-buffer |
cc72026b | 1029 | (buffer-live-p vc-parent-buffer) |
772111be MR |
1030 | ;; Avoid infinite looping when vc-parent-buffer and |
1031 | ;; current buffer are the same buffer. | |
1032 | (not (eq vc-parent-buffer (current-buffer)))) | |
2765044b DN |
1033 | (set-buffer vc-parent-buffer)) |
1034 | (if (not buffer-file-name) | |
1035 | (error "Buffer %s is not associated with a file" (buffer-name)) | |
b5446276 DN |
1036 | (unless (vc-backend buffer-file-name) |
1037 | (error "File %s is not under version control" buffer-file-name)))))) | |
2765044b | 1038 | |
e0607aaa SM |
1039 | ;;; Support for the C-x v v command. |
1040 | ;; This is where all the single-file-oriented code from before the fileset | |
1041 | ;; rewrite lives. | |
61de26cb | 1042 | |
2765044b DN |
1043 | (defsubst vc-editable-p (file) |
1044 | "Return non-nil if FILE can be edited." | |
e0607aaa SM |
1045 | (let ((backend (vc-backend file))) |
1046 | (and backend | |
70e2f6c7 | 1047 | (or (eq (vc-checkout-model backend (list file)) 'implicit) |
e0607aaa | 1048 | (memq (vc-state file) '(edited needs-merge conflict)))))) |
2765044b | 1049 | |
484c1b1f ER |
1050 | (defun vc-compatible-state (p q) |
1051 | "Controls which states can be in the same commit." | |
1052 | (or | |
1053 | (eq p q) | |
1054 | (and (member p '(edited added removed)) (member q '(edited added removed))))) | |
1055 | ||
931a2762 SM |
1056 | (defun vc-read-backend (prompt) |
1057 | (intern | |
1058 | (completing-read prompt (mapcar 'symbol-name vc-handled-backends) | |
1059 | nil 'require-match))) | |
1060 | ||
2765044b DN |
1061 | ;; Here's the major entry point. |
1062 | ||
1063 | ;;;###autoload | |
1064 | (defun vc-next-action (verbose) | |
d7b60083 | 1065 | "Do the next logical version control operation on the current fileset. |
99a289d9 CY |
1066 | This requires that all files in the current VC fileset be in the |
1067 | same state. If not, signal an error. | |
1068 | ||
1069 | For merging-based version control systems: | |
1070 | If every file in the VC fileset is not registered for version | |
1071 | control, register the fileset (but don't commit). | |
1072 | If every work file in the VC fileset is added or changed, pop | |
1073 | up a *vc-log* buffer to commit the fileset. | |
1074 | For a centralized version control system, if any work file in | |
1075 | the VC fileset is out of date, offer to update the fileset. | |
1076 | ||
1077 | For old-style locking-based version control systems, like RCS: | |
1078 | If every file is not registered, register the file(s). | |
1079 | If every file is registered and unlocked, check out (lock) | |
1080 | the file(s) for editing. | |
1081 | If every file is locked by you and has changes, pop up a | |
1082 | *vc-log* buffer to check in the changes. If the variable | |
1083 | `vc-keep-workfiles' is non-nil (the default), leave a | |
1084 | read-only copy of each changed file after checking in. | |
1085 | If every file is locked by you and unchanged, unlock them. | |
1086 | If every file is locked by someone else, offer to steal the lock." | |
2765044b | 1087 | (interactive "P") |
2913a58d | 1088 | (let* ((vc-fileset (vc-deduce-fileset nil t 'state-model-only-files)) |
e0607aaa | 1089 | (backend (car vc-fileset)) |
114515eb | 1090 | (files (nth 1 vc-fileset)) |
0d42eb3e | 1091 | ;; (fileset-only-files (nth 2 vc-fileset)) |
ee5657de | 1092 | ;; FIXME: We used to call `vc-recompute-state' here. |
2913a58d | 1093 | (state (nth 3 vc-fileset)) |
734abae3 SM |
1094 | ;; The backend should check that the checkout-model is consistent |
1095 | ;; among all the `files'. | |
e97a42c1 | 1096 | (model (nth 4 vc-fileset))) |
734abae3 | 1097 | |
58ba7b1b CY |
1098 | ;; If a buffer has unsaved changes, a checkout would discard those |
1099 | ;; changes, so treat the buffer as having unlocked changes. | |
1100 | (when (and (not (eq model 'implicit)) (eq state 'up-to-date)) | |
50fdf399 TV |
1101 | (dolist (file files) |
1102 | (let ((buffer (get-file-buffer file))) | |
1103 | (and buffer | |
1104 | (buffer-modified-p buffer) | |
1105 | (setq state 'unlocked-changes))))) | |
1106 | ||
1107 | ;; Do the right thing. | |
a7192ddb | 1108 | (cond |
3c73c30e | 1109 | ((eq state 'missing) |
5a0c3f56 | 1110 | (error "Fileset files are missing, so cannot be operated on")) |
86048828 | 1111 | ((eq state 'ignored) |
5a0c3f56 | 1112 | (error "Fileset files are ignored by the version-control system")) |
114515eb | 1113 | ((or (null state) (eq state 'unregistered)) |
39693840 | 1114 | (vc-register nil vc-fileset)) |
ac3f4c6f | 1115 | ;; Files are up-to-date, or need a merge and user specified a revision |
3702367b | 1116 | ((or (eq state 'up-to-date) (and verbose (eq state 'needs-update))) |
0e362f54 | 1117 | (cond |
d7b60083 | 1118 | (verbose |
931a2762 | 1119 | ;; Go to a different revision. |
e97a42c1 | 1120 | (let* ((revision |
931a2762 | 1121 | ;; FIXME: Provide completion. |
e97a42c1 SM |
1122 | (read-string "Branch, revision, or backend to move to: ")) |
1123 | (revision-downcase (downcase revision))) | |
57b037f9 DN |
1124 | (if (member |
1125 | revision-downcase | |
e97a42c1 SM |
1126 | (mapcar (lambda (arg) (downcase (symbol-name arg))) |
1127 | vc-handled-backends)) | |
57b037f9 DN |
1128 | (let ((vsym (intern-soft revision-downcase))) |
1129 | (dolist (file files) (vc-transfer-file file vsym))) | |
a7192ddb SM |
1130 | (dolist (file files) |
1131 | (vc-checkout file (eq model 'implicit) revision))))) | |
d7b60083 ER |
1132 | ((not (eq model 'implicit)) |
1133 | ;; check the files out | |
a7192ddb | 1134 | (dolist (file files) (vc-checkout file t))) |
d7b60083 | 1135 | (t |
a7192ddb SM |
1136 | ;; do nothing |
1137 | (message "Fileset is up-to-date")))) | |
1138 | ;; Files have local changes | |
484c1b1f | 1139 | ((vc-compatible-state state 'edited) |
d7b60083 | 1140 | (let ((ready-for-commit files)) |
daee954c GM |
1141 | ;; CVS, SVN and bzr don't care about read-only (bug#9781). |
1142 | ;; RCS does, SCCS might (someone should check...). | |
1143 | (when (memq backend '(RCS SCCS)) | |
1144 | ;; If files are edited but read-only, give user a chance to correct. | |
1145 | (dolist (file files) | |
1146 | ;; If committing a mix of removed and edited files, the | |
1147 | ;; fileset has state = 'edited. Rather than checking the | |
1148 | ;; state of each individual file in the fileset, it seems | |
1149 | ;; simplest to just check if the file exists. Bug#9781. | |
1150 | (when (and (file-exists-p file) (not (file-writable-p file))) | |
1151 | ;; Make the file+buffer read-write. | |
1152 | (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) | |
1153 | (error "Aborted")) | |
1154 | ;; Maybe we somehow lost permissions on the directory. | |
1155 | (condition-case nil | |
1156 | (set-file-modes file (logior (file-modes file) 128)) | |
1157 | (error (error "Unable to make file writable"))) | |
1158 | (let ((visited (get-file-buffer file))) | |
1159 | (when visited | |
1160 | (with-current-buffer visited | |
1161 | (read-only-mode -1))))))) | |
d7b60083 ER |
1162 | ;; Allow user to revert files with no changes |
1163 | (save-excursion | |
a7192ddb SM |
1164 | (dolist (file files) |
1165 | (let ((visited (get-file-buffer file))) | |
1166 | ;; For files with locking, if the file does not contain | |
1167 | ;; any changes, just let go of the lock, i.e. revert. | |
e166638d DN |
1168 | (when (and (not (eq model 'implicit)) |
1169 | (vc-workfile-unchanged-p file) | |
1170 | ;; If buffer is modified, that means the user just | |
1171 | ;; said no to saving it; in that case, don't revert, | |
1172 | ;; because the user might intend to save after | |
1173 | ;; finishing the log entry and committing. | |
1174 | (not (and visited (buffer-modified-p)))) | |
1175 | (vc-revert-file file) | |
554c98c5 | 1176 | (setq ready-for-commit (delete file ready-for-commit)))))) |
d7b60083 ER |
1177 | ;; Remaining files need to be committed |
1178 | (if (not ready-for-commit) | |
1179 | (message "No files remain to be committed") | |
1d502d5a | 1180 | (if (not verbose) |
01cf1a52 | 1181 | (vc-checkin ready-for-commit backend) |
931a2762 SM |
1182 | (let ((new-backend (vc-read-backend "New backend: "))) |
1183 | (if new-backend | |
1184 | (dolist (file files) | |
1185 | (vc-transfer-file file new-backend)))))))) | |
d7b60083 ER |
1186 | ;; locked by somebody else (locking VCSes only) |
1187 | ((stringp state) | |
d36122a2 TTN |
1188 | ;; In the old days, we computed the revision once and used it on |
1189 | ;; the single file. Then, for the 2007-2008 fileset rewrite, we | |
1190 | ;; computed the revision once (incorrectly, using a free var) and | |
1191 | ;; used it on all files. To fix the free var bug, we can either | |
1192 | ;; use `(car files)' or do what we do here: distribute the | |
1193 | ;; revision computation among `files'. Although this may be | |
1194 | ;; tedious for those backends where a "revision" is a trans-file | |
1195 | ;; concept, it is nonetheless correct for both those and (more | |
1196 | ;; importantly) for those where "revision" is a per-file concept. | |
1197 | ;; If the intersection of the former group and "locking VCSes" is | |
1198 | ;; non-empty [I vaguely doubt it --ttn], we can reinstate the | |
1199 | ;; pre-computation approach of yore. | |
1200 | (dolist (file files) | |
1201 | (vc-steal-lock | |
1202 | file (if verbose | |
1203 | (read-string (format "%s revision to steal: " file)) | |
1204 | (vc-working-revision file)) | |
1205 | state))) | |
7fbb4797 DN |
1206 | ;; conflict |
1207 | ((eq state 'conflict) | |
a749e19d SM |
1208 | ;; FIXME: Is it really the UI we want to provide? |
1209 | ;; In my experience, the conflicted files should be marked as resolved | |
1210 | ;; one-by-one when saving the file after resolving the conflicts. | |
1211 | ;; I.e. stating explicitly that the conflicts are resolved is done | |
1212 | ;; very rarely. | |
1213 | (vc-mark-resolved backend files)) | |
3702367b ER |
1214 | ;; needs-update |
1215 | ((eq state 'needs-update) | |
d7b60083 | 1216 | (dolist (file files) |
6f41eeb5 | 1217 | (if (yes-or-no-p (format |
ac3f4c6f | 1218 | "%s is not up-to-date. Get latest revision? " |
0e362f54 | 1219 | (file-name-nondirectory file))) |
d7b60083 | 1220 | (vc-checkout file (eq model 'implicit) t) |
e166638d DN |
1221 | (when (and (not (eq model 'implicit)) |
1222 | (yes-or-no-p "Lock this revision? ")) | |
1223 | (vc-checkout file t))))) | |
d7b60083 ER |
1224 | ;; needs-merge |
1225 | ((eq state 'needs-merge) | |
1226 | (dolist (file files) | |
e166638d | 1227 | (when (yes-or-no-p (format |
0e362f54 GM |
1228 | "%s is not up-to-date. Merge in changes now? " |
1229 | (file-name-nondirectory file))) | |
a749e19d SM |
1230 | (vc-maybe-resolve-conflicts |
1231 | file (vc-call-backend backend 'merge-news file))))) | |
46e33aee | 1232 | |
d7b60083 ER |
1233 | ;; unlocked-changes |
1234 | ((eq state 'unlocked-changes) | |
1235 | (dolist (file files) | |
b5446276 DN |
1236 | (when (not (equal buffer-file-name file)) |
1237 | (find-file-other-window file)) | |
0e362f54 | 1238 | (if (save-window-excursion |
f0fbfd43 | 1239 | (vc-diff-internal nil |
86048828 | 1240 | (cons (car vc-fileset) (cons (cadr vc-fileset) (list file))) |
ae67f2d0 | 1241 | (vc-working-revision file) nil) |
0e362f54 | 1242 | (goto-char (point-min)) |
ceec5a0c | 1243 | (let ((inhibit-read-only t)) |
f4f34b33 | 1244 | (insert |
ceec5a0c | 1245 | (format "Changes to %s since last lock:\n\n" file))) |
0e362f54 GM |
1246 | (not (beep)) |
1247 | (yes-or-no-p (concat "File has unlocked changes. " | |
1248 | "Claim lock retaining changes? "))) | |
a749e19d | 1249 | (progn (vc-call-backend backend 'steal-lock file) |
61de26cb | 1250 | (clear-visited-file-modtime) |
0e362f54 GM |
1251 | ;; Must clear any headers here because they wouldn't |
1252 | ;; show that the file is locked now. | |
1253 | (vc-clear-headers file) | |
a36319a4 | 1254 | (write-file buffer-file-name) |
77bf3f54 | 1255 | (vc-mode-line file backend)) |
0e362f54 | 1256 | (if (not (yes-or-no-p |
ac3f4c6f | 1257 | "Revert to checked-in revision, instead? ")) |
0e362f54 | 1258 | (error "Checkout aborted") |
61de26cb | 1259 | (vc-revert-buffer-internal t t) |
3702367b ER |
1260 | (vc-checkout file t))))) |
1261 | ;; Unknown fileset state | |
1262 | (t | |
1263 | (error "Fileset is in an unknown state %s" state))))) | |
e1f297e6 | 1264 | |
61de26cb ER |
1265 | (defun vc-create-repo (backend) |
1266 | "Create an empty repository in the current directory." | |
1267 | (interactive | |
1268 | (list | |
1269 | (intern | |
1270 | (upcase | |
1271 | (completing-read | |
1272 | "Create repository for: " | |
1273 | (mapcar (lambda (b) (list (downcase (symbol-name b)))) vc-handled-backends) | |
1274 | nil t))))) | |
1275 | (vc-call-backend backend 'create-repo)) | |
1276 | ||
10b5dcad DN |
1277 | (declare-function vc-dir-move-to-goal-column "vc-dir" ()) |
1278 | ||
637a8ae9 | 1279 | ;;;###autoload |
39693840 | 1280 | (defun vc-register (&optional set-revision vc-fileset comment) |
30a308aa | 1281 | "Register into a version control system. |
39693840 DN |
1282 | If VC-FILESET is given, register the files in that fileset. |
1283 | Otherwise register the current file. | |
ac3f4c6f | 1284 | With prefix argument SET-REVISION, allow user to specify initial revision |
2765044b | 1285 | level. If COMMENT is present, use that as an initial comment. |
0e362f54 | 1286 | |
2765044b DN |
1287 | The version control system to use is found by cycling through the list |
1288 | `vc-handled-backends'. The first backend in that list which declares | |
1289 | itself responsible for the file (usually because other files in that | |
1290 | directory are already registered under that backend) will be used to | |
1291 | register the file. If no backend declares itself responsible, the | |
1292 | first backend that could register the file is used." | |
1293 | (interactive "P") | |
39693840 DN |
1294 | (let* ((fileset-arg (or vc-fileset (vc-deduce-fileset nil t))) |
1295 | (backend (car fileset-arg)) | |
de7a9afa SM |
1296 | (files (nth 1 fileset-arg))) |
1297 | ;; We used to operate on `only-files', but VC wants to provide the | |
1298 | ;; possibility to register directories rather than files only, since | |
1299 | ;; many VCS allow that as well. | |
1300 | (dolist (fname files) | |
39693840 | 1301 | (let ((bname (get-file-buffer fname))) |
171b0949 OT |
1302 | (unless fname |
1303 | (setq fname buffer-file-name)) | |
1304 | (when (vc-call-backend backend 'registered fname) | |
1305 | (error "This file is already registered")) | |
39693840 DN |
1306 | ;; Watch out for new buffers of size 0: the corresponding file |
1307 | ;; does not exist yet, even though buffer-modified-p is nil. | |
1308 | (when bname | |
1309 | (with-current-buffer bname | |
1310 | (when (and (not (buffer-modified-p)) | |
1311 | (zerop (buffer-size)) | |
1312 | (not (file-exists-p buffer-file-name))) | |
1313 | (set-buffer-modified-p t)) | |
1314 | (vc-buffer-sync))))) | |
77bf3f54 DN |
1315 | (message "Registering %s... " files) |
1316 | (mapc 'vc-file-clearprops files) | |
1317 | (vc-call-backend backend 'register files | |
1318 | (if set-revision | |
1319 | (read-string (format "Initial revision level for %s: " files)) | |
1320 | (vc-call-backend backend 'init-revision)) | |
1321 | comment) | |
1322 | (mapc | |
1323 | (lambda (file) | |
1324 | (vc-file-setprop file 'vc-backend backend) | |
1325 | ;; FIXME: This is wrong: it should set `backup-inhibited' in all | |
1326 | ;; the buffers visiting files affected by this `vc-register', not | |
1327 | ;; in the current-buffer. | |
1328 | ;; (unless vc-make-backup-files | |
1329 | ;; (make-local-variable 'backup-inhibited) | |
1330 | ;; (setq backup-inhibited t)) | |
1331 | ||
1332 | (vc-resynch-buffer file vc-keep-workfiles t)) | |
1333 | files) | |
1334 | (when (derived-mode-p 'vc-dir-mode) | |
1335 | (vc-dir-move-to-goal-column)) | |
1336 | (message "Registering %s... done" files))) | |
d7b60083 ER |
1337 | |
1338 | (defun vc-register-with (backend) | |
1339 | "Register the current file with a specified back end." | |
1340 | (interactive "SBackend: ") | |
b5446276 | 1341 | (when (not (member backend vc-handled-backends)) |
5a0c3f56 | 1342 | (error "Unknown back end")) |
d7b60083 ER |
1343 | (let ((vc-handled-backends (list backend))) |
1344 | (call-interactively 'vc-register))) | |
8989ab56 | 1345 | |
3bc1e188 XF |
1346 | (defun vc-ignore (file &optional directory remove) |
1347 | "Ignore FILE under the VCS of DIRECTORY. | |
1348 | ||
1349 | Normally, FILE is a wildcard specification that matches the files | |
1350 | to be ignored. When REMOVE is non-nil, remove FILE from the list | |
1351 | of ignored files. | |
1352 | ||
1353 | DIRECTORY defaults to `default-directory' and is used to | |
1354 | determine the responsible VC backend. | |
1355 | ||
1356 | When called interactively, prompt for a FILE to ignore, unless a | |
1357 | prefix argument is given, in which case prompt for a file FILE to | |
1358 | remove from the list of ignored files." | |
ab419665 | 1359 | (interactive |
3bc1e188 XF |
1360 | (list |
1361 | (if (not current-prefix-arg) | |
1362 | (read-file-name "File to ignore: ") | |
1363 | (completing-read | |
1364 | "File to remove: " | |
1365 | (vc-call-backend | |
1366 | (or (vc-responsible-backend default-directory) | |
1367 | (error "Unknown backend")) | |
1368 | 'ignore-completion-table default-directory))) | |
1369 | nil current-prefix-arg)) | |
63191d9f | 1370 | (let* ((directory (or directory default-directory)) |
3bc1e188 XF |
1371 | (backend (or (vc-responsible-backend default-directory) |
1372 | (error "Unknown backend")))) | |
63191d9f XF |
1373 | (vc-call-backend backend 'ignore file directory remove))) |
1374 | ||
1375 | (defun vc-default-ignore (backend file &optional directory remove) | |
1376 | "Ignore FILE under the VCS of DIRECTORY (default is `default-directory'). | |
1377 | FILE is a file wildcard, relative to the root directory of DIRECTORY. | |
1378 | When called from Lisp code, if DIRECTORY is non-nil, the | |
1379 | repository to use will be deduced by DIRECTORY; if REMOVE is | |
1380 | non-nil, remove FILE from ignored files. | |
1381 | Argument BACKEND is the backend you are using." | |
1382 | (let ((ignore | |
1383 | (vc-call-backend backend 'find-ignore-file (or directory default-directory))) | |
1384 | (pattern (file-relative-name | |
1385 | (expand-file-name file) (file-name-directory file)))) | |
1386 | (if remove | |
1387 | (vc--remove-regexp pattern ignore) | |
1388 | (vc--add-line pattern ignore)))) | |
1389 | ||
1390 | (defun vc-default-ignore-completion-table (backend file) | |
1391 | "Return the list of ignored files under BACKEND." | |
1392 | (vc--read-lines | |
1393 | (vc-call-backend backend 'find-ignore-file file))) | |
ab419665 XF |
1394 | |
1395 | (defun vc--read-lines (file) | |
1396 | "Return a list of lines of FILE." | |
1397 | (with-temp-buffer | |
1398 | (insert-file-contents file) | |
1399 | (split-string (buffer-string) "\n" t))) | |
1400 | ||
1401 | ;; Subroutine for `vc-git-ignore' and `vc-hg-ignore'. | |
1402 | (defun vc--add-line (string file) | |
1403 | "Add STRING as a line to FILE." | |
1404 | (with-temp-buffer | |
1405 | (insert-file-contents file) | |
1406 | (unless (re-search-forward (concat "^" (regexp-quote string) "$") nil t) | |
1407 | (goto-char (point-max)) | |
1408 | (insert (concat "\n" string)) | |
1409 | (write-region (point-min) (point-max) file)))) | |
1410 | ||
1411 | (defun vc--remove-regexp (regexp file) | |
1412 | "Remove all matching for REGEXP in FILE." | |
1413 | (with-temp-buffer | |
1414 | (insert-file-contents file) | |
1415 | (while (re-search-forward regexp nil t) | |
1416 | (replace-match "")) | |
1417 | (write-region (point-min) (point-max) file))) | |
7aa7fff0 | 1418 | |
c6d4f628 | 1419 | (defun vc-checkout (file &optional writable rev) |
099bd78a SM |
1420 | "Retrieve a copy of the revision REV of FILE. |
1421 | If WRITABLE is non-nil, make sure the retrieved file is writable. | |
133a84aa AS |
1422 | REV defaults to the latest revision. |
1423 | ||
1424 | After check-out, runs the normal hook `vc-checkout-hook'." | |
ffda0460 AS |
1425 | (and writable |
1426 | (not rev) | |
10b48cc4 | 1427 | (vc-call make-version-backups-p file) |
ffda0460 | 1428 | (vc-up-to-date-p file) |
10b48cc4 | 1429 | (vc-make-version-backup file)) |
e0607aaa SM |
1430 | (let ((backend (vc-backend file))) |
1431 | (with-vc-properties (list file) | |
1432 | (condition-case err | |
af36f8ed | 1433 | (vc-call-backend backend 'checkout file writable rev) |
e0607aaa SM |
1434 | (file-error |
1435 | ;; Maybe the backend is not installed ;-( | |
1436 | (when writable | |
1437 | (let ((buf (get-file-buffer file))) | |
35e62fc9 | 1438 | (when buf (with-current-buffer buf (read-only-mode -1))))) |
e0607aaa | 1439 | (signal (car err) (cdr err)))) |
70e2f6c7 | 1440 | `((vc-state . ,(if (or (eq (vc-checkout-model backend (list file)) 'implicit) |
e0607aaa | 1441 | (not writable)) |
a749e19d | 1442 | (if (vc-call-backend backend 'latest-on-branch-p file) |
e0607aaa | 1443 | 'up-to-date |
3702367b | 1444 | 'needs-update) |
e0607aaa SM |
1445 | 'edited)) |
1446 | (vc-checkout-time . ,(nth 5 (file-attributes file)))))) | |
7cad930d AS |
1447 | (vc-resynch-buffer file t t) |
1448 | (run-hooks 'vc-checkout-hook)) | |
594722a8 | 1449 | |
a749e19d | 1450 | (defun vc-mark-resolved (backend files) |
6002d9b9 CY |
1451 | (prog1 (with-vc-properties |
1452 | files | |
1453 | (vc-call-backend backend 'mark-resolved files) | |
1454 | ;; FIXME: Is this TRTD? Might not be. | |
1455 | `((vc-state . edited))) | |
1456 | (message | |
1457 | (substitute-command-keys | |
1458 | "Conflicts have been resolved in %s. \ | |
f41d99b0 | 1459 | Type \\[vc-next-action] to check in changes.") |
6002d9b9 CY |
1460 | (if (> (length files) 1) |
1461 | (format "%d files" (length files)) | |
1462 | "this file")))) | |
7fbb4797 | 1463 | |
0e362f54 | 1464 | (defun vc-steal-lock (file rev owner) |
099bd78a | 1465 | "Steal the lock on FILE." |
29fc1ce9 | 1466 | (let (file-description) |
29fc1ce9 RS |
1467 | (if rev |
1468 | (setq file-description (format "%s:%s" file rev)) | |
1469 | (setq file-description file)) | |
b5446276 DN |
1470 | (when (not (yes-or-no-p (format "Steal the lock on %s from %s? " |
1471 | file-description owner))) | |
1472 | (error "Steal canceled")) | |
869131a5 AS |
1473 | (message "Stealing lock on %s..." file) |
1474 | (with-vc-properties | |
d7b60083 | 1475 | (list file) |
869131a5 AS |
1476 | (vc-call steal-lock file rev) |
1477 | `((vc-state . edited))) | |
1478 | (vc-resynch-buffer file t t) | |
1479 | (message "Stealing lock on %s...done" file) | |
1480 | ;; Write mail after actually stealing, because if the stealing | |
1481 | ;; goes wrong, we don't want to send any mail. | |
1482 | (compose-mail owner (format "Stolen lock on %s" file-description)) | |
29fc1ce9 | 1483 | (setq default-directory (expand-file-name "~/")) |
29fc1ce9 RS |
1484 | (goto-char (point-max)) |
1485 | (insert | |
1486 | (format "I stole the lock on %s, " file-description) | |
1487 | (current-time-string) | |
1488 | ".\n") | |
1489 | (message "Please explain why you stole the lock. Type C-c C-c when done."))) | |
594722a8 | 1490 | |
01cf1a52 | 1491 | (defun vc-checkin (files backend &optional rev comment initial-contents) |
d7b60083 | 1492 | "Check in FILES. |
ac3f4c6f | 1493 | The optional argument REV may be a string specifying the new revision |
e97a42c1 | 1494 | level (strongly deprecated). COMMENT is a comment |
0ab66291 AS |
1495 | string; if omitted, a buffer is popped up to accept a comment. If |
1496 | INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial contents | |
1497 | of the log entry buffer. | |
0e362f54 GM |
1498 | |
1499 | If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided | |
1500 | that the version control system supports this mode of operation. | |
861f3c29 | 1501 | |
17f039f3 ER |
1502 | Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'." |
1503 | (when vc-before-checkin-hook | |
1504 | (run-hooks 'vc-before-checkin-hook)) | |
0d42eb3e SM |
1505 | (vc-start-logentry |
1506 | files comment initial-contents | |
1507 | "Enter a change comment." | |
1508 | "*vc-log*" | |
1509 | (lambda () | |
1510 | (vc-call-backend backend 'log-edit-mode)) | |
1511 | (lambda (files comment) | |
1512 | (message "Checking in %s..." (vc-delistify files)) | |
1513 | ;; "This log message intentionally left almost blank". | |
1514 | ;; RCS 5.7 gripes about white-space-only comments too. | |
1515 | (or (and comment (string-match "[^\t\n ]" comment)) | |
1516 | (setq comment "*** empty log message ***")) | |
1517 | (with-vc-properties | |
1518 | files | |
1519 | ;; We used to change buffers to get local value of | |
1520 | ;; vc-checkin-switches, but 'the' local buffer is | |
1521 | ;; not a well-defined concept for filesets. | |
1522 | (progn | |
1523 | (vc-call-backend backend 'checkin files rev comment) | |
1524 | (mapc 'vc-delete-automatic-version-backups files)) | |
1525 | `((vc-state . up-to-date) | |
1526 | (vc-checkout-time . ,(nth 5 (file-attributes file))) | |
1527 | (vc-working-revision . nil))) | |
1528 | (message "Checking in %s...done" (vc-delistify files))) | |
9af57756 CY |
1529 | 'vc-checkin-hook |
1530 | backend)) | |
594722a8 | 1531 | |
2765044b DN |
1532 | ;;; Additional entry points for examining version histories |
1533 | ||
a7192ddb SM |
1534 | ;; (defun vc-default-diff-tree (backend dir rev1 rev2) |
1535 | ;; "List differences for all registered files at and below DIR. | |
1536 | ;; The meaning of REV1 and REV2 is the same as for `vc-revision-diff'." | |
1537 | ;; ;; This implementation does an explicit tree walk, and calls | |
1538 | ;; ;; vc-BACKEND-diff directly for each file. An optimization | |
1539 | ;; ;; would be to use `vc-diff-internal', so that diffs can be local, | |
1540 | ;; ;; and to call it only for files that are actually changed. | |
1541 | ;; ;; However, this is expensive for some backends, and so it is left | |
1542 | ;; ;; to backend-specific implementations. | |
1543 | ;; (setq default-directory dir) | |
1544 | ;; (vc-file-tree-walk | |
1545 | ;; default-directory | |
1546 | ;; (lambda (f) | |
9c750eba SM |
1547 | ;; (vc-run-delayed |
1548 | ;; (let ((coding-system-for-read (vc-coding-system-for-diff f))) | |
1549 | ;; (message "Looking at %s" f) | |
1550 | ;; (vc-call-backend (vc-backend f) | |
1551 | ;; 'diff (list f) rev1 rev2)))))) | |
2765044b | 1552 | |
f253ef6a RS |
1553 | (defvar vc-coding-system-inherit-eol t |
1554 | "When non-nil, inherit the EOL format for reading Diff output from the file. | |
1555 | ||
1556 | Used in `vc-coding-system-for-diff' to determine the EOL format to use | |
1557 | for reading Diff output for a file. If non-nil, the EOL format is | |
1558 | inherited from the file itself. | |
1559 | Set this variable to nil if your Diff tool might use a different | |
1560 | EOL. Then Emacs will auto-detect the EOL format in Diff output, which | |
1561 | gives better results.") ;; Cf. bug#4451. | |
1562 | ||
2765044b DN |
1563 | (defun vc-coding-system-for-diff (file) |
1564 | "Return the coding system for reading diff output for FILE." | |
1565 | (or coding-system-for-read | |
1566 | ;; if we already have this file open, | |
1567 | ;; use the buffer's coding system | |
1568 | (let ((buf (find-buffer-visiting file))) | |
b5446276 | 1569 | (when buf (with-current-buffer buf |
f253ef6a RS |
1570 | (if vc-coding-system-inherit-eol |
1571 | buffer-file-coding-system | |
1572 | ;; Don't inherit the EOL part of the coding-system, | |
1573 | ;; because some Diff tools may choose to use | |
1574 | ;; a different one. bug#4451. | |
1575 | (coding-system-base buffer-file-coding-system))))) | |
2765044b DN |
1576 | ;; otherwise, try to find one based on the file name |
1577 | (car (find-operation-coding-system 'insert-file-contents file)) | |
1578 | ;; and a final fallback | |
1579 | 'undecided)) | |
1580 | ||
1581 | (defun vc-switches (backend op) | |
559ca68a GM |
1582 | "Return a list of vc-BACKEND switches for operation OP. |
1583 | BACKEND is a symbol such as `CVS', which will be downcased. | |
1584 | OP is a symbol such as `diff'. | |
1585 | ||
9201cc28 | 1586 | In decreasing order of preference, return the value of: |
559ca68a GM |
1587 | vc-BACKEND-OP-switches (e.g. `vc-cvs-diff-switches'); |
1588 | vc-OP-switches (e.g. `vc-diff-switches'); or, in the case of | |
10d5dd8c | 1589 | diff only, `diff-switches'. |
559ca68a | 1590 | |
9201cc28 | 1591 | If the chosen value is not a string or a list, return nil. |
559ca68a GM |
1592 | This is so that you may set, e.g. `vc-svn-diff-switches' to t in order |
1593 | to override the value of `vc-diff-switches' and `diff-switches'." | |
2765044b | 1594 | (let ((switches |
b5446276 DN |
1595 | (or (when backend |
1596 | (let ((sym (vc-make-backend-sym | |
1597 | backend (intern (concat (symbol-name op) | |
1598 | "-switches"))))) | |
1599 | (when (boundp sym) (symbol-value sym)))) | |
2765044b | 1600 | (let ((sym (intern (format "vc-%s-switches" (symbol-name op))))) |
b5446276 | 1601 | (when (boundp sym) (symbol-value sym))) |
2765044b DN |
1602 | (cond |
1603 | ((eq op 'diff) diff-switches))))) | |
1604 | (if (stringp switches) (list switches) | |
1605 | ;; If not a list, return nil. | |
1606 | ;; This is so we can set vc-diff-switches to t to override | |
1607 | ;; any switches in diff-switches. | |
b5446276 | 1608 | (when (listp switches) switches)))) |
594722a8 | 1609 | |
2765044b | 1610 | ;; Old def for compatibility with Emacs-21.[123]. |
59f7af81 CY |
1611 | (defmacro vc-diff-switches-list (backend) |
1612 | (declare (obsolete vc-switches "22.1")) | |
1613 | `(vc-switches ',backend 'diff)) | |
2765044b | 1614 | |
1d5b2149 | 1615 | (defun vc-diff-finish (buffer messages) |
17f3909f | 1616 | ;; The empty sync output case has already been handled, so the only |
fddde1f0 | 1617 | ;; possibility of an empty output is for an async process. |
1d5b2149 TTN |
1618 | (when (buffer-live-p buffer) |
1619 | (let ((window (get-buffer-window buffer t)) | |
07875ee7 | 1620 | (emptyp (zerop (buffer-size buffer)))) |
1d5b2149 | 1621 | (with-current-buffer buffer |
07875ee7 CY |
1622 | (and messages emptyp |
1623 | (let ((inhibit-read-only t)) | |
1624 | (insert (cdr messages) ".\n") | |
1625 | (message "%s" (cdr messages)))) | |
1626 | (diff-setup-whitespace) | |
1627 | (goto-char (point-min)) | |
1628 | (when window | |
1629 | (shrink-window-if-larger-than-buffer window))) | |
1d5b2149 | 1630 | (when (and messages (not emptyp)) |
07875ee7 | 1631 | (message "%sdone" (car messages)))))) |
d7b60083 | 1632 | |
a7192ddb SM |
1633 | (defvar vc-diff-added-files nil |
1634 | "If non-nil, diff added files by comparing them to /dev/null.") | |
1635 | ||
2afef60a | 1636 | (defun vc-diff-internal (async vc-fileset rev1 rev2 &optional verbose buffer) |
d7b60083 | 1637 | "Report diffs between two revisions of a fileset. |
2afef60a CY |
1638 | Output goes to the buffer BUFFER, which defaults to *vc-diff*. |
1639 | BUFFER, if non-nil, should be a buffer or a buffer name. | |
1640 | Return t if the buffer had changes, nil otherwise." | |
1641 | (unless buffer | |
1642 | (setq buffer "*vc-diff*")) | |
6986e5c9 | 1643 | (let* ((files (cadr vc-fileset)) |
ae67f2d0 | 1644 | (messages (cons (format "Finding changes in %s..." |
1d5b2149 TTN |
1645 | (vc-delistify files)) |
1646 | (format "No changes between %s and %s" | |
1647 | (or rev1 "working revision") | |
1648 | (or rev2 "workfile")))) | |
d7b60083 ER |
1649 | ;; Set coding system based on the first file. It's a kluge, |
1650 | ;; but the only way to set it for each file included would | |
1651 | ;; be to call the back end separately for each file. | |
a7192ddb | 1652 | (coding-system-for-read |
d7b60083 | 1653 | (if files (vc-coding-system-for-diff (car files)) 'undecided))) |
0e2c793f EZ |
1654 | ;; On MS-Windows and MS-DOS, Diff is likely to produce DOS-style |
1655 | ;; EOLs, which will look ugly if (car files) happens to have Unix | |
1656 | ;; EOLs. | |
1657 | (if (memq system-type '(windows-nt ms-dos)) | |
1658 | (setq coding-system-for-read | |
1659 | (coding-system-change-eol-conversion coding-system-for-read | |
1660 | 'dos))) | |
2afef60a | 1661 | (vc-setup-buffer buffer) |
1d5b2149 | 1662 | (message "%s" (car messages)) |
a7192ddb SM |
1663 | ;; Many backends don't handle well the case of a file that has been |
1664 | ;; added but not yet committed to the repo (notably CVS and Subversion). | |
1665 | ;; Do that work here so the backends don't have to futz with it. --ESR | |
1666 | ;; | |
1667 | ;; Actually most backends (including CVS) have options to control the | |
1668 | ;; behavior since which one is better depends on the user and on the | |
1669 | ;; situation). Worse yet: this code does not handle the case where | |
1670 | ;; `file' is a directory which contains added files. | |
1671 | ;; I made it conditional on vc-diff-added-files but it should probably | |
1672 | ;; just be removed (or copied/moved to specific backends). --Stef. | |
1673 | (when vc-diff-added-files | |
4968879c MA |
1674 | (let ((filtered '()) |
1675 | process-file-side-effects) | |
a7192ddb SM |
1676 | (dolist (file files) |
1677 | (if (or (file-directory-p file) | |
1678 | (not (string= (vc-working-revision file) "0"))) | |
1679 | (push file filtered) | |
1680 | ;; This file is added but not yet committed; | |
004f9b3f | 1681 | ;; there is no repository version to diff against. |
a7192ddb SM |
1682 | (if (or rev1 rev2) |
1683 | (error "No revisions of %s exist" file) | |
1684 | ;; We regard this as "changed". | |
1685 | ;; Diff it against /dev/null. | |
2afef60a | 1686 | (apply 'vc-do-command buffer |
a7192ddb SM |
1687 | 1 "diff" file |
1688 | (append (vc-switches nil 'diff) '("/dev/null")))))) | |
1689 | (setq files (nreverse filtered)))) | |
1690 | (let ((vc-disable-async-diff (not async))) | |
2afef60a CY |
1691 | (vc-call-backend (car vc-fileset) 'diff files rev1 rev2 buffer)) |
1692 | (set-buffer buffer) | |
4c5d08a8 CY |
1693 | (diff-mode) |
1694 | (set (make-local-variable 'diff-vc-backend) (car vc-fileset)) | |
1695 | (set (make-local-variable 'revert-buffer-function) | |
9c750eba SM |
1696 | (lambda (_ignore-auto _noconfirm) |
1697 | (vc-diff-internal async vc-fileset rev1 rev2 verbose))) | |
4c5d08a8 CY |
1698 | ;; Make the *vc-diff* buffer read only, the diff-mode key |
1699 | ;; bindings are nicer for read only buffers. pcl-cvs does the | |
1700 | ;; same thing. | |
1701 | (setq buffer-read-only t) | |
17f3909f SM |
1702 | (if (and (zerop (buffer-size)) |
1703 | (not (get-buffer-process (current-buffer)))) | |
1704 | ;; Treat this case specially so as not to pop the buffer. | |
1705 | (progn | |
1d5b2149 | 1706 | (message "%s" (cdr messages)) |
17f3909f | 1707 | nil) |
4befebc1 SM |
1708 | ;; Display the buffer, but at the end because it can change point. |
1709 | (pop-to-buffer (current-buffer)) | |
455e4fa1 BR |
1710 | ;; The diff process may finish early, so call `vc-diff-finish' |
1711 | ;; after `pop-to-buffer'; the former assumes the diff buffer is | |
1712 | ;; shown in some window. | |
9c750eba SM |
1713 | (let ((buf (current-buffer))) |
1714 | (vc-run-delayed (vc-diff-finish buf (when verbose messages)))) | |
17f3909f SM |
1715 | ;; In the async case, we return t even if there are no differences |
1716 | ;; because we don't know that yet. | |
1717 | t))) | |
594722a8 | 1718 | |
17c15b81 SM |
1719 | (defun vc-read-revision (prompt &optional files backend default initial-input) |
1720 | (cond | |
1721 | ((null files) | |
1722 | (let ((vc-fileset (vc-deduce-fileset t))) ;FIXME: why t? --Stef | |
1723 | (setq files (cadr vc-fileset)) | |
1724 | (setq backend (car vc-fileset)))) | |
1725 | ((null backend) (setq backend (vc-backend (car files))))) | |
1726 | (let ((completion-table | |
1727 | (vc-call-backend backend 'revision-completion-table files))) | |
1728 | (if completion-table | |
1729 | (completing-read prompt completion-table | |
1730 | nil nil initial-input nil default) | |
1731 | (read-string prompt initial-input nil default)))) | |
1732 | ||
1c6c854e CS |
1733 | (defun vc-diff-build-argument-list-internal () |
1734 | "Build argument list for calling internal diff functions." | |
1735 | (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: why t? --Stef | |
1736 | (files (cadr vc-fileset)) | |
1737 | (backend (car vc-fileset)) | |
1738 | (first (car files)) | |
1739 | (rev1-default nil) | |
1740 | (rev2-default nil)) | |
1741 | (cond | |
1742 | ;; someday we may be able to do revision completion on non-singleton | |
1743 | ;; filesets, but not yet. | |
1744 | ((/= (length files) 1) | |
1745 | nil) | |
1746 | ;; if it's a directory, don't supply any revision default | |
1747 | ((file-directory-p first) | |
1748 | nil) | |
1749 | ;; if the file is not up-to-date, use working revision as older revision | |
1750 | ((not (vc-up-to-date-p first)) | |
1751 | (setq rev1-default (vc-working-revision first))) | |
db138698 | 1752 | ;; if the file is not locked, use last revision and current source as defaults |
1c6c854e | 1753 | (t |
94c9ece1 SM |
1754 | (setq rev1-default (ignore-errors ;If `previous-revision' doesn't work. |
1755 | (vc-call-backend backend 'previous-revision first | |
1756 | (vc-working-revision first)))) | |
db138698 | 1757 | (when (string= rev1-default "") (setq rev1-default nil)))) |
1c6c854e CS |
1758 | ;; construct argument list |
1759 | (let* ((rev1-prompt (if rev1-default | |
1760 | (concat "Older revision (default " | |
1761 | rev1-default "): ") | |
1762 | "Older revision: ")) | |
1763 | (rev2-prompt (concat "Newer revision (default " | |
1764 | (or rev2-default "current source") "): ")) | |
1765 | (rev1 (vc-read-revision rev1-prompt files backend rev1-default)) | |
1766 | (rev2 (vc-read-revision rev2-prompt files backend rev2-default))) | |
1767 | (when (string= rev1 "") (setq rev1 nil)) | |
1768 | (when (string= rev2 "") (setq rev2 nil)) | |
1769 | (list files rev1 rev2)))) | |
1770 | ||
637a8ae9 | 1771 | ;;;###autoload |
0d42eb3e | 1772 | (defun vc-version-diff (_files rev1 rev2) |
d7b60083 | 1773 | "Report diffs between revisions of the fileset in the repository history." |
1c6c854e | 1774 | (interactive (vc-diff-build-argument-list-internal)) |
86048828 | 1775 | ;; All that was just so we could do argument completion! |
ae67f2d0 | 1776 | (when (and (not rev1) rev2) |
5a0c3f56 | 1777 | (error "Not a valid revision range")) |
86048828 ER |
1778 | ;; Yes, it's painful to call (vc-deduce-fileset) again. Alas, the |
1779 | ;; placement rules for (interactive) don't actually leave us a choice. | |
ed6b0195 | 1780 | (vc-diff-internal t (vc-deduce-fileset t) rev1 rev2 |
32226619 | 1781 | (called-interactively-p 'interactive))) |
d7b60083 ER |
1782 | |
1783 | ;;;###autoload | |
9af57756 | 1784 | (defun vc-diff (&optional historic not-urgent) |
ac3f4c6f | 1785 | "Display diffs between file revisions. |
727c4443 | 1786 | Normally this compares the currently selected fileset with their |
a7192ddb | 1787 | working revisions. With a prefix argument HISTORIC, it reads two revision |
727c4443 ER |
1788 | designators specifying which revisions to compare. |
1789 | ||
a7192ddb SM |
1790 | The optional argument NOT-URGENT non-nil means it is ok to say no to |
1791 | saving the buffer." | |
1792 | (interactive (list current-prefix-arg t)) | |
1793 | (if historic | |
1794 | (call-interactively 'vc-version-diff) | |
ae67f2d0 | 1795 | (when buffer-file-name (vc-buffer-sync not-urgent)) |
ed6b0195 | 1796 | (vc-diff-internal t (vc-deduce-fileset t) nil nil |
32226619 | 1797 | (called-interactively-p 'interactive)))) |
2c87edc1 | 1798 | |
b9800ec4 GM |
1799 | (declare-function ediff-load-version-control "ediff" (&optional silent)) |
1800 | (declare-function ediff-vc-internal "ediff-vers" | |
1801 | (rev1 rev2 &optional startup-hooks)) | |
80f499c7 | 1802 | |
1c6c854e CS |
1803 | ;;;###autoload |
1804 | (defun vc-version-ediff (files rev1 rev2) | |
1805 | "Show differences between revisions of the fileset in the | |
1806 | repository history using ediff." | |
1807 | (interactive (vc-diff-build-argument-list-internal)) | |
1808 | ;; All that was just so we could do argument completion! | |
1809 | (when (and (not rev1) rev2) | |
1810 | (error "Not a valid revision range")) | |
1811 | ||
1812 | (message "%s" (format "Finding changes in %s..." (vc-delistify files))) | |
1813 | ||
1814 | ;; Functions ediff-(vc|rcs)-internal use "" instead of nil. | |
1815 | (when (null rev1) (setq rev1 "")) | |
1816 | (when (null rev2) (setq rev2 "")) | |
1817 | ||
1818 | (cond | |
1819 | ;; FIXME We only support running ediff on one file for now. | |
1820 | ;; We could spin off an ediff session per file in the file set. | |
1821 | ((= (length files) 1) | |
b9800ec4 GM |
1822 | (require 'ediff) |
1823 | (ediff-load-version-control) ; loads ediff-vers | |
024ff170 SM |
1824 | (find-file (car files)) ;FIXME: find-file from Elisp is bad. |
1825 | (ediff-vc-internal rev1 rev2 nil)) | |
1c6c854e CS |
1826 | (t |
1827 | (error "More than one file is not supported")))) | |
1828 | ||
1829 | ;;;###autoload | |
1830 | (defun vc-ediff (historic &optional not-urgent) | |
1831 | "Display diffs between file revisions using ediff. | |
1832 | Normally this compares the currently selected fileset with their | |
1833 | working revisions. With a prefix argument HISTORIC, it reads two revision | |
1834 | designators specifying which revisions to compare. | |
1835 | ||
1836 | The optional argument NOT-URGENT non-nil means it is ok to say no to | |
1837 | saving the buffer." | |
1838 | (interactive (list current-prefix-arg t)) | |
1839 | (if historic | |
1840 | (call-interactively 'vc-version-ediff) | |
1841 | (when buffer-file-name (vc-buffer-sync not-urgent)) | |
1842 | (vc-version-ediff (cadr (vc-deduce-fileset t)) nil nil))) | |
1843 | ||
32ba3abc DN |
1844 | ;;;###autoload |
1845 | (defun vc-root-diff (historic &optional not-urgent) | |
431af6a4 DN |
1846 | "Display diffs between VC-controlled whole tree revisions. |
1847 | Normally, this compares the tree corresponding to the current | |
1848 | fileset with the working revision. | |
1849 | With a prefix argument HISTORIC, prompt for two revision | |
32ba3abc DN |
1850 | designators specifying which revisions to compare. |
1851 | ||
1852 | The optional argument NOT-URGENT non-nil means it is ok to say no to | |
1853 | saving the buffer." | |
1854 | (interactive (list current-prefix-arg t)) | |
1855 | (if historic | |
1856 | ;; FIXME: this does not work right, `vc-version-diff' ends up | |
1857 | ;; calling `vc-deduce-fileset' to find the files to diff, and | |
1858 | ;; that's not what we want here, we want the diff for the VC root dir. | |
1859 | (call-interactively 'vc-version-diff) | |
1860 | (when buffer-file-name (vc-buffer-sync not-urgent)) | |
a2f043d3 | 1861 | (let ((backend (vc-deduce-backend)) |
1eee6341 | 1862 | (default-directory default-directory) |
32ba3abc | 1863 | rootdir working-revision) |
1eee6341 CY |
1864 | (if backend |
1865 | (setq rootdir (vc-call-backend backend 'root default-directory)) | |
1866 | (setq rootdir (read-directory-name "Directory for VC root-diff: ")) | |
1867 | (setq backend (vc-responsible-backend rootdir)) | |
1868 | (if backend | |
1869 | (setq default-directory rootdir) | |
1870 | (error "Directory is not version controlled"))) | |
32ba3abc | 1871 | (setq working-revision (vc-working-revision rootdir)) |
7ec69e2b DN |
1872 | ;; VC diff for the root directory produces output that is |
1873 | ;; relative to it. Bind default-directory to the root directory | |
1874 | ;; here, this way the *vc-diff* buffer is setup correctly, so | |
1875 | ;; relative file names work. | |
1876 | (let ((default-directory rootdir)) | |
1877 | (vc-diff-internal | |
1878 | t (list backend (list rootdir) working-revision) nil nil | |
1879 | (called-interactively-p 'interactive)))))) | |
32ba3abc | 1880 | |
e8a77f24 DC |
1881 | ;;;###autoload |
1882 | (defun vc-root-dir () | |
1883 | "Return the root directory for the current VC tree. | |
1884 | Return nil if the root directory cannot be identified." | |
1885 | (let ((backend (vc-deduce-backend))) | |
1886 | (if backend | |
1887 | (condition-case err | |
1888 | (vc-call-backend backend 'root default-directory) | |
1889 | (vc-not-supported | |
1890 | (unless (eq (cadr err) 'root) | |
1891 | (signal (car err) (cdr err))) | |
1892 | nil))))) | |
1893 | ||
f1818994 | 1894 | ;;;###autoload |
ac3f4c6f ER |
1895 | (defun vc-revision-other-window (rev) |
1896 | "Visit revision REV of the current file in another window. | |
1897 | If the current file is named `F', the revision is named `F.~REV~'. | |
6f1ecae4 | 1898 | If `F.~REV~' already exists, use it instead of checking it out again." |
4d83a657 SM |
1899 | (interactive |
1900 | (save-current-buffer | |
1901 | (vc-ensure-vc-buffer) | |
17c15b81 SM |
1902 | (list |
1903 | (vc-read-revision "Revision to visit (default is working revision): " | |
1904 | (list buffer-file-name))))) | |
b6909007 | 1905 | (vc-ensure-vc-buffer) |
5e011cb2 | 1906 | (let* ((file buffer-file-name) |
ac3f4c6f ER |
1907 | (revision (if (string-equal rev "") |
1908 | (vc-working-revision file) | |
ac0aae44 | 1909 | rev))) |
ac3f4c6f | 1910 | (switch-to-buffer-other-window (vc-find-revision file revision)))) |
ac0aae44 | 1911 | |
04ec0963 DN |
1912 | (defun vc-find-revision (file revision &optional backend) |
1913 | "Read REVISION of FILE into a buffer and return the buffer. | |
1914 | Use BACKEND as the VC backend if specified." | |
ac3f4c6f | 1915 | (let ((automatic-backup (vc-version-backup-file-name file revision)) |
fd8160f7 | 1916 | (filebuf (or (get-file-buffer file) (current-buffer))) |
ac3f4c6f | 1917 | (filename (vc-version-backup-file-name file revision 'manual))) |
fd8160f7 | 1918 | (unless (file-exists-p filename) |
10b48cc4 | 1919 | (if (file-exists-p automatic-backup) |
fd8160f7 SM |
1920 | (rename-file automatic-backup filename nil) |
1921 | (message "Checking out %s..." filename) | |
1922 | (with-current-buffer filebuf | |
1923 | (let ((failed t)) | |
1924 | (unwind-protect | |
1925 | (let ((coding-system-for-read 'no-conversion) | |
1926 | (coding-system-for-write 'no-conversion)) | |
1927 | (with-temp-file filename | |
1928 | (let ((outbuf (current-buffer))) | |
1929 | ;; Change buffer to get local value of | |
1930 | ;; vc-checkout-switches. | |
1931 | (with-current-buffer filebuf | |
04ec0963 DN |
1932 | (if backend |
1933 | (vc-call-backend backend 'find-revision file revision outbuf) | |
1934 | (vc-call find-revision file revision outbuf))))) | |
fd8160f7 | 1935 | (setq failed nil)) |
48b43130 DN |
1936 | (when (and failed (file-exists-p filename)) |
1937 | (delete-file filename)))) | |
fd8160f7 SM |
1938 | (vc-mode-line file)) |
1939 | (message "Checking out %s...done" filename))) | |
48b43130 DN |
1940 | (let ((result-buf (find-file-noselect filename))) |
1941 | (with-current-buffer result-buf | |
83f1f73b | 1942 | ;; Set the parent buffer so that things like |
48b43130 | 1943 | ;; C-x v g, C-x v l, ... etc work. |
25a4ea6d | 1944 | (set (make-local-variable 'vc-parent-buffer) filebuf)) |
48b43130 | 1945 | result-buf))) |
fd8160f7 | 1946 | |
594722a8 ER |
1947 | ;; Header-insertion code |
1948 | ||
637a8ae9 | 1949 | ;;;###autoload |
594722a8 | 1950 | (defun vc-insert-headers () |
6f1ecae4 | 1951 | "Insert headers into a file for use with a version control system. |
b524ce9f | 1952 | Headers desired are inserted at point, and are pulled from |
0e362f54 | 1953 | the variable `vc-BACKEND-header'." |
594722a8 | 1954 | (interactive) |
b6909007 | 1955 | (vc-ensure-vc-buffer) |
594722a8 ER |
1956 | (save-excursion |
1957 | (save-restriction | |
1958 | (widen) | |
b5446276 DN |
1959 | (when (or (not (vc-check-headers)) |
1960 | (y-or-n-p "Version headers already exist. Insert another set? ")) | |
1961 | (let* ((delims (cdr (assq major-mode vc-comment-alist))) | |
1962 | (comment-start-vc (or (car delims) comment-start "#")) | |
1963 | (comment-end-vc (or (car (cdr delims)) comment-end "")) | |
1964 | (hdsym (vc-make-backend-sym (vc-backend buffer-file-name) | |
1965 | 'header)) | |
1966 | (hdstrings (and (boundp hdsym) (symbol-value hdsym)))) | |
1967 | (dolist (s hdstrings) | |
1968 | (insert comment-start-vc "\t" s "\t" | |
1969 | comment-end-vc "\n")) | |
1970 | (when vc-static-header-alist | |
1971 | (dolist (f vc-static-header-alist) | |
1972 | (when (string-match (car f) buffer-file-name) | |
1973 | (insert (format (cdr f) (car hdstrings))))))))))) | |
594722a8 | 1974 | |
0e362f54 | 1975 | (defun vc-clear-headers (&optional file) |
099bd78a | 1976 | "Clear all version headers in the current buffer (or FILE). |
6f1ecae4 | 1977 | The headers are reset to their non-expanded form." |
0e362f54 GM |
1978 | (let* ((filename (or file buffer-file-name)) |
1979 | (visited (find-buffer-visiting filename)) | |
1980 | (backend (vc-backend filename))) | |
1981 | (when (vc-find-backend-function backend 'clear-headers) | |
6f41eeb5 | 1982 | (if visited |
0e362f54 GM |
1983 | (let ((context (vc-buffer-context))) |
1984 | ;; save-excursion may be able to relocate point and mark | |
1985 | ;; properly. If it fails, vc-restore-buffer-context | |
1986 | ;; will give it a second try. | |
1987 | (save-excursion | |
1988 | (vc-call-backend backend 'clear-headers)) | |
1989 | (vc-restore-buffer-context context)) | |
7849e179 | 1990 | (set-buffer (find-file-noselect filename)) |
0e362f54 GM |
1991 | (vc-call-backend backend 'clear-headers) |
1992 | (kill-buffer filename))))) | |
c8de1d91 | 1993 | |
9b64a7f0 ER |
1994 | (defun vc-modify-change-comment (files rev oldcomment) |
1995 | "Edit the comment associated with the given files and revision." | |
5ac92c5f GM |
1996 | ;; Less of a kluge than it looks like; log-view mode only passes |
1997 | ;; this function a singleton list. Arguments left in this form in | |
1998 | ;; case the more general operation ever becomes meaningful. | |
1999 | (let ((backend (vc-responsible-backend (car files)))) | |
2000 | (vc-start-logentry | |
e97a42c1 | 2001 | files oldcomment t |
5ac92c5f | 2002 | "Enter a replacement change comment." |
ce1438d6 | 2003 | "*vc-log*" |
5ac92c5f | 2004 | (lambda () (vc-call-backend backend 'log-edit-mode)) |
0d42eb3e SM |
2005 | (lambda (files comment) |
2006 | (vc-call-backend backend | |
2007 | 'modify-change-comment files rev comment))))) | |
9b64a7f0 | 2008 | |
b6909007 | 2009 | ;;;###autoload |
3d92f44e | 2010 | (defun vc-merge () |
2c3160c5 | 2011 | "Perform a version control merge operation. |
dab3703d | 2012 | You must be visiting a version controlled file, or in a `vc-dir' buffer. |
2c3160c5 CY |
2013 | On a distributed version control system, this runs a \"merge\" |
2014 | operation to incorporate changes from another branch onto the | |
3d92f44e | 2015 | current branch, prompting for an argument list. |
2c3160c5 CY |
2016 | |
2017 | On a non-distributed version control system, this merges changes | |
2018 | between two revisions into the current fileset. This asks for | |
2019 | two revisions to merge from in the minibuffer. If the first | |
2020 | revision is a branch number, then merge all changes from that | |
2021 | branch. If the first revision is empty, merge the most recent | |
2022 | changes from the current branch." | |
3d92f44e | 2023 | (interactive) |
2c3160c5 CY |
2024 | (let* ((vc-fileset (vc-deduce-fileset t)) |
2025 | (backend (car vc-fileset)) | |
2026 | (files (cadr vc-fileset))) | |
0e362f54 | 2027 | (cond |
2c3160c5 CY |
2028 | ;; If a branch-merge operation is defined, use it. |
2029 | ((vc-find-backend-function backend 'merge-branch) | |
3d92f44e | 2030 | (vc-call-backend backend 'merge-branch)) |
2c3160c5 CY |
2031 | ;; Otherwise, do a per-file merge. |
2032 | ((vc-find-backend-function backend 'merge) | |
2033 | (vc-buffer-sync) | |
2034 | (dolist (file files) | |
2035 | (let* ((state (vc-state file)) | |
2036 | first-revision second-revision status) | |
2037 | (cond | |
2038 | ((stringp state) ;; Locking VCses only | |
2039 | (error "File %s is locked by %s" file state)) | |
2040 | ((not (vc-editable-p file)) | |
2041 | (vc-checkout file t))) | |
2042 | (setq first-revision | |
2043 | (vc-read-revision | |
2044 | (concat "Merge " file | |
6e7e90fa | 2045 | " from branch or revision " |
2c3160c5 CY |
2046 | "(default news on current branch): ") |
2047 | (list file) | |
2048 | backend)) | |
2049 | (cond | |
2050 | ((string= first-revision "") | |
2051 | (setq status (vc-call-backend backend 'merge-news file))) | |
2052 | (t | |
2053 | (if (not (vc-branch-p first-revision)) | |
2054 | (setq second-revision | |
2055 | (vc-read-revision | |
2056 | "Second revision: " | |
2057 | (list file) backend nil | |
2058 | ;; FIXME: This is CVS/RCS/SCCS specific. | |
2059 | (concat (vc-branch-part first-revision) "."))) | |
2060 | ;; We want to merge an entire branch. Set revisions | |
2061 | ;; accordingly, so that vc-BACKEND-merge understands us. | |
2062 | (setq second-revision first-revision) | |
2063 | ;; first-revision must be the starting point of the branch | |
2064 | (setq first-revision (vc-branch-part first-revision))) | |
2065 | (setq status (vc-call-backend backend 'merge file | |
2066 | first-revision second-revision)))) | |
2067 | (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE")))) | |
2068 | (t | |
2069 | (error "Sorry, merging is not implemented for %s" backend))))) | |
2070 | ||
0e362f54 | 2071 | |
0d42eb3e | 2072 | (defun vc-maybe-resolve-conflicts (file status &optional _name-A _name-B) |
0e362f54 GM |
2073 | (vc-resynch-buffer file t (not (buffer-modified-p))) |
2074 | (if (zerop status) (message "Merge successful") | |
28e4e2b4 | 2075 | (smerge-mode 1) |
8dc87047 | 2076 | (message "File contains conflicts."))) |
ccb141e8 AS |
2077 | |
2078 | ;;;###autoload | |
1168d6c2 | 2079 | (defalias 'vc-resolve-conflicts 'smerge-ediff) |
3b574573 | 2080 | |
e97a42c1 SM |
2081 | ;; TODO: This is OK but maybe we could integrate it better. |
2082 | ;; E.g. it could be run semi-automatically (via a prompt?) when saving a file | |
2083 | ;; that was conflicted (i.e. upon mark-resolved). | |
2084 | ;; FIXME: should we add an "other-window" version? Or maybe we should | |
2085 | ;; hook it inside find-file so it automatically works for | |
2086 | ;; find-file-other-window as well. E.g. find-file could use a new | |
2087 | ;; `default-next-file' variable for its default file (M-n), and | |
2088 | ;; we could then set it upon mark-resolve, so C-x C-s C-x C-f M-n would | |
2089 | ;; automatically offer the next conflicted file. | |
2090 | (defun vc-find-conflicted-file () | |
2091 | "Visit the next conflicted file in the current project." | |
2092 | (interactive) | |
2093 | (let* ((backend (or (if buffer-file-name (vc-backend buffer-file-name)) | |
2094 | (vc-responsible-backend default-directory) | |
2095 | (error "No VC backend"))) | |
2096 | (files (vc-call-backend backend | |
2097 | 'conflicted-files default-directory))) | |
2098 | ;; Don't try and visit the current file. | |
2099 | (if (equal (car files) buffer-file-name) (pop files)) | |
2100 | (if (null files) | |
2101 | (message "No more conflicted files") | |
2102 | (find-file (pop files)) | |
2103 | (message "%s more conflicted files after this one" | |
2104 | (if files (length files) "No"))))) | |
2105 | ||
594722a8 ER |
2106 | ;; Named-configuration entry points |
2107 | ||
370fded4 | 2108 | (defun vc-tag-precondition (dir) |
6f1ecae4 | 2109 | "Scan the tree below DIR, looking for files not up-to-date. |
099bd78a | 2110 | If any file is not up-to-date, return the name of the first such file. |
370fded4 | 2111 | \(This means, neither tag creation nor retrieval is allowed.\) |
099bd78a SM |
2112 | If one or more of the files are currently visited, return `visited'. |
2113 | Otherwise, return nil." | |
503b5c85 RS |
2114 | (let ((status nil)) |
2115 | (catch 'vc-locked-example | |
2116 | (vc-file-tree-walk | |
0e362f54 GM |
2117 | dir |
2118 | (lambda (f) | |
2119 | (if (not (vc-up-to-date-p f)) (throw 'vc-locked-example f) | |
b5446276 | 2120 | (when (get-file-buffer f) (setq status 'visited))))) |
503b5c85 | 2121 | status))) |
594722a8 | 2122 | |
637a8ae9 | 2123 | ;;;###autoload |
370fded4 ER |
2124 | (defun vc-create-tag (dir name branchp) |
2125 | "Descending recursively from DIR, make a tag called NAME. | |
ac3f4c6f ER |
2126 | For each registered file, the working revision becomes part of |
2127 | the named configuration. If the prefix argument BRANCHP is | |
370fded4 | 2128 | given, the tag is made as a new branch and the files are |
ac3f4c6f | 2129 | checked out in that new branch." |
0e362f54 | 2130 | (interactive |
5f4f2ae4 DN |
2131 | (let ((granularity |
2132 | (vc-call-backend (vc-responsible-backend default-directory) | |
2133 | 'revision-granularity))) | |
2134 | (list | |
2135 | (if (eq granularity 'repository) | |
2136 | ;; For VC's that do not work at file level, it's pointless | |
2137 | ;; to ask for a directory, branches are created at repository level. | |
2138 | default-directory | |
7e27ce9c | 2139 | (read-directory-name "Directory: " default-directory default-directory t)) |
5f4f2ae4 DN |
2140 | (read-string (if current-prefix-arg "New branch name: " "New tag name: ")) |
2141 | current-prefix-arg))) | |
370fded4 | 2142 | (message "Making %s... " (if branchp "branch" "tag")) |
b5446276 | 2143 | (when (file-directory-p dir) (setq dir (file-name-as-directory dir))) |
0e362f54 | 2144 | (vc-call-backend (vc-responsible-backend dir) |
370fded4 | 2145 | 'create-tag dir name branchp) |
5f4f2ae4 | 2146 | (vc-resynch-buffer dir t t t) |
370fded4 | 2147 | (message "Making %s... done" (if branchp "branch" "tag"))) |
0e362f54 | 2148 | |
637a8ae9 | 2149 | ;;;###autoload |
370fded4 ER |
2150 | (defun vc-retrieve-tag (dir name) |
2151 | "Descending recursively from DIR, retrieve the tag called NAME. | |
ac3f4c6f | 2152 | If NAME is empty, it refers to the latest revisions. |
099bd78a SM |
2153 | If locking is used for the files in DIR, then there must not be any |
2154 | locked files at or below DIR (but if NAME is empty, locked files are | |
2155 | allowed and simply skipped)." | |
0e362f54 | 2156 | (interactive |
5f4f2ae4 DN |
2157 | (let ((granularity |
2158 | (vc-call-backend (vc-responsible-backend default-directory) | |
2159 | 'revision-granularity))) | |
2160 | (list | |
2161 | (if (eq granularity 'repository) | |
2162 | ;; For VC's that do not work at file level, it's pointless | |
2163 | ;; to ask for a directory, branches are created at repository level. | |
2164 | default-directory | |
7e27ce9c | 2165 | (read-directory-name "Directory: " default-directory default-directory t)) |
5f4f2ae4 | 2166 | (read-string "Tag name to retrieve (default latest revisions): ")))) |
0e362f54 GM |
2167 | (let ((update (yes-or-no-p "Update any affected buffers? ")) |
2168 | (msg (if (or (not name) (string= name "")) | |
2169 | (format "Updating %s... " (abbreviate-file-name dir)) | |
370fded4 | 2170 | (format "Retrieving tag into %s... " |
0e362f54 | 2171 | (abbreviate-file-name dir))))) |
8a26c165 | 2172 | (message "%s" msg) |
0e362f54 | 2173 | (vc-call-backend (vc-responsible-backend dir) |
370fded4 | 2174 | 'retrieve-tag dir name update) |
5f4f2ae4 | 2175 | (vc-resynch-buffer dir t t t) |
8a26c165 | 2176 | (message "%s" (concat msg "done")))) |
0e362f54 | 2177 | |
5f4f2ae4 | 2178 | |
594722a8 ER |
2179 | ;; Miscellaneous other entry points |
2180 | ||
32ba3abc DN |
2181 | ;; FIXME: this should be a defcustom |
2182 | ;; FIXME: maybe add another choice: | |
2183 | ;; `root-directory' (or somesuch), which would mean show a short log | |
2184 | ;; for the root directory. | |
2185 | (defvar vc-log-short-style '(directory) | |
2186 | "Whether or not to show a short log. | |
2187 | If it contains `directory' then if the fileset contains a directory show a short log. | |
2188 | If it contains `file' then show short logs for files. | |
2189 | Not all VC backends support short logs!") | |
2190 | ||
d6e82452 GM |
2191 | (defvar log-view-vc-fileset) |
2192 | ||
31527c56 | 2193 | (defun vc-print-log-setup-buttons (working-revision is-start-revision limit pl-return) |
1b42ee43 GM |
2194 | "Insert at the end of the current buffer buttons to show more log entries. |
2195 | In the new log, leave point at WORKING-REVISION (if non-nil). | |
2196 | LIMIT is the number of entries currently shown. | |
2197 | Does nothing if IS-START-REVISION is non-nil, or if LIMIT is nil, | |
2198 | or if PL-RETURN is 'limit-unsupported." | |
31527c56 DN |
2199 | (when (and limit (not (eq 'limit-unsupported pl-return)) |
2200 | (not is-start-revision)) | |
2201 | (goto-char (point-max)) | |
0d42eb3e SM |
2202 | (insert "\n") |
2203 | (insert-text-button "Show 2X entries" | |
2204 | 'action (lambda (&rest _ignore) | |
2205 | (vc-print-log-internal | |
2206 | log-view-vc-backend log-view-vc-fileset | |
2207 | working-revision nil (* 2 limit))) | |
2208 | 'help-echo "Show the log again, and double the number of log entries shown") | |
2209 | (insert " ") | |
2210 | (insert-text-button "Show unlimited entries" | |
2211 | 'action (lambda (&rest _ignore) | |
2212 | (vc-print-log-internal | |
2213 | log-view-vc-backend log-view-vc-fileset | |
2214 | working-revision nil nil)) | |
2215 | 'help-echo "Show the log again, including all entries"))) | |
31527c56 | 2216 | |
eb708e66 | 2217 | (defun vc-print-log-internal (backend files working-revision |
662c5698 | 2218 | &optional is-start-revision limit) |
1b42ee43 GM |
2219 | "For specified BACKEND and FILES, show the VC log. |
2220 | Leave point at WORKING-REVISION, if it is non-nil. | |
bb7cdf58 GM |
2221 | If IS-START-REVISION is non-nil, start the log from WORKING-REVISION |
2222 | \(not all backends support this); i.e., show only WORKING-REVISION and | |
2223 | earlier revisions. Show up to LIMIT entries (non-nil means unlimited)." | |
2224 | ;; As of 2013/04 the only thing that passes IS-START-REVISION non-nil | |
2225 | ;; is vc-annotate-show-log-revision-at-line, which sets LIMIT = 1. | |
1b42ee43 | 2226 | |
d6a62b0d DN |
2227 | ;; Don't switch to the output buffer before running the command, |
2228 | ;; so that any buffer-local settings in the vc-controlled | |
2229 | ;; buffer can be accessed by the command. | |
32ba3abc | 2230 | (let ((dir-present nil) |
48b27575 | 2231 | (vc-short-log nil) |
31527c56 | 2232 | (buffer-name "*vc-change-log*") |
0d42eb3e | 2233 | type) |
32ba3abc DN |
2234 | (dolist (file files) |
2235 | (when (file-directory-p file) | |
2236 | (setq dir-present t))) | |
2237 | (setq vc-short-log | |
2238 | (not (null (if dir-present | |
2239 | (memq 'directory vc-log-short-style) | |
2240 | (memq 'file vc-log-short-style))))) | |
31527c56 | 2241 | (setq type (if vc-short-log 'short 'long)) |
0d42eb3e | 2242 | (let ((shortlog vc-short-log)) |
31527c56 DN |
2243 | (vc-log-internal-common |
2244 | backend buffer-name files type | |
0d42eb3e SM |
2245 | (lambda (bk buf _type-arg files-arg) |
2246 | (vc-call-backend bk 'print-log files-arg buf shortlog | |
2247 | (when is-start-revision working-revision) limit)) | |
2248 | (lambda (_bk _files-arg ret) | |
31527c56 DN |
2249 | (vc-print-log-setup-buttons working-revision |
2250 | is-start-revision limit ret)) | |
2251 | (lambda (bk) | |
82fb8701 | 2252 | (vc-call-backend bk 'show-log-entry working-revision)) |
0d42eb3e SM |
2253 | (lambda (_ignore-auto _noconfirm) |
2254 | (vc-print-log-internal backend files working-revision | |
2255 | is-start-revision limit)))))) | |
31527c56 DN |
2256 | |
2257 | (defvar vc-log-view-type nil | |
2258 | "Set this to differentiate the different types of logs.") | |
2259 | (put 'vc-log-view-type 'permanent-local t) | |
9c750eba | 2260 | (defvar vc-sentinel-movepoint) |
31527c56 DN |
2261 | |
2262 | (defun vc-log-internal-common (backend | |
2263 | buffer-name | |
2264 | files | |
2265 | type | |
2266 | backend-func | |
2267 | setup-buttons-func | |
82fb8701 DN |
2268 | goto-location-func |
2269 | rev-buff-func) | |
31527c56 DN |
2270 | (let (retval) |
2271 | (with-current-buffer (get-buffer-create buffer-name) | |
2272 | (set (make-local-variable 'vc-log-view-type) type)) | |
2273 | (setq retval (funcall backend-func backend buffer-name type files)) | |
2274 | (pop-to-buffer buffer-name) | |
c767b665 SM |
2275 | (let ((inhibit-read-only t)) |
2276 | ;; log-view-mode used to be called with inhibit-read-only bound | |
2277 | ;; to t, so let's keep doing it, just in case. | |
31527c56 DN |
2278 | (vc-call-backend backend 'log-view-mode) |
2279 | (set (make-local-variable 'log-view-vc-backend) backend) | |
82fb8701 DN |
2280 | (set (make-local-variable 'log-view-vc-fileset) files) |
2281 | (set (make-local-variable 'revert-buffer-function) | |
2282 | rev-buff-func)) | |
9c750eba SM |
2283 | (vc-run-delayed |
2284 | (let ((inhibit-read-only t)) | |
2285 | (funcall setup-buttons-func backend files retval) | |
2286 | (shrink-window-if-larger-than-buffer) | |
2287 | (funcall goto-location-func backend) | |
2288 | (setq vc-sentinel-movepoint (point)) | |
2289 | (set-buffer-modified-p nil))))) | |
d6a62b0d | 2290 | |
31527c56 DN |
2291 | (defun vc-incoming-outgoing-internal (backend remote-location buffer-name type) |
2292 | (vc-log-internal-common | |
2293 | backend buffer-name nil type | |
0d42eb3e SM |
2294 | (lambda (bk buf type-arg _files) |
2295 | (vc-call-backend bk type-arg buf remote-location)) | |
2296 | (lambda (_bk _files-arg _ret) nil) | |
2297 | (lambda (_bk) (goto-char (point-min))) | |
2298 | (lambda (_ignore-auto _noconfirm) | |
2299 | (vc-incoming-outgoing-internal backend remote-location buffer-name type)))) | |
31527c56 | 2300 | |
637a8ae9 | 2301 | ;;;###autoload |
6616006b | 2302 | (defun vc-print-log (&optional working-revision limit) |
d7b60083 | 2303 | "List the change log of the current fileset in a window. |
9aa2c576 CY |
2304 | If WORKING-REVISION is non-nil, leave point at that revision. |
2305 | If LIMIT is non-nil, it should be a number specifying the maximum | |
2306 | number of revisions to show; the default is `vc-log-show-limit'. | |
2307 | ||
2308 | When called interactively with a prefix argument, prompt for | |
2309 | WORKING-REVISION and LIMIT." | |
6616006b DN |
2310 | (interactive |
2311 | (cond | |
2312 | (current-prefix-arg | |
1b42ee43 | 2313 | (let ((rev (read-from-minibuffer "Leave point at revision (default: last revision): " nil |
6616006b DN |
2314 | nil nil nil)) |
2315 | (lim (string-to-number | |
2316 | (read-from-minibuffer | |
2317 | "Limit display (unlimited: 0): " | |
2318 | (format "%s" vc-log-show-limit) | |
2319 | nil nil nil)))) | |
2320 | (when (string= rev "") (setq rev nil)) | |
2321 | (when (<= lim 0) (setq lim nil)) | |
2322 | (list rev lim))) | |
2323 | (t | |
46e5c897 | 2324 | (list nil (when (> vc-log-show-limit 0) vc-log-show-limit))))) |
de7a9afa | 2325 | (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef |
ae67f2d0 | 2326 | (backend (car vc-fileset)) |
6986e5c9 | 2327 | (files (cadr vc-fileset)) |
f5bf77df GM |
2328 | ;; (working-revision (or working-revision (vc-working-revision (car files)))) |
2329 | ) | |
662c5698 | 2330 | (vc-print-log-internal backend files working-revision nil limit))) |
594722a8 | 2331 | |
32ba3abc | 2332 | ;;;###autoload |
6616006b | 2333 | (defun vc-print-root-log (&optional limit) |
9aa2c576 CY |
2334 | "List the change log for the current VC controlled tree in a window. |
2335 | If LIMIT is non-nil, it should be a number specifying the maximum | |
2336 | number of revisions to show; the default is `vc-log-show-limit'. | |
2337 | When called interactively with a prefix argument, prompt for LIMIT." | |
6616006b DN |
2338 | (interactive |
2339 | (cond | |
2340 | (current-prefix-arg | |
2341 | (let ((lim (string-to-number | |
2342 | (read-from-minibuffer | |
2343 | "Limit display (unlimited: 0): " | |
2344 | (format "%s" vc-log-show-limit) | |
2345 | nil nil nil)))) | |
2346 | (when (<= lim 0) (setq lim nil)) | |
2347 | (list lim))) | |
2348 | (t | |
46e5c897 | 2349 | (list (when (> vc-log-show-limit 0) vc-log-show-limit))))) |
a2f043d3 | 2350 | (let ((backend (vc-deduce-backend)) |
1eee6341 | 2351 | (default-directory default-directory) |
32ba3abc | 2352 | rootdir working-revision) |
1eee6341 CY |
2353 | (if backend |
2354 | (setq rootdir (vc-call-backend backend 'root default-directory)) | |
2355 | (setq rootdir (read-directory-name "Directory for VC root-log: ")) | |
2356 | (setq backend (vc-responsible-backend rootdir)) | |
8297b2cf DG |
2357 | (unless backend |
2358 | (error "Directory is not version controlled"))) | |
2359 | (setq working-revision (vc-working-revision rootdir) | |
2360 | default-directory rootdir) | |
662c5698 | 2361 | (vc-print-log-internal backend (list rootdir) working-revision nil limit))) |
32ba3abc | 2362 | |
31527c56 DN |
2363 | ;;;###autoload |
2364 | (defun vc-log-incoming (&optional remote-location) | |
82fb8701 | 2365 | "Show a log of changes that will be received with a pull operation from REMOTE-LOCATION. |
d052d3bd | 2366 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION." |
82fb8701 DN |
2367 | (interactive |
2368 | (when current-prefix-arg | |
2369 | (list (read-string "Remote location (empty for default): ")))) | |
0d42eb3e | 2370 | (let ((backend (vc-deduce-backend))) |
31527c56 DN |
2371 | (unless backend |
2372 | (error "Buffer is not version controlled")) | |
0d42eb3e SM |
2373 | (vc-incoming-outgoing-internal backend remote-location "*vc-incoming*" |
2374 | 'log-incoming))) | |
31527c56 DN |
2375 | |
2376 | ;;;###autoload | |
2377 | (defun vc-log-outgoing (&optional remote-location) | |
82fb8701 DN |
2378 | "Show a log of changes that will be sent with a push operation to REMOTE-LOCATION. |
2379 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION." | |
2380 | (interactive | |
2381 | (when current-prefix-arg | |
2382 | (list (read-string "Remote location (empty for default): ")))) | |
0d42eb3e | 2383 | (let ((backend (vc-deduce-backend))) |
31527c56 DN |
2384 | (unless backend |
2385 | (error "Buffer is not version controlled")) | |
0d42eb3e SM |
2386 | (vc-incoming-outgoing-internal backend remote-location "*vc-outgoing*" |
2387 | 'log-outgoing))) | |
31527c56 | 2388 | |
637a8ae9 | 2389 | ;;;###autoload |
e4d26892 | 2390 | (defun vc-revert () |
d7b60083 | 2391 | "Revert working copies of the selected fileset to their repository contents. |
9c95ac44 | 2392 | This asks for confirmation if the buffer contents are not identical |
ac3f4c6f | 2393 | to the working revision (except for keyword expansion)." |
594722a8 | 2394 | (interactive) |
ae67f2d0 | 2395 | (let* ((vc-fileset (vc-deduce-fileset)) |
2afef60a CY |
2396 | (files (cadr vc-fileset)) |
2397 | (queried nil) | |
2398 | diff-buffer) | |
2399 | ;; If any of the files is visited by the current buffer, make sure | |
2400 | ;; buffer is saved. If the user says `no', abort since we cannot | |
2401 | ;; show the changes and ask for confirmation to discard them. | |
b5446276 DN |
2402 | (when (or (not files) (memq (buffer-file-name) files)) |
2403 | (vc-buffer-sync nil)) | |
d7b60083 | 2404 | (dolist (file files) |
a7192ddb | 2405 | (let ((buf (get-file-buffer file))) |
b5446276 | 2406 | (when (and buf (buffer-modified-p buf)) |
5a0c3f56 | 2407 | (error "Please kill or save all modified buffers before reverting"))) |
b5446276 | 2408 | (when (vc-up-to-date-p file) |
2afef60a CY |
2409 | (if (yes-or-no-p (format "%s seems up-to-date. Revert anyway? " file)) |
2410 | (setq queried t) | |
b5446276 | 2411 | (error "Revert canceled")))) |
2afef60a CY |
2412 | (unwind-protect |
2413 | (when (if vc-revert-show-diff | |
2414 | (progn | |
2415 | (setq diff-buffer (generate-new-buffer-name "*vc-diff*")) | |
2416 | (vc-diff-internal vc-allow-async-revert vc-fileset | |
2417 | nil nil nil diff-buffer)) | |
2418 | ;; Avoid querying the user again. | |
2419 | (null queried)) | |
2420 | (unless (yes-or-no-p | |
2421 | (format "Discard changes in %s? " | |
2422 | (let ((str (vc-delistify files)) | |
2423 | (nfiles (length files))) | |
2424 | (if (< (length str) 50) | |
2425 | str | |
2426 | (format "%d file%s" nfiles | |
2427 | (if (= nfiles 1) "" "s")))))) | |
2428 | (error "Revert canceled"))) | |
2429 | (when diff-buffer | |
2b311310 | 2430 | (quit-windows-on diff-buffer))) |
d7b60083 | 2431 | (dolist (file files) |
b5446276 DN |
2432 | (message "Reverting %s..." (vc-delistify files)) |
2433 | (vc-revert-file file) | |
2434 | (message "Reverting %s...done" (vc-delistify files))))) | |
594722a8 | 2435 | |
637a8ae9 | 2436 | ;;;###autoload |
d7b60083 ER |
2437 | (defun vc-rollback () |
2438 | "Roll back (remove) the most recent changeset committed to the repository. | |
2439 | This may be either a file-level or a repository-level operation, | |
2440 | depending on the underlying version-control system." | |
2441 | (interactive) | |
ae67f2d0 | 2442 | (let* ((vc-fileset (vc-deduce-fileset)) |
ae67f2d0 | 2443 | (backend (car vc-fileset)) |
6986e5c9 | 2444 | (files (cadr vc-fileset)) |
d7b60083 ER |
2445 | (granularity (vc-call-backend backend 'revision-granularity))) |
2446 | (unless (vc-find-backend-function backend 'rollback) | |
2447 | (error "Rollback is not supported in %s" backend)) | |
b5446276 DN |
2448 | (when (and (not (eq granularity 'repository)) (/= (length files) 1)) |
2449 | (error "Rollback requires a singleton fileset or repository versioning")) | |
a749e19d SM |
2450 | ;; FIXME: latest-on-branch-p should take the fileset. |
2451 | (when (not (vc-call-backend backend 'latest-on-branch-p (car files))) | |
5a0c3f56 | 2452 | (error "Rollback is only possible at the tip revision")) |
d7b60083 ER |
2453 | ;; If any of the files is visited by the current buffer, make |
2454 | ;; sure buffer is saved. If the user says `no', abort since | |
2455 | ;; we cannot show the changes and ask for confirmation to | |
2456 | ;; discard them. | |
b5446276 DN |
2457 | (when (or (not files) (memq (buffer-file-name) files)) |
2458 | (vc-buffer-sync nil)) | |
d7b60083 | 2459 | (dolist (file files) |
b5446276 | 2460 | (when (buffer-modified-p (get-file-buffer file)) |
5a0c3f56 | 2461 | (error "Please kill or save all modified buffers before rollback")) |
b5446276 | 2462 | (when (not (vc-up-to-date-p file)) |
5a0c3f56 | 2463 | (error "Please revert all modified workfiles before rollback"))) |
d7b60083 ER |
2464 | ;; Accumulate changes associated with the fileset |
2465 | (vc-setup-buffer "*vc-diff*") | |
835af719 | 2466 | (set-buffer-modified-p nil) |
d7b60083 | 2467 | (message "Finding changes...") |
ac3f4c6f | 2468 | (let* ((tip (vc-working-revision (car files))) |
a749e19d SM |
2469 | ;; FIXME: `previous-revision' should take the fileset. |
2470 | (previous (vc-call-backend backend 'previous-revision | |
2471 | (car files) tip))) | |
ae67f2d0 | 2472 | (vc-diff-internal nil vc-fileset previous tip)) |
a7192ddb | 2473 | ;; Display changes |
d7b60083 ER |
2474 | (unless (yes-or-no-p "Discard these revisions? ") |
2475 | (error "Rollback canceled")) | |
2b311310 | 2476 | (quit-windows-on "*vc-diff*") |
d7b60083 ER |
2477 | ;; Do the actual reversions |
2478 | (message "Rolling back %s..." (vc-delistify files)) | |
2479 | (with-vc-properties | |
2480 | files | |
2481 | (vc-call-backend backend 'rollback files) | |
2482 | `((vc-state . ,'up-to-date) | |
2483 | (vc-checkout-time . , (nth 5 (file-attributes file))) | |
ac3f4c6f | 2484 | (vc-working-revision . nil))) |
a7192ddb | 2485 | (dolist (f files) (vc-resynch-buffer f t t)) |
d7b60083 | 2486 | (message "Rolling back %s...done" (vc-delistify files)))) |
0e362f54 | 2487 | |
2765044b DN |
2488 | ;;;###autoload |
2489 | (define-obsolete-function-alias 'vc-revert-buffer 'vc-revert "23.1") | |
2490 | ||
2491 | ;;;###autoload | |
659114fd | 2492 | (defun vc-pull (&optional arg) |
2c3160c5 | 2493 | "Update the current fileset or branch. |
dab3703d | 2494 | You must be visiting a version controlled file, or in a `vc-dir' buffer. |
2c3160c5 CY |
2495 | On a distributed version control system, this runs a \"pull\" |
2496 | operation to update the current branch, prompting for an argument | |
2497 | list if required. Optional prefix ARG forces a prompt. | |
2498 | ||
2499 | On a non-distributed version control system, update the current | |
2500 | fileset to the tip revisions. For each unchanged and unlocked | |
2501 | file, this simply replaces the work file with the latest revision | |
2502 | on its branch. If the file contains changes, any changes in the | |
2503 | tip revision are merged into the working file." | |
2504 | (interactive "P") | |
2505 | (let* ((vc-fileset (vc-deduce-fileset t)) | |
86048828 | 2506 | (backend (car vc-fileset)) |
6986e5c9 | 2507 | (files (cadr vc-fileset))) |
2c3160c5 CY |
2508 | (cond |
2509 | ;; If a pull operation is defined, use it. | |
2510 | ((vc-find-backend-function backend 'pull) | |
2511 | (vc-call-backend backend 'pull arg)) | |
2512 | ;; If VCS has `merge-news' functionality (CVS and SVN), use it. | |
2513 | ((vc-find-backend-function backend 'merge-news) | |
2514 | (save-some-buffers ; save buffers visiting files | |
2515 | nil (lambda () | |
2516 | (and (buffer-modified-p) | |
2517 | (let ((file (buffer-file-name))) | |
2518 | (and file (member file files)))))) | |
2519 | (dolist (file files) | |
2520 | (if (vc-up-to-date-p file) | |
2521 | (vc-checkout file nil t) | |
2522 | (vc-maybe-resolve-conflicts | |
2523 | file (vc-call-backend backend 'merge-news file))))) | |
2524 | ;; For a locking VCS, check out each file. | |
2525 | ((eq (vc-checkout-model backend files) 'locking) | |
2526 | (dolist (file files) | |
2527 | (if (vc-up-to-date-p file) | |
2528 | (vc-checkout file nil t)))) | |
2529 | (t | |
2530 | (error "VC update is unsupported for `%s'" backend))))) | |
2531 | ||
2532 | ;;;###autoload | |
659114fd | 2533 | (defalias 'vc-update 'vc-pull) |
2765044b DN |
2534 | |
2535 | (defun vc-version-backup-file (file &optional rev) | |
2536 | "Return name of backup file for revision REV of FILE. | |
2537 | If version backups should be used for FILE, and there exists | |
a7192ddb | 2538 | such a backup for REV or the working revision of file, return |
0d0e9356 | 2539 | its name; otherwise return nil." |
2765044b DN |
2540 | (when (vc-call make-version-backups-p file) |
2541 | (let ((backup-file (vc-version-backup-file-name file rev))) | |
2542 | (if (file-exists-p backup-file) | |
2543 | backup-file | |
2544 | ;; there is no automatic backup, but maybe the user made one manually | |
2545 | (setq backup-file (vc-version-backup-file-name file rev 'manual)) | |
b5446276 DN |
2546 | (when (file-exists-p backup-file) |
2547 | backup-file))))) | |
2765044b DN |
2548 | |
2549 | (defun vc-revert-file (file) | |
ac3f4c6f | 2550 | "Revert FILE back to the repository working revision it was based on." |
2765044b | 2551 | (with-vc-properties |
d7b60083 | 2552 | (list file) |
2765044b DN |
2553 | (let ((backup-file (vc-version-backup-file file))) |
2554 | (when backup-file | |
a1c9f41b | 2555 | (copy-file backup-file file 'ok-if-already-exists) |
2765044b DN |
2556 | (vc-delete-automatic-version-backups file)) |
2557 | (vc-call revert file backup-file)) | |
2558 | `((vc-state . up-to-date) | |
2559 | (vc-checkout-time . ,(nth 5 (file-attributes file))))) | |
2560 | (vc-resynch-buffer file t t)) | |
2561 | ||
76e5906d | 2562 | ;;;###autoload |
1d502d5a | 2563 | (defun vc-switch-backend (file backend) |
7849e179 | 2564 | "Make BACKEND the current version control system for FILE. |
1d502d5a AS |
2565 | FILE must already be registered in BACKEND. The change is not |
2566 | permanent, only for the current session. This function only changes | |
7849e179 SM |
2567 | VC's perspective on FILE, it does not register or unregister it. |
2568 | By default, this command cycles through the registered backends. | |
2569 | To get a prompt, use a prefix argument." | |
2570 | (interactive | |
1d502d5a | 2571 | (list |
94ca88e3 AS |
2572 | (or buffer-file-name |
2573 | (error "There is no version-controlled file in this buffer")) | |
3daebe67 | 2574 | (let ((crt-bk (vc-backend buffer-file-name)) |
7849e179 | 2575 | (backends nil)) |
3daebe67 | 2576 | (unless crt-bk |
d7b60083 ER |
2577 | (error "File %s is not under version control" buffer-file-name)) |
2578 | ;; Find the registered backends. | |
3daebe67 DN |
2579 | (dolist (crt vc-handled-backends) |
2580 | (when (and (vc-call-backend crt 'registered buffer-file-name) | |
2581 | (not (eq crt-bk crt))) | |
2582 | (push crt backends))) | |
d7b60083 | 2583 | ;; Find the next backend. |
3daebe67 DN |
2584 | (let ((def (car backends)) |
2585 | (others backends)) | |
d7b60083 ER |
2586 | (cond |
2587 | ((null others) (error "No other backend to switch to")) | |
2588 | (current-prefix-arg | |
2589 | (intern | |
2590 | (upcase | |
2591 | (completing-read | |
2592 | (format "Switch to backend [%s]: " def) | |
2593 | (mapcar (lambda (b) (list (downcase (symbol-name b)))) backends) | |
2594 | nil t nil nil (downcase (symbol-name def)))))) | |
3daebe67 | 2595 | (t def)))))) |
ceec5a0c | 2596 | (unless (eq backend (vc-backend file)) |
ceec5a0c SM |
2597 | (vc-file-clearprops file) |
2598 | (vc-file-setprop file 'vc-backend backend) | |
2599 | ;; Force recomputation of the state | |
a3255400 SM |
2600 | (unless (vc-call-backend backend 'registered file) |
2601 | (vc-file-clearprops file) | |
2602 | (error "%s is not registered in %s" file backend)) | |
ceec5a0c | 2603 | (vc-mode-line file))) |
1d502d5a | 2604 | |
21b50296 | 2605 | ;;;###autoload |
1d502d5a | 2606 | (defun vc-transfer-file (file new-backend) |
ceec5a0c | 2607 | "Transfer FILE to another version control system NEW-BACKEND. |
1d502d5a | 2608 | If NEW-BACKEND has a higher precedence than FILE's current backend |
ceec5a0c | 2609 | \(i.e. it comes earlier in `vc-handled-backends'), then register FILE in |
ac3f4c6f | 2610 | NEW-BACKEND, using the revision number from the current backend as the |
1d502d5a AS |
2611 | base level. If NEW-BACKEND has a lower precedence than the current |
2612 | backend, then commit all changes that were made under the current | |
2613 | backend to NEW-BACKEND, and unregister FILE from the current backend. | |
2614 | \(If FILE is not yet registered under NEW-BACKEND, register it.)" | |
72cfc5fb AS |
2615 | (let* ((old-backend (vc-backend file)) |
2616 | (edited (memq (vc-state file) '(edited needs-merge))) | |
2617 | (registered (vc-call-backend new-backend 'registered file)) | |
2618 | (move | |
2619 | (and registered ; Never move if not registered in new-backend yet. | |
2620 | ;; move if new-backend comes later in vc-handled-backends | |
2621 | (or (memq new-backend (memq old-backend vc-handled-backends)) | |
ffda0460 | 2622 | (y-or-n-p "Final transfer? ")))) |
72cfc5fb | 2623 | (comment nil)) |
ae67f2d0 DN |
2624 | (when (eq old-backend new-backend) |
2625 | (error "%s is the current backend of %s" new-backend file)) | |
72cfc5fb AS |
2626 | (if registered |
2627 | (set-file-modes file (logior (file-modes file) 128)) | |
2628 | ;; `registered' might have switched under us. | |
2629 | (vc-switch-backend file old-backend) | |
ac3f4c6f | 2630 | (let* ((rev (vc-working-revision file)) |
c1b1b393 | 2631 | (modified-file (and edited (make-temp-file file))) |
ffda0460 | 2632 | (unmodified-file (and modified-file (vc-version-backup-file file)))) |
72cfc5fb AS |
2633 | ;; Go back to the base unmodified file. |
2634 | (unwind-protect | |
2635 | (progn | |
ffda0460 | 2636 | (when modified-file |
c1b1b393 | 2637 | (copy-file file modified-file 'ok-if-already-exists) |
ffda0460 AS |
2638 | ;; If we have a local copy of the unmodified file, handle that |
2639 | ;; here and not in vc-revert-file because we don't want to | |
2640 | ;; delete that copy -- it is still useful for OLD-BACKEND. | |
2641 | (if unmodified-file | |
b4e4e3a8 SM |
2642 | (copy-file unmodified-file file |
2643 | 'ok-if-already-exists 'keep-date) | |
004f9b3f | 2644 | (when (y-or-n-p "Get base revision from repository? ") |
ae67f2d0 | 2645 | (vc-revert-file file)))) |
72cfc5fb | 2646 | (vc-call-backend new-backend 'receive-file file rev)) |
ffda0460 | 2647 | (when modified-file |
72cfc5fb | 2648 | (vc-switch-backend file new-backend) |
70e2f6c7 | 2649 | (unless (eq (vc-checkout-model new-backend (list file)) 'implicit) |
72cfc5fb | 2650 | (vc-checkout file t nil)) |
ffda0460 AS |
2651 | (rename-file modified-file file 'ok-if-already-exists) |
2652 | (vc-file-setprop file 'vc-checkout-time nil))))) | |
72cfc5fb AS |
2653 | (when move |
2654 | (vc-switch-backend file old-backend) | |
a749e19d SM |
2655 | (setq comment (vc-call-backend old-backend 'comment-history file)) |
2656 | (vc-call-backend old-backend 'unregister file)) | |
72cfc5fb AS |
2657 | (vc-switch-backend file new-backend) |
2658 | (when (or move edited) | |
1d502d5a | 2659 | (vc-file-setprop file 'vc-state 'edited) |
77bf3f54 | 2660 | (vc-mode-line file new-backend) |
01cf1a52 | 2661 | (vc-checkin file new-backend nil comment (stringp comment))))) |
1d502d5a | 2662 | |
0e362f54 GM |
2663 | (defun vc-rename-master (oldmaster newfile templates) |
2664 | "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES." | |
2665 | (let* ((dir (file-name-directory (expand-file-name oldmaster))) | |
2666 | (newdir (or (file-name-directory newfile) "")) | |
2667 | (newbase (file-name-nondirectory newfile)) | |
2668 | (masters | |
2669 | ;; List of potential master files for `newfile' | |
2670 | (mapcar | |
2671 | (lambda (s) (vc-possible-master s newdir newbase)) | |
2672 | templates))) | |
b5446276 DN |
2673 | (when (or (file-symlink-p oldmaster) |
2674 | (file-symlink-p (file-name-directory oldmaster))) | |
2675 | (error "This is unsafe in the presence of symbolic links")) | |
0e362f54 GM |
2676 | (rename-file |
2677 | oldmaster | |
2678 | (catch 'found | |
2679 | ;; If possible, keep the master file in the same directory. | |
b4e4e3a8 | 2680 | (dolist (f masters) |
ae67f2d0 DN |
2681 | (when (and f (string= (file-name-directory (expand-file-name f)) dir)) |
2682 | (throw 'found f))) | |
0e362f54 | 2683 | ;; If not, just use the first possible place. |
b4e4e3a8 SM |
2684 | (dolist (f masters) |
2685 | (and f (or (not (setq dir (file-name-directory f))) | |
2686 | (file-directory-p dir)) | |
2687 | (throw 'found f))) | |
0e362f54 | 2688 | (error "New file lacks a version control directory"))))) |
594722a8 | 2689 | |
97355c38 | 2690 | ;;;###autoload |
a36319a4 | 2691 | (defun vc-delete-file (file) |
db47d5e9 DG |
2692 | "Delete file and mark it as such in the version control system. |
2693 | If called interactively, read FILE, defaulting to the current | |
2694 | buffer's file name if it's under version control." | |
2695 | (interactive (list (read-file-name "VC delete file: " nil | |
2696 | (when (vc-backend buffer-file-name) | |
2697 | buffer-file-name) t))) | |
484c3092 | 2698 | (setq file (expand-file-name file)) |
c6e44350 AS |
2699 | (let ((buf (get-file-buffer file)) |
2700 | (backend (vc-backend file))) | |
2701 | (unless backend | |
86a65190 | 2702 | (error "File %s is not under version control" |
c6e44350 | 2703 | (file-name-nondirectory file))) |
a36319a4 | 2704 | (unless (vc-find-backend-function backend 'delete-file) |
c6e44350 | 2705 | (error "Deleting files under %s is not supported in VC" backend)) |
b5446276 | 2706 | (when (and buf (buffer-modified-p buf)) |
a84615c7 SS |
2707 | (error "Please save or undo your changes before deleting %s" file)) |
2708 | (let ((state (vc-state file))) | |
2709 | (when (eq state 'edited) | |
2710 | (error "Please commit or undo your changes before deleting %s" file)) | |
2711 | (when (eq state 'conflict) | |
2712 | (error "Please resolve the conflicts before deleting %s" file))) | |
ce5a3ac0 | 2713 | (unless (y-or-n-p (format "Really want to delete %s? " |
a36319a4 SM |
2714 | (file-name-nondirectory file))) |
2715 | (error "Abort!")) | |
775237d3 SS |
2716 | (unless (or (file-directory-p file) (null make-backup-files) |
2717 | (not (file-exists-p file))) | |
a36319a4 SM |
2718 | (with-current-buffer (or buf (find-file-noselect file)) |
2719 | (let ((backup-inhibited nil)) | |
ee91bfdf | 2720 | (backup-buffer)))) |
05fae1be DN |
2721 | ;; Bind `default-directory' so that the command that the backend |
2722 | ;; runs to remove the file is invoked in the correct context. | |
2723 | (let ((default-directory (file-name-directory file))) | |
2724 | (vc-call-backend backend 'delete-file file)) | |
a36319a4 | 2725 | ;; If the backend hasn't deleted the file itself, let's do it for him. |
b5446276 | 2726 | (when (file-exists-p file) (delete-file file)) |
484c3092 DN |
2727 | ;; Forget what VC knew about the file. |
2728 | (vc-file-clearprops file) | |
64e5a32f DN |
2729 | ;; Make sure the buffer is deleted and the *vc-dir* buffers are |
2730 | ;; updated after this. | |
2731 | (vc-resynch-buffer file nil t))) | |
a36319a4 | 2732 | |
29fc1ce9 | 2733 | ;;;###autoload |
594722a8 | 2734 | (defun vc-rename-file (old new) |
db47d5e9 DG |
2735 | "Rename file OLD to NEW in both work area and repository. |
2736 | If called interactively, read OLD and NEW, defaulting OLD to the | |
2737 | current buffer's file name if it's under version control." | |
2738 | (interactive (list (read-file-name "VC rename file: " nil | |
2739 | (when (vc-backend buffer-file-name) | |
2740 | buffer-file-name) t) | |
2741 | (read-file-name "Rename to: "))) | |
260c15b4 SS |
2742 | ;; in CL I would have said (setq new (merge-pathnames new old)) |
2743 | (let ((old-base (file-name-nondirectory old))) | |
2744 | (when (and (not (string= "" old-base)) | |
2745 | (string= "" (file-name-nondirectory new))) | |
2746 | (setq new (concat new old-base)))) | |
a36319a4 | 2747 | (let ((oldbuf (get-file-buffer old))) |
b5446276 DN |
2748 | (when (and oldbuf (buffer-modified-p oldbuf)) |
2749 | (error "Please save files before moving them")) | |
2750 | (when (get-file-buffer new) | |
2751 | (error "Already editing new file name")) | |
2752 | (when (file-exists-p new) | |
2753 | (error "New file already exists")) | |
86a65190 | 2754 | (let ((state (vc-state old))) |
a36319a4 SM |
2755 | (unless (memq state '(up-to-date edited)) |
2756 | (error "Please %s files before moving them" | |
2757 | (if (stringp state) "check in" "update")))) | |
2758 | (vc-call rename-file old new) | |
b4e4e3a8 | 2759 | (vc-file-clearprops old) |
0e362f54 | 2760 | ;; Move the actual file (unless the backend did it already) |
b5446276 | 2761 | (when (file-exists-p old) (rename-file old new)) |
0e362f54 GM |
2762 | ;; ?? Renaming a file might change its contents due to keyword expansion. |
2763 | ;; We should really check out a new copy if the old copy was precisely equal | |
ac3f4c6f | 2764 | ;; to some checked-in revision. However, testing for this is tricky.... |
b5446276 DN |
2765 | (when oldbuf |
2766 | (with-current-buffer oldbuf | |
2767 | (let ((buffer-read-only buffer-read-only)) | |
2768 | (set-visited-file-name new)) | |
77bf3f54 | 2769 | (vc-mode-line new (vc-backend new)) |
b5446276 | 2770 | (set-buffer-modified-p nil))))) |
0e362f54 | 2771 | |
637a8ae9 | 2772 | ;;;###autoload |
f35ecf88 | 2773 | (defun vc-update-change-log (&rest args) |
0e362f54 | 2774 | "Find change log file and add entries from recent version control logs. |
d68e6990 | 2775 | Normally, find log entries for all registered files in the default |
0e362f54 | 2776 | directory. |
d68e6990 | 2777 | |
099bd78a | 2778 | With prefix arg of \\[universal-argument], only find log entries for the current buffer's file. |
d68e6990 RS |
2779 | |
2780 | With any numeric prefix arg, find log entries for all currently visited | |
2781 | files that are under version control. This puts all the entries in the | |
2782 | log for the default directory, which may not be appropriate. | |
2783 | ||
099bd78a | 2784 | From a program, any ARGS are assumed to be filenames for which |
0e362f54 | 2785 | log entries should be gathered." |
67242a23 RM |
2786 | (interactive |
2787 | (cond ((consp current-prefix-arg) ;C-u | |
2788 | (list buffer-file-name)) | |
2789 | (current-prefix-arg ;Numeric argument. | |
50fdf399 TV |
2790 | (let ((files nil)) |
2791 | (dolist (buffer (buffer-list)) | |
2792 | (let ((file (buffer-file-name buffer))) | |
2793 | (and file (vc-backend file) | |
2794 | (setq files (cons file files))))) | |
4b40fdea PE |
2795 | files)) |
2796 | (t | |
0e362f54 GM |
2797 | ;; Don't supply any filenames to backend; this means |
2798 | ;; it should find all relevant files relative to | |
2799 | ;; the default-directory. | |
73a9679c | 2800 | nil))) |
0e362f54 GM |
2801 | (vc-call-backend (vc-responsible-backend default-directory) |
2802 | 'update-changelog args)) | |
2803 | ||
2765044b DN |
2804 | ;; functions that operate on RCS revision numbers. This code should |
2805 | ;; also be moved into the backends. It stays for now, however, since | |
2806 | ;; it is used in code below. | |
2765044b DN |
2807 | (defun vc-branch-p (rev) |
2808 | "Return t if REV is a branch revision." | |
2809 | (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) | |
2810 | ||
2811 | ;;;###autoload | |
2812 | (defun vc-branch-part (rev) | |
2813 | "Return the branch part of a revision number REV." | |
2814 | (let ((index (string-match "\\.[0-9]+\\'" rev))) | |
b5446276 DN |
2815 | (when index |
2816 | (substring rev 0 index)))) | |
2765044b | 2817 | |
0d42eb3e | 2818 | (defun vc-default-responsible-p (_backend _file) |
40ba43b4 | 2819 | "Indicate whether BACKEND is responsible for FILE. |
2765044b DN |
2820 | The default is to return nil always." |
2821 | nil) | |
2822 | ||
0d42eb3e | 2823 | (defun vc-default-could-register (_backend _file) |
2765044b DN |
2824 | "Return non-nil if BACKEND could be used to register FILE. |
2825 | The default implementation returns t for all files." | |
2826 | t) | |
2827 | ||
0d42eb3e | 2828 | (defun vc-default-latest-on-branch-p (_backend _file) |
2765044b DN |
2829 | "Return non-nil if FILE is the latest on its branch. |
2830 | This default implementation always returns non-nil, which means that | |
ac3f4c6f | 2831 | editing non-current revisions is not supported by default." |
2765044b DN |
2832 | t) |
2833 | ||
0d42eb3e | 2834 | (defun vc-default-init-revision (_backend) vc-default-init-revision) |
2765044b | 2835 | |
ac3f4c6f ER |
2836 | (defun vc-default-find-revision (backend file rev buffer) |
2837 | "Provide the new `find-revision' op based on the old `checkout' op. | |
2765044b | 2838 | This is only for compatibility with old backends. They should be updated |
ac3f4c6f | 2839 | to provide the `find-revision' operation instead." |
2765044b DN |
2840 | (let ((tmpfile (make-temp-file (expand-file-name file)))) |
2841 | (unwind-protect | |
2842 | (progn | |
2843 | (vc-call-backend backend 'checkout file nil rev tmpfile) | |
2844 | (with-current-buffer buffer | |
2845 | (insert-file-contents-literally tmpfile))) | |
2846 | (delete-file tmpfile)))) | |
2847 | ||
0d42eb3e | 2848 | (defun vc-default-rename-file (_backend old new) |
2765044b DN |
2849 | (condition-case nil |
2850 | (add-name-to-file old new) | |
2851 | (error (rename-file old new))) | |
2852 | (vc-delete-file old) | |
2853 | (with-current-buffer (find-file-noselect new) | |
2854 | (vc-register))) | |
2855 | ||
17f3909f | 2856 | (defalias 'vc-default-check-headers 'ignore) |
2765044b | 2857 | |
5ac92c5f GM |
2858 | (declare-function log-edit-mode "log-edit" ()) |
2859 | ||
0d42eb3e | 2860 | (defun vc-default-log-edit-mode (_backend) (log-edit-mode)) |
09158997 | 2861 | |
0d42eb3e | 2862 | (defun vc-default-log-view-mode (_backend) (log-view-mode)) |
2765044b | 2863 | |
0d42eb3e | 2864 | (defun vc-default-show-log-entry (_backend rev) |
2765044b DN |
2865 | (with-no-warnings |
2866 | (log-view-goto-rev rev))) | |
2867 | ||
2868 | (defun vc-default-comment-history (backend file) | |
2869 | "Return a string with all log entries stored in BACKEND for FILE." | |
7fbb4797 DN |
2870 | (when (vc-find-backend-function backend 'print-log) |
2871 | (with-current-buffer "*vc*" | |
a749e19d | 2872 | (vc-call-backend backend 'print-log (list file)) |
7fbb4797 | 2873 | (buffer-string)))) |
2765044b | 2874 | |
2765044b DN |
2875 | (defun vc-default-receive-file (backend file rev) |
2876 | "Let BACKEND receive FILE from another version control system." | |
24703c3c | 2877 | (vc-call-backend backend 'register (list file) rev "")) |
2765044b | 2878 | |
370fded4 | 2879 | (defun vc-default-retrieve-tag (backend dir name update) |
2765044b DN |
2880 | (if (string= name "") |
2881 | (progn | |
2882 | (vc-file-tree-walk | |
2883 | dir | |
2884 | (lambda (f) (and | |
2885 | (vc-up-to-date-p f) | |
2886 | (vc-error-occurred | |
a749e19d | 2887 | (vc-call-backend backend 'checkout f nil "") |
b5446276 | 2888 | (when update (vc-resynch-buffer f t t))))))) |
370fded4 | 2889 | (let ((result (vc-tag-precondition dir))) |
2765044b DN |
2890 | (if (stringp result) |
2891 | (error "File %s is locked" result) | |
2892 | (setq update (and (eq result 'visited) update)) | |
2893 | (vc-file-tree-walk | |
2894 | dir | |
2895 | (lambda (f) (vc-error-occurred | |
a749e19d | 2896 | (vc-call-backend backend 'checkout f nil name) |
b5446276 | 2897 | (when update (vc-resynch-buffer f t t))))))))) |
2765044b DN |
2898 | |
2899 | (defun vc-default-revert (backend file contents-done) | |
2900 | (unless contents-done | |
ac3f4c6f | 2901 | (let ((rev (vc-working-revision file)) |
2765044b DN |
2902 | (file-buffer (or (get-file-buffer file) (current-buffer)))) |
2903 | (message "Checking out %s..." file) | |
2904 | (let ((failed t) | |
2905 | (backup-name (car (find-backup-file-name file)))) | |
2906 | (when backup-name | |
2907 | (copy-file file backup-name 'ok-if-already-exists 'keep-date) | |
2908 | (unless (file-writable-p file) | |
2909 | (set-file-modes file (logior (file-modes file) 128)))) | |
2910 | (unwind-protect | |
2911 | (let ((coding-system-for-read 'no-conversion) | |
2912 | (coding-system-for-write 'no-conversion)) | |
2913 | (with-temp-file file | |
2914 | (let ((outbuf (current-buffer))) | |
2915 | ;; Change buffer to get local value of vc-checkout-switches. | |
2916 | (with-current-buffer file-buffer | |
2917 | (let ((default-directory (file-name-directory file))) | |
a749e19d SM |
2918 | (vc-call-backend backend 'find-revision |
2919 | file rev outbuf))))) | |
2765044b DN |
2920 | (setq failed nil)) |
2921 | (when backup-name | |
2922 | (if failed | |
2923 | (rename-file backup-name file 'ok-if-already-exists) | |
2924 | (and (not vc-make-backup-files) (delete-file backup-name)))))) | |
2925 | (message "Checking out %s...done" file)))) | |
2926 | ||
17f3909f | 2927 | (defalias 'vc-default-revision-completion-table 'ignore) |
f41d99b0 | 2928 | (defalias 'vc-default-mark-resolved 'ignore) |
2765044b | 2929 | |
0d42eb3e | 2930 | (defun vc-default-dir-status-files (_backend _dir files default-state update-function) |
fb0ac090 AJ |
2931 | (funcall update-function |
2932 | (mapcar (lambda (file) (list file default-state)) files))) | |
2933 | ||
2765044b DN |
2934 | (defun vc-check-headers () |
2935 | "Check if the current file has any headers in it." | |
2936 | (interactive) | |
2937 | (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) | |
2938 | ||
7d2d9482 | 2939 | \f |
594722a8 | 2940 | |
b1ddeeb7 | 2941 | ;; These things should probably be generally available |
2a1e2476 | 2942 | (define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.3") |
f731e2f9 | 2943 | |
b1ddeeb7 ER |
2944 | (defun vc-file-tree-walk (dirname func &rest args) |
2945 | "Walk recursively through DIRNAME. | |
2946 | Invoke FUNC f ARGS on each VC-managed file f underneath it." | |
2947 | (vc-file-tree-walk-internal (expand-file-name dirname) func args) | |
2948 | (message "Traversing directory %s...done" dirname)) | |
2949 | ||
2950 | (defun vc-file-tree-walk-internal (file func args) | |
2951 | (if (not (file-directory-p file)) | |
2952 | (when (vc-backend file) (apply func file args)) | |
2953 | (message "Traversing directory %s..." (abbreviate-file-name file)) | |
2954 | (let ((dir (file-name-as-directory file))) | |
2955 | (mapcar | |
2956 | (lambda (f) (or | |
2957 | (string-equal f ".") | |
2958 | (string-equal f "..") | |
2959 | (member f vc-directory-exclusion-list) | |
2960 | (let ((dirf (expand-file-name f dir))) | |
2961 | (or | |
2962 | (file-symlink-p dirf) ;; Avoid possible loops. | |
2963 | (vc-file-tree-walk-internal dirf func args))))) | |
2964 | (directory-files dir))))) | |
2965 | ||
594722a8 ER |
2966 | (provide 'vc) |
2967 | ||
594722a8 | 2968 | ;;; vc.el ends here |