Commit | Line | Data |
---|---|---|
08a1ccb0 | 1 | ;;; vc-dispatcher.el -- generic command-dispatcher facility. |
92d1eebf ER |
2 | |
3 | ;; Copyright (C) 2008 | |
4 | ;; Free Software Foundation, Inc. | |
5 | ||
6 | ;; Author: FSF (see below for full credits) | |
7 | ;; Maintainer: Eric S. Raymond <esr@thyrsus.com> | |
8 | ;; Keywords: tools | |
9 | ||
10 | ;; This file is part of GNU Emacs. | |
11 | ||
eb3fa2cf | 12 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
92d1eebf | 13 | ;; it under the terms of the GNU General Public License as published by |
eb3fa2cf GM |
14 | ;; the Free Software Foundation, either version 3 of the License, or |
15 | ;; (at your option) any later version. | |
92d1eebf ER |
16 | |
17 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 | ;; GNU General Public License for more details. | |
21 | ||
22 | ;; You should have received a copy of the GNU General Public License | |
eb3fa2cf | 23 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
92d1eebf ER |
24 | |
25 | ;;; Credits: | |
26 | ||
27 | ;; Designed and implemented by Eric S. Raymond, originally as part of VC mode. | |
dbf2c858 | 28 | ;; Stefan Monnier and Dan Nicolaescu contributed substantial work on the |
821677fb | 29 | ;; vc-dir front end. |
92d1eebf ER |
30 | |
31 | ;;; Commentary: | |
32 | ||
33 | ;; Goals: | |
34 | ;; | |
35 | ;; There is a class of front-ending problems that Emacs might be used | |
36 | ;; to address that involves selecting sets of files, or possibly | |
37 | ;; directories, and passing the selection set to slave commands. The | |
38 | ;; prototypical example, from which this code is derived, is talking | |
b1d87c10 | 39 | ;; to version-control systems. |
92d1eebf ER |
40 | ;; |
41 | ;; vc-dispatcher.el is written to decouple the UI issues in such front | |
b1d87c10 | 42 | ;; ends from their application-specific logic. It also provides a |
92d1eebf ER |
43 | ;; service layer for running the slave commands either synchronously |
44 | ;; or asynchronously and managing the message/error logs from the | |
45 | ;; command runs. | |
46 | ;; | |
47 | ;; Similar UI problems can be expected to come up in applications | |
48 | ;; areas other than VCSes; IDEs and document search are two obvious ones. | |
49 | ;; This mode is intended to ensure that the Emacs interfaces for all such | |
50 | ;; beasts are consistent and carefully designed. But even if nothing | |
51 | ;; but VC ever uses it, getting the layer separation right will be | |
52 | ;; a valuable thing. | |
53 | ||
54 | ;; Dispatcher's universe: | |
55 | ;; | |
56 | ;; The universe consists of the file tree rooted at the current | |
b1d87c10 GM |
57 | ;; directory. The dispatcher's upper layer deduces some subset |
58 | ;; of the file tree from the state of the currently visited buffer | |
92d1eebf ER |
59 | ;; and returns that subset, presumably to a client mode. |
60 | ;; | |
06ad7cd8 ER |
61 | ;; The user may be looking at either of two different views; a buffer |
62 | ;; visiting a file, or a directory buffer generated by vc-dispatcher. | |
92d1eebf ER |
63 | ;; |
64 | ;; The lower layer of this mode runs commands in subprocesses, either | |
65 | ;; synchronously or asynchronously. Commands may be launched in one | |
66 | ;; of two ways: they may be run immediately, or the calling mode can | |
67 | ;; create a closure associated with a text-entry buffer, to be | |
b1d87c10 | 68 | ;; executed when the user types C-c to ship the buffer contents. In |
92d1eebf ER |
69 | ;; either case the command messages and error (if any) will remain |
70 | ;; available in a status buffer. | |
71 | ||
d99d06ec ER |
72 | ;; Special behavior of dispatcher directory buffers: |
73 | ;; | |
038608c7 | 74 | ;; In dispatcher directory buffers, facilities to perform basic |
d99d06ec ER |
75 | ;; navigation and selection operations are provided by keymap and menu |
76 | ;; entries that dispatcher sets up itself, so they'll be uniform | |
038608c7 | 77 | ;; across all dispatcher-using client modes. Client modes are |
d99d06ec ER |
78 | ;; expected to append to these to provide mode-specific bindings. |
79 | ;; | |
80 | ;; The standard map associates a 'state' slot (that the client mode | |
81 | ;; may set) with each directory entry. The dispatcher knows nothing | |
82 | ;; about the semantics of individual states, but mark and unmark commands | |
b1d87c10 | 83 | ;; treat all entries with the same state as the currently selected one as |
038608c7 | 84 | ;; a unit. |
821677fb | 85 | |
dab68082 | 86 | ;; The interface: |
821677fb ER |
87 | ;; |
88 | ;; The main interface to the lower level is vc-do-command. This launches a | |
b1d87c10 | 89 | ;; command, synchronously or asynchronously, making the output available |
821677fb ER |
90 | ;; in a command log buffer. Two other functions, (vc-start-annotation) and |
91 | ;; (vc-finish-logentry), allow you to associate a command closure with an | |
b1d87c10 | 92 | ;; annotation buffer so that when the user confirms the comment the closure |
821677fb ER |
93 | ;; is run (with the comment as part of its context). |
94 | ;; | |
95 | ;; The interface to the upper level has the two main entry points (vc-dir) | |
96 | ;; and (vc-dispatcher-selection-set) and a couple of convenience functions. | |
97 | ;; (vc-dir) sets up a dispatcher browsing buffer; (vc-dispatcher-selection-set) | |
98 | ;; returns a selection set of files, either the marked files in a browsing | |
99 | ;; buffer or the singleton set consisting of the file visited by the current | |
b1d87c10 GM |
100 | ;; buffer (when that is appropriate). It also does what is needed to ensure |
101 | ;; that on-disk files and the contents of their visiting Emacs buffers | |
c8d4f1a0 ER |
102 | ;; coincide. |
103 | ;; | |
104 | ;; When the client mode adds a local mode-line-hook to a buffer, it | |
105 | ;; will be called with the buffer file name as argument whenever the | |
106 | ;; dispatcher resynchs the buffer. | |
821677fb | 107 | |
d99d06ec ER |
108 | ;; To do: |
109 | ;; | |
373b6519 | 110 | ;; - log buffers need font-locking. |
d99d06ec | 111 | ;; |
83affd96 | 112 | |
1915fb44 | 113 | ;; General customization |
83affd96 ER |
114 | (defcustom vc-logentry-check-hook nil |
115 | "Normal hook run by `vc-finish-logentry'. | |
116 | Use this to impose your own rules on the entry in addition to any the | |
4f61cc3e | 117 | dispatcher client mode imposes itself." |
83affd96 ER |
118 | :type 'hook |
119 | :group 'vc) | |
120 | ||
17f039f3 | 121 | (defcustom vc-delete-logbuf-window t |
400aec1a | 122 | "If non-nil, delete the log buffer and window after each logical action. |
17f039f3 ER |
123 | If nil, bury that buffer instead. |
124 | This is most useful if you have multiple windows on a frame and would like to | |
125 | preserve the setting." | |
126 | :type 'boolean | |
127 | :group 'vc) | |
128 | ||
129 | (defcustom vc-command-messages nil | |
130 | "If non-nil, display run messages from back-end commands." | |
131 | :type 'boolean | |
132 | :group 'vc) | |
133 | ||
821677fb ER |
134 | (defcustom vc-suppress-confirm nil |
135 | "If non-nil, treat user as expert; suppress yes-no prompts on some things." | |
136 | :type 'boolean | |
137 | :group 'vc) | |
138 | ||
83affd96 | 139 | ;; Variables the user doesn't need to know about. |
17f039f3 | 140 | |
83affd96 ER |
141 | (defvar vc-log-operation nil) |
142 | (defvar vc-log-after-operation-hook nil) | |
143 | (defvar vc-log-fileset) | |
144 | (defvar vc-log-extra) | |
145 | ||
146 | ;; In a log entry buffer, this is a local variable | |
147 | ;; that points to the buffer for which it was made | |
d536a904 | 148 | ;; (either a file, or a directory buffer). |
83affd96 ER |
149 | (defvar vc-parent-buffer nil) |
150 | (put 'vc-parent-buffer 'permanent-local t) | |
151 | (defvar vc-parent-buffer-name nil) | |
152 | (put 'vc-parent-buffer-name 'permanent-local t) | |
153 | ||
92d1eebf ER |
154 | ;; Common command execution logic |
155 | ||
156 | (defun vc-process-filter (p s) | |
157 | "An alternative output filter for async process P. | |
158 | One difference with the default filter is that this inserts S after markers. | |
159 | Another is that undo information is not kept." | |
160 | (let ((buffer (process-buffer p))) | |
161 | (when (buffer-live-p buffer) | |
162 | (with-current-buffer buffer | |
163 | (save-excursion | |
164 | (let ((buffer-undo-list t) | |
165 | (inhibit-read-only t)) | |
166 | (goto-char (process-mark p)) | |
167 | (insert s) | |
168 | (set-marker (process-mark p) (point)))))))) | |
169 | ||
7265c6e8 ER |
170 | (defun vc-setup-buffer (buf) |
171 | "Prepare BUF for executing a slave command and make it current." | |
92d1eebf ER |
172 | (let ((camefrom (current-buffer)) |
173 | (olddir default-directory)) | |
174 | (set-buffer (get-buffer-create buf)) | |
175 | (kill-all-local-variables) | |
176 | (set (make-local-variable 'vc-parent-buffer) camefrom) | |
177 | (set (make-local-variable 'vc-parent-buffer-name) | |
178 | (concat " from " (buffer-name camefrom))) | |
179 | (setq default-directory olddir) | |
180 | (let ((buffer-undo-list t) | |
181 | (inhibit-read-only t)) | |
182 | (erase-buffer)))) | |
183 | ||
184 | (defvar vc-sentinel-movepoint) ;Dynamically scoped. | |
185 | ||
186 | (defun vc-process-sentinel (p s) | |
187 | (let ((previous (process-get p 'vc-previous-sentinel)) | |
188 | (buf (process-buffer p))) | |
189 | ;; Impatient users sometime kill "slow" buffers; check liveness | |
190 | ;; to avoid "error in process sentinel: Selecting deleted buffer". | |
191 | (when (buffer-live-p buf) | |
192 | (when previous (funcall previous p s)) | |
193 | (with-current-buffer buf | |
194 | (setq mode-line-process | |
195 | (let ((status (process-status p))) | |
196 | ;; Leave mode-line uncluttered, normally. | |
197 | (unless (eq 'exit status) | |
198 | (format " (%s)" status)))) | |
199 | (let (vc-sentinel-movepoint) | |
200 | ;; Normally, we want async code such as sentinels to not move point. | |
201 | (save-excursion | |
202 | (goto-char (process-mark p)) | |
203 | (let ((cmds (process-get p 'vc-sentinel-commands))) | |
204 | (process-put p 'vc-sentinel-commands nil) | |
205 | (dolist (cmd cmds) | |
206 | ;; Each sentinel may move point and the next one should be run | |
207 | ;; at that new point. We could get the same result by having | |
208 | ;; each sentinel read&set process-mark, but since `cmd' needs | |
209 | ;; to work both for async and sync processes, this would be | |
210 | ;; difficult to achieve. | |
211 | (vc-exec-after cmd)))) | |
212 | ;; But sometimes the sentinels really want to move point. | |
213 | (when vc-sentinel-movepoint | |
214 | (let ((win (get-buffer-window (current-buffer) 0))) | |
215 | (if (not win) | |
216 | (goto-char vc-sentinel-movepoint) | |
217 | (with-selected-window win | |
218 | (goto-char vc-sentinel-movepoint)))))))))) | |
219 | ||
220 | (defun vc-set-mode-line-busy-indicator () | |
221 | (setq mode-line-process | |
222 | (concat " " (propertize "[waiting...]" | |
223 | 'face 'mode-line-emphasis | |
224 | 'help-echo | |
d536a904 | 225 | "A command is in progress in this buffer")))) |
92d1eebf ER |
226 | |
227 | (defun vc-exec-after (code) | |
228 | "Eval CODE when the current buffer's process is done. | |
229 | If the current buffer has no process, just evaluate CODE. | |
230 | Else, add CODE to the process' sentinel." | |
231 | (let ((proc (get-buffer-process (current-buffer)))) | |
232 | (cond | |
233 | ;; If there's no background process, just execute the code. | |
234 | ;; We used to explicitly call delete-process on exited processes, | |
235 | ;; but this led to timing problems causing process output to be | |
236 | ;; lost. Terminated processes get deleted automatically | |
237 | ;; anyway. -- cyd | |
238 | ((or (null proc) (eq (process-status proc) 'exit)) | |
239 | ;; Make sure we've read the process's output before going further. | |
240 | (when proc (accept-process-output proc)) | |
241 | (eval code)) | |
242 | ;; If a process is running, add CODE to the sentinel | |
243 | ((eq (process-status proc) 'run) | |
244 | (vc-set-mode-line-busy-indicator) | |
245 | (let ((previous (process-sentinel proc))) | |
246 | (unless (eq previous 'vc-process-sentinel) | |
247 | (process-put proc 'vc-previous-sentinel previous)) | |
248 | (set-process-sentinel proc 'vc-process-sentinel)) | |
249 | (process-put proc 'vc-sentinel-commands | |
250 | ;; We keep the code fragments in the order given | |
251 | ;; so that vc-diff-finish's message shows up in | |
252 | ;; the presence of non-nil vc-command-messages. | |
253 | (append (process-get proc 'vc-sentinel-commands) | |
254 | (list code)))) | |
255 | (t (error "Unexpected process state")))) | |
256 | nil) | |
257 | ||
258 | (defvar vc-post-command-functions nil | |
259 | "Hook run at the end of `vc-do-command'. | |
260 | Each function is called inside the buffer in which the command was run | |
261 | and is passed 3 arguments: the COMMAND, the FILES and the FLAGS.") | |
262 | ||
263 | (defvar w32-quote-process-args) | |
264 | ||
265 | (defun vc-delistify (filelist) | |
266 | "Smash a FILELIST into a file list string suitable for info messages." | |
267 | ;; FIXME what about file names with spaces? | |
268 | (if (not filelist) "." (mapconcat 'identity filelist " "))) | |
269 | ||
270 | ;;;###autoload | |
271 | (defun vc-do-command (buffer okstatus command file-or-list &rest flags) | |
06ad7cd8 | 272 | "Execute a slave command, notifying user and checking for errors. |
2888a97e ER |
273 | Output from COMMAND goes to BUFFER, or the current buffer if |
274 | BUFFER is t. If the destination buffer is not already current, | |
275 | set it up properly and erase it. The command is considered | |
276 | successful if its exit status does not exceed OKSTATUS (if | |
277 | OKSTATUS is nil, that means to ignore error status, if it is | |
278 | `async', that means not to wait for termination of the | |
279 | subprocess; if it is t it means to ignore all execution errors). | |
280 | FILE-OR-LIST is the name of a working file; it may be a list of | |
281 | files or be nil (to execute commands that don't expect a file | |
282 | name or set of files). If an optional list of FLAGS is present, | |
92d1eebf ER |
283 | that is inserted into the command line before the filename." |
284 | ;; FIXME: file-relative-name can return a bogus result because | |
285 | ;; it doesn't look at the actual file-system to see if symlinks | |
286 | ;; come into play. | |
287 | (let* ((files | |
288 | (mapcar (lambda (f) (file-relative-name (expand-file-name f))) | |
289 | (if (listp file-or-list) file-or-list (list file-or-list)))) | |
290 | (full-command | |
291 | ;; What we're doing here is preparing a version of the command | |
b1d87c10 | 292 | ;; for display in a debug-progress message. If it's fewer than |
92d1eebf ER |
293 | ;; 20 characters display the entire command (without trailing |
294 | ;; newline). Otherwise display the first 20 followed by an ellipsis. | |
295 | (concat (if (string= (substring command -1) "\n") | |
296 | (substring command 0 -1) | |
297 | command) | |
298 | " " | |
299 | (vc-delistify (mapcar (lambda (s) (if (> (length s) 20) (concat (substring s 0 2) "...") s)) flags)) | |
300 | " " (vc-delistify files)))) | |
301 | (save-current-buffer | |
302 | (unless (or (eq buffer t) | |
303 | (and (stringp buffer) | |
304 | (string= (buffer-name) buffer)) | |
305 | (eq buffer (current-buffer))) | |
2888a97e | 306 | (vc-setup-buffer buffer)) |
92d1eebf ER |
307 | ;; If there's some previous async process still running, just kill it. |
308 | (let ((oldproc (get-buffer-process (current-buffer)))) | |
309 | ;; If we wanted to wait for oldproc to finish before doing | |
310 | ;; something, we'd have used vc-eval-after. | |
311 | ;; Use `delete-process' rather than `kill-process' because we don't | |
312 | ;; want any of its output to appear from now on. | |
313 | (if oldproc (delete-process oldproc))) | |
314 | (let ((squeezed (remq nil flags)) | |
315 | (inhibit-read-only t) | |
316 | (status 0)) | |
317 | (when files | |
318 | (setq squeezed (nconc squeezed files))) | |
319 | (let ((exec-path (append vc-path exec-path)) | |
320 | ;; Add vc-path to PATH for the execution of this command. | |
321 | (process-environment | |
322 | (cons (concat "PATH=" (getenv "PATH") | |
323 | path-separator | |
324 | (mapconcat 'identity vc-path path-separator)) | |
325 | process-environment)) | |
326 | (w32-quote-process-args t)) | |
327 | (when (and (eq okstatus 'async) (file-remote-p default-directory)) | |
328 | ;; start-process does not support remote execution | |
329 | (setq okstatus nil)) | |
330 | (if (eq okstatus 'async) | |
331 | ;; Run asynchronously. | |
332 | (let ((proc | |
333 | (let ((process-connection-type nil)) | |
334 | (apply 'start-file-process command (current-buffer) | |
335 | command squeezed)))) | |
336 | (if vc-command-messages | |
337 | (message "Running %s in background..." full-command)) | |
338 | ;;(set-process-sentinel proc (lambda (p msg) (delete-process p))) | |
339 | (set-process-filter proc 'vc-process-filter) | |
340 | (vc-exec-after | |
341 | `(if vc-command-messages | |
342 | (message "Running %s in background... done" ',full-command)))) | |
b1d87c10 | 343 | ;; Run synchronously |
92d1eebf ER |
344 | (when vc-command-messages |
345 | (message "Running %s in foreground..." full-command)) | |
346 | (let ((buffer-undo-list t)) | |
347 | (setq status (apply 'process-file command nil t nil squeezed))) | |
348 | (when (and (not (eq t okstatus)) | |
349 | (or (not (integerp status)) | |
350 | (and okstatus (< okstatus status)))) | |
351 | (unless (eq ?\s (aref (buffer-name (current-buffer)) 0)) | |
352 | (pop-to-buffer (current-buffer)) | |
353 | (goto-char (point-min)) | |
354 | (shrink-window-if-larger-than-buffer)) | |
355 | (error "Running %s...FAILED (%s)" full-command | |
356 | (if (integerp status) (format "status %d" status) status)))) | |
357 | ;; We're done. But don't emit a status message if running | |
b1d87c10 | 358 | ;; asynchronously, it would just mislead. |
92d1eebf ER |
359 | (if (and vc-command-messages (not (eq okstatus 'async))) |
360 | (message "Running %s...OK = %d" full-command status))) | |
361 | (vc-exec-after | |
362 | `(run-hook-with-args 'vc-post-command-functions | |
363 | ',command ',file-or-list ',flags)) | |
364 | status)))) | |
365 | ||
17f039f3 | 366 | ;; These functions are used to ensure that the view the user sees is up to date |
b1d87c10 | 367 | ;; even if the dispatcher client mode has messed with file contents (as in, |
17f039f3 ER |
368 | ;; for example, VCS keyword expansion). |
369 | ||
370 | (declare-function view-mode-exit "view" (&optional return-to-alist exit-action all-win)) | |
371 | ||
372 | (defun vc-position-context (posn) | |
373 | "Save a bit of the text around POSN in the current buffer. | |
374 | Used to help us find the corresponding position again later | |
375 | if markers are destroyed or corrupted." | |
376 | ;; A lot of this was shamelessly lifted from Sebastian Kremer's | |
377 | ;; rcs.el mode. | |
378 | (list posn | |
379 | (buffer-size) | |
380 | (buffer-substring posn | |
381 | (min (point-max) (+ posn 100))))) | |
382 | ||
383 | (defun vc-find-position-by-context (context) | |
384 | "Return the position of CONTEXT in the current buffer. | |
385 | If CONTEXT cannot be found, return nil." | |
386 | (let ((context-string (nth 2 context))) | |
387 | (if (equal "" context-string) | |
388 | (point-max) | |
389 | (save-excursion | |
390 | (let ((diff (- (nth 1 context) (buffer-size)))) | |
391 | (when (< diff 0) (setq diff (- diff))) | |
392 | (goto-char (nth 0 context)) | |
393 | (if (or (search-forward context-string nil t) | |
394 | ;; Can't use search-backward since the match may continue | |
395 | ;; after point. | |
396 | (progn (goto-char (- (point) diff (length context-string))) | |
397 | ;; goto-char doesn't signal an error at | |
398 | ;; beginning of buffer like backward-char would | |
399 | (search-forward context-string nil t))) | |
400 | ;; to beginning of OSTRING | |
401 | (- (point) (length context-string)))))))) | |
402 | ||
403 | (defun vc-context-matches-p (posn context) | |
404 | "Return t if POSN matches CONTEXT, nil otherwise." | |
405 | (let* ((context-string (nth 2 context)) | |
406 | (len (length context-string)) | |
407 | (end (+ posn len))) | |
408 | (if (> end (1+ (buffer-size))) | |
409 | nil | |
410 | (string= context-string (buffer-substring posn end))))) | |
411 | ||
412 | (defun vc-buffer-context () | |
413 | "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE). | |
414 | Used by `vc-restore-buffer-context' to later restore the context." | |
415 | (let ((point-context (vc-position-context (point))) | |
416 | ;; Use mark-marker to avoid confusion in transient-mark-mode. | |
9ba4a350 | 417 | (mark-context (when (eq (marker-buffer (mark-marker)) (current-buffer)) |
17f039f3 ER |
418 | (vc-position-context (mark-marker)))) |
419 | ;; Make the right thing happen in transient-mark-mode. | |
9ba4a350 ER |
420 | (mark-active nil)) |
421 | (list point-context mark-context nil))) | |
17f039f3 ER |
422 | |
423 | (defun vc-restore-buffer-context (context) | |
424 | "Restore point/mark, and reparse any affected compilation buffers. | |
425 | CONTEXT is that which `vc-buffer-context' returns." | |
426 | (let ((point-context (nth 0 context)) | |
9ba4a350 | 427 | (mark-context (nth 1 context))) |
17f039f3 ER |
428 | ;; if necessary, restore point and mark |
429 | (if (not (vc-context-matches-p (point) point-context)) | |
430 | (let ((new-point (vc-find-position-by-context point-context))) | |
431 | (when new-point (goto-char new-point)))) | |
432 | (and mark-active | |
433 | mark-context | |
434 | (not (vc-context-matches-p (mark) mark-context)) | |
435 | (let ((new-mark (vc-find-position-by-context mark-context))) | |
436 | (when new-mark (set-mark new-mark)))))) | |
437 | ||
438 | (defun vc-revert-buffer-internal (&optional arg no-confirm) | |
439 | "Revert buffer, keeping point and mark where user expects them. | |
440 | Try to be clever in the face of changes due to expanded version-control | |
441 | key words. This is important for typeahead to work as expected. | |
442 | ARG and NO-CONFIRM are passed on to `revert-buffer'." | |
443 | (interactive "P") | |
444 | (widen) | |
445 | (let ((context (vc-buffer-context))) | |
446 | ;; Use save-excursion here, because it may be able to restore point | |
447 | ;; and mark properly even in cases where vc-restore-buffer-context | |
448 | ;; would fail. However, save-excursion might also get it wrong -- | |
449 | ;; in this case, vc-restore-buffer-context gives it a second try. | |
450 | (save-excursion | |
451 | ;; t means don't call normal-mode; | |
452 | ;; that's to preserve various minor modes. | |
453 | (revert-buffer arg no-confirm t)) | |
454 | (vc-restore-buffer-context context))) | |
455 | ||
456 | (defun vc-resynch-window (file &optional keep noquery) | |
457 | "If FILE is in the current buffer, either revert or unvisit it. | |
458 | The choice between revert (to see expanded keywords) and unvisit | |
459 | depends on KEEP. NOQUERY if non-nil inhibits confirmation for | |
460 | reverting. NOQUERY should be t *only* if it is known the only | |
461 | difference between the buffer and the file is due to | |
462 | modifications by the dispatcher client code, rather than user | |
463 | editing!" | |
464 | (and (string= buffer-file-name file) | |
465 | (if keep | |
466 | (progn | |
467 | (vc-revert-buffer-internal t noquery) | |
468 | ;; TODO: Adjusting view mode might no longer be necessary | |
469 | ;; after RMS change to files.el of 1999-08-08. Investigate | |
470 | ;; this when we install the new VC. | |
471 | (and view-read-only | |
472 | (if (file-writable-p file) | |
473 | (and view-mode | |
474 | (let ((view-old-buffer-read-only nil)) | |
475 | (view-mode-exit))) | |
476 | (and (not view-mode) | |
477 | (not (eq (get major-mode 'mode-class) 'special)) | |
478 | (view-mode-enter)))) | |
592da08e | 479 | (run-hook-with-args 'mode-line-hook buffer-file-name)) |
17f039f3 ER |
480 | (kill-buffer (current-buffer))))) |
481 | ||
74d0991f | 482 | (declare-function vc-dir-resynch-file "vc-dir" (&optional fname)) |
d923f4ac DN |
483 | (declare-function vc-string-prefix-p "vc" (prefix string)) |
484 | ||
485 | (defun vc-resynch-buffers-in-directory (directory &optional keep noquery) | |
486 | "Resync all buffers that visit files in DIRECTORY." | |
487 | (dolist (buffer (buffer-list)) | |
488 | (let ((fname (buffer-file-name buffer))) | |
489 | (when (and fname (vc-string-prefix-p directory fname)) | |
490 | (vc-resynch-buffer fname keep noquery))))) | |
74d0991f | 491 | |
17f039f3 ER |
492 | (defun vc-resynch-buffer (file &optional keep noquery) |
493 | "If FILE is currently visited, resynch its buffer." | |
494 | (if (string= buffer-file-name file) | |
495 | (vc-resynch-window file keep noquery) | |
d923f4ac DN |
496 | (if (file-directory-p file) |
497 | (vc-resynch-buffers-in-directory file keep noquery) | |
498 | (let ((buffer (get-file-buffer file))) | |
499 | (when buffer | |
500 | (with-current-buffer buffer | |
501 | (vc-resynch-window file keep noquery)))))) | |
e02d8ae7 DN |
502 | ;; Try to avoid unnecessary work, a *vc-dir* buffer is only present |
503 | ;; if this is true. | |
504 | (when (memq 'vc-dir-resynch-file after-save-hook) | |
505 | (vc-dir-resynch-file file))) | |
17f039f3 | 506 | |
dab68082 ER |
507 | (defun vc-buffer-sync (&optional not-urgent) |
508 | "Make sure the current buffer and its working file are in sync. | |
509 | NOT-URGENT means it is ok to continue if the user says not to save." | |
510 | (when (buffer-modified-p) | |
511 | (if (or vc-suppress-confirm | |
512 | (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name)))) | |
513 | (save-buffer) | |
514 | (unless not-urgent | |
515 | (error "Aborted"))))) | |
516 | ||
83affd96 ER |
517 | ;; Command closures |
518 | ||
dab68082 ER |
519 | ;; Set up key bindings for use while editing log messages |
520 | ||
521 | (defun vc-log-edit (fileset) | |
d536a904 | 522 | "Set up `log-edit' for use on FILE." |
dab68082 ER |
523 | (setq default-directory |
524 | (with-current-buffer vc-parent-buffer default-directory)) | |
525 | (log-edit 'vc-finish-logentry | |
526 | nil | |
527 | `((log-edit-listfun . (lambda () ',fileset)) | |
528 | (log-edit-diff-function . (lambda () (vc-diff nil))))) | |
529 | (set (make-local-variable 'vc-log-fileset) fileset) | |
530 | (make-local-variable 'vc-log-extra) | |
531 | (set-buffer-modified-p nil) | |
532 | (setq buffer-file-name nil)) | |
533 | ||
400aec1a | 534 | (defun vc-start-logentry (files extra comment initial-contents msg logbuf action &optional after-hook) |
83affd96 | 535 | "Accept a comment for an operation on FILES with extra data EXTRA. |
400aec1a | 536 | If COMMENT is nil, pop up a LOGBUF buffer, emit MSG, and set the |
83affd96 ER |
537 | action on close to ACTION. If COMMENT is a string and |
538 | INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial | |
539 | contents of the log entry buffer. If COMMENT is a string and | |
540 | INITIAL-CONTENTS is nil, do action immediately as if the user had | |
541 | entered COMMENT. If COMMENT is t, also do action immediately with an | |
542 | empty comment. Remember the file's buffer in `vc-parent-buffer' | |
543 | \(current one if no file). AFTER-HOOK specifies the local value | |
544 | for `vc-log-after-operation-hook'." | |
545 | (let ((parent | |
4903369a ER |
546 | (if (vc-dispatcher-browsing) |
547 | ;; If we are called from a directory browser, the parent buffer is | |
83affd96 ER |
548 | ;; the current buffer. |
549 | (current-buffer) | |
550 | (if (and files (equal (length files) 1)) | |
551 | (get-file-buffer (car files)) | |
552 | (current-buffer))))) | |
83affd96 | 553 | (if (and comment (not initial-contents)) |
400aec1a ER |
554 | (set-buffer (get-buffer-create logbuf)) |
555 | (pop-to-buffer (get-buffer-create logbuf))) | |
83affd96 ER |
556 | (set (make-local-variable 'vc-parent-buffer) parent) |
557 | (set (make-local-variable 'vc-parent-buffer-name) | |
558 | (concat " from " (buffer-name vc-parent-buffer))) | |
83affd96 ER |
559 | (vc-log-edit files) |
560 | (make-local-variable 'vc-log-after-operation-hook) | |
561 | (when after-hook | |
562 | (setq vc-log-after-operation-hook after-hook)) | |
563 | (setq vc-log-operation action) | |
564 | (setq vc-log-extra extra) | |
565 | (when comment | |
566 | (erase-buffer) | |
567 | (when (stringp comment) (insert comment))) | |
568 | (if (or (not comment) initial-contents) | |
569 | (message "%s Type C-c C-c when done" msg) | |
570 | (vc-finish-logentry (eq comment t))))) | |
571 | ||
74d0991f DN |
572 | (declare-function vc-dir-move-to-goal-column "vc-dir" ()) |
573 | ||
83affd96 ER |
574 | (defun vc-finish-logentry (&optional nocomment) |
575 | "Complete the operation implied by the current log entry. | |
576 | Use the contents of the current buffer as a check-in or registration | |
577 | comment. If the optional arg NOCOMMENT is non-nil, then don't check | |
578 | the buffer contents as a comment." | |
579 | (interactive) | |
580 | ;; Check and record the comment, if any. | |
581 | (unless nocomment | |
582 | (run-hooks 'vc-logentry-check-hook)) | |
583 | ;; Sync parent buffer in case the user modified it while editing the comment. | |
e02d8ae7 | 584 | ;; But not if it is a vc-dir buffer. |
83affd96 | 585 | (with-current-buffer vc-parent-buffer |
4903369a | 586 | (or (vc-dispatcher-browsing) (vc-buffer-sync))) |
83affd96 ER |
587 | (unless vc-log-operation |
588 | (error "No log operation is pending")) | |
589 | ;; save the parameters held in buffer-local variables | |
400aec1a ER |
590 | (let ((logbuf (current-buffer)) |
591 | (log-operation vc-log-operation) | |
83affd96 ER |
592 | (log-fileset vc-log-fileset) |
593 | (log-extra vc-log-extra) | |
594 | (log-entry (buffer-string)) | |
595 | (after-hook vc-log-after-operation-hook) | |
596 | (tmp-vc-parent-buffer vc-parent-buffer)) | |
597 | (pop-to-buffer vc-parent-buffer) | |
598 | ;; OK, do it to it | |
599 | (save-excursion | |
600 | (funcall log-operation | |
601 | log-fileset | |
602 | log-extra | |
603 | log-entry)) | |
604 | ;; Remove checkin window (after the checkin so that if that fails | |
e6d897b3 | 605 | ;; we don't zap the log buffer and the typing therein). |
83affd96 | 606 | ;; -- IMO this should be replaced with quit-window |
400aec1a ER |
607 | (cond ((and logbuf vc-delete-logbuf-window) |
608 | (delete-windows-on logbuf (selected-frame)) | |
609 | ;; Kill buffer and delete any other dedicated windows/frames. | |
610 | (kill-buffer logbuf)) | |
611 | (logbuf (pop-to-buffer logbuf) | |
612 | (bury-buffer) | |
613 | (pop-to-buffer tmp-vc-parent-buffer))) | |
83affd96 ER |
614 | ;; Now make sure we see the expanded headers |
615 | (when log-fileset | |
616 | (mapc | |
617 | (lambda (file) (vc-resynch-buffer file vc-keep-workfiles t)) | |
618 | log-fileset)) | |
4903369a | 619 | (when (vc-dispatcher-browsing) |
83affd96 ER |
620 | (vc-dir-move-to-goal-column)) |
621 | (run-hooks after-hook 'vc-finish-logentry-hook))) | |
622 | ||
b236ab0d ER |
623 | (defun vc-dispatcher-browsing () |
624 | "Are we in a directory browser buffer?" | |
8243c746 SM |
625 | (derived-mode-p 'vc-dir-mode)) |
626 | ||
74d0991f DN |
627 | ;; These are unused. |
628 | ;; (defun vc-dispatcher-in-fileset-p (fileset) | |
629 | ;; (let ((member nil)) | |
630 | ;; (while (and (not member) fileset) | |
631 | ;; (let ((elem (pop fileset))) | |
632 | ;; (if (if (file-directory-p elem) | |
633 | ;; (eq t (compare-strings buffer-file-name nil (length elem) | |
634 | ;; elem nil nil)) | |
635 | ;; (eq (current-buffer) (get-file-buffer elem))) | |
636 | ;; (setq member t)))) | |
637 | ;; member)) | |
638 | ||
639 | ;; (defun vc-dispatcher-selection-set (&optional observer) | |
640 | ;; "Deduce a set of files to which to apply an operation. Return a cons | |
641 | ;; cell (SELECTION . FILESET), where SELECTION is what the user chose | |
642 | ;; and FILES is the flist with any directories replaced by the listed files | |
643 | ;; within them. | |
644 | ||
645 | ;; If we're in a directory display, the fileset is the list of marked files (if | |
646 | ;; there is one) else the file on the current line. If not in a directory | |
647 | ;; display, but the current buffer visits a file, the fileset is a singleton | |
648 | ;; containing that file. Otherwise, throw an error." | |
649 | ;; (let ((selection | |
650 | ;; (cond | |
651 | ;; ;; Browsing with vc-dir | |
652 | ;; ((vc-dispatcher-browsing) | |
653 | ;; ;; If no files are marked, temporarily mark current file | |
654 | ;; ;; and choose on that basis (so we get subordinate files) | |
655 | ;; (if (not (vc-dir-marked-files)) | |
656 | ;; (prog2 | |
657 | ;; (vc-dir-mark-file) | |
658 | ;; (cons (vc-dir-marked-files) (vc-dir-marked-only-files)) | |
659 | ;; (vc-dir-unmark-all-files t)) | |
660 | ;; (cons (vc-dir-marked-files) (vc-dir-marked-only-files)))) | |
661 | ;; ;; Visiting an eligible file | |
662 | ;; ((buffer-file-name) | |
663 | ;; (cons (list buffer-file-name) (list buffer-file-name))) | |
664 | ;; ;; No eligible file -- if there's a parent buffer, deduce from there | |
665 | ;; ((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer) | |
666 | ;; (with-current-buffer vc-parent-buffer | |
667 | ;; (vc-dispatcher-browsing)))) | |
668 | ;; (with-current-buffer vc-parent-buffer | |
669 | ;; (vc-dispatcher-selection-set))) | |
670 | ;; ;; No good set here, throw error | |
671 | ;; (t (error "No fileset is available here"))))) | |
672 | ;; ;; We assume, in order to avoid unpleasant surprises to the user, | |
673 | ;; ;; that a fileset is not in good shape to be handed to the user if the | |
674 | ;; ;; buffers visiting the fileset don't match the on-disk contents. | |
675 | ;; (unless observer | |
676 | ;; (save-some-buffers | |
677 | ;; nil (lambda () (vc-dispatcher-in-fileset-p (cdr selection))))) | |
678 | ;; selection)) | |
b236ab0d | 679 | |
d9a3d80e DN |
680 | (provide 'vc-dispatcher) |
681 | ||
3eb20677 | 682 | ;; arch-tag: 7d08b17f-5470-4799-914b-bfb9fcf6a246 |
b1ddeeb7 | 683 | ;;; vc-dispatcher.el ends here |