Merge from gnulib
[emacs.git] / lisp / vc / vc-dispatcher.el
blobec55867fcfe0ad007c294dfcb623d6089cb16a2d
1 ;;; vc-dispatcher.el -- generic command-dispatcher facility. -*- lexical-binding: t -*-
3 ;; Copyright (C) 2008-2015 Free Software Foundation, Inc.
5 ;; Author: FSF (see below for full credits)
6 ;; Maintainer: Eric S. Raymond <esr@thyrsus.com>
7 ;; Keywords: vc tools
8 ;; Package: vc
10 ;; This file is part of GNU Emacs.
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation, either version 3 of the License, or
15 ;; (at your option) any later version.
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.
22 ;; You should have received a copy of the GNU General Public License
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
25 ;;; Credits:
27 ;; Designed and implemented by Eric S. Raymond, originally as part of VC mode.
28 ;; Stefan Monnier and Dan Nicolaescu contributed substantial work on the
29 ;; vc-dir front end.
31 ;;; Commentary:
33 ;; Goals:
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
39 ;; to version-control systems.
41 ;; vc-dispatcher.el is written to decouple the UI issues in such front
42 ;; ends from their application-specific logic. It also provides a
43 ;; service layer for running the slave commands either synchronously
44 ;; or asynchronously and managing the message/error logs from the
45 ;; command runs.
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.
54 ;; Dispatcher's universe:
56 ;; The universe consists of the file tree rooted at the current
57 ;; directory. The dispatcher's upper layer deduces some subset
58 ;; of the file tree from the state of the currently visited buffer
59 ;; and returns that subset, presumably to a client mode.
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.
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
68 ;; executed when the user types C-c to ship the buffer contents. In
69 ;; either case the command messages and error (if any) will remain
70 ;; available in a status buffer.
72 ;; Special behavior of dispatcher directory buffers:
74 ;; In dispatcher directory buffers, facilities to perform basic
75 ;; navigation and selection operations are provided by keymap and menu
76 ;; entries that dispatcher sets up itself, so they'll be uniform
77 ;; across all dispatcher-using client modes. Client modes are
78 ;; expected to append to these to provide mode-specific bindings.
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
83 ;; treat all entries with the same state as the currently selected one as
84 ;; a unit.
86 ;; The interface:
88 ;; The main interface to the lower level is vc-do-command. This launches a
89 ;; command, synchronously or asynchronously, making the output available
90 ;; in a command log buffer. Two other functions, (vc-start-logentry) and
91 ;; (vc-finish-logentry), allow you to associate a command closure with an
92 ;; annotation buffer so that when the user confirms the comment the closure
93 ;; is run (with the comment as part of its context).
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
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
102 ;; coincide.
104 ;; When the client mode adds a local vc-mode-line-hook to a buffer, it
105 ;; will be called with the buffer file name as argument whenever the
106 ;; dispatcher resyncs the buffer.
108 ;; To do:
110 ;; - log buffers need font-locking.
113 ;; General customization
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
117 dispatcher client mode imposes itself."
118 :type 'hook
119 :group 'vc)
121 (defcustom vc-delete-logbuf-window t
122 "If non-nil, delete the log buffer and window after each logical action.
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)
129 (defcustom vc-command-messages nil
130 "If non-nil, display run messages from back-end commands."
131 :type 'boolean
132 :group 'vc)
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)
139 ;; Variables the user doesn't need to know about.
141 (defvar vc-log-operation nil)
142 (defvar vc-log-after-operation-hook nil)
143 (defvar vc-log-fileset)
145 ;; In a log entry buffer, this is a local variable
146 ;; that points to the buffer for which it was made
147 ;; (either a file, or a directory buffer).
148 (defvar vc-parent-buffer nil)
149 (put 'vc-parent-buffer 'permanent-local t)
150 (defvar vc-parent-buffer-name nil)
151 (put 'vc-parent-buffer-name 'permanent-local t)
153 ;; Common command execution logic
155 (defun vc-process-filter (p s)
156 "An alternative output filter for async process P.
157 One difference with the default filter is that this inserts S after markers.
158 Another is that undo information is not kept."
159 (let ((buffer (process-buffer p)))
160 (when (buffer-live-p buffer)
161 (with-current-buffer buffer
162 (save-excursion
163 (let ((buffer-undo-list t)
164 (inhibit-read-only t))
165 (goto-char (process-mark p))
166 (insert s)
167 (set-marker (process-mark p) (point))))))))
169 (defun vc-setup-buffer (buf)
170 "Prepare BUF for executing a slave command and make it current."
171 (let ((camefrom (current-buffer))
172 (olddir default-directory))
173 (set-buffer (get-buffer-create buf))
174 (let ((oldproc (get-buffer-process (current-buffer))))
175 ;; If we wanted to wait for oldproc to finish before doing
176 ;; something, we'd have used vc-eval-after.
177 ;; Use `delete-process' rather than `kill-process' because we don't
178 ;; want any of its output to appear from now on.
179 (when oldproc (delete-process oldproc)))
180 (kill-all-local-variables)
181 (set (make-local-variable 'vc-parent-buffer) camefrom)
182 (set (make-local-variable 'vc-parent-buffer-name)
183 (concat " from " (buffer-name camefrom)))
184 (setq default-directory olddir)
185 (let ((buffer-undo-list t)
186 (inhibit-read-only t))
187 (erase-buffer))))
189 (defvar vc-sentinel-movepoint) ;Dynamically scoped.
191 (defun vc--process-sentinel (p code)
192 (let ((buf (process-buffer p)))
193 ;; Impatient users sometime kill "slow" buffers; check liveness
194 ;; to avoid "error in process sentinel: Selecting deleted buffer".
195 (when (buffer-live-p buf)
196 (with-current-buffer buf
197 (setq mode-line-process
198 (let ((status (process-status p)))
199 ;; Leave mode-line uncluttered, normally.
200 (unless (eq 'exit status)
201 (format " (%s)" status))))
202 (let (vc-sentinel-movepoint
203 (m (process-mark p)))
204 ;; Normally, we want async code such as sentinels to not move point.
205 (save-excursion
206 (goto-char m)
207 ;; Each sentinel may move point and the next one should be run
208 ;; at that new point. We could get the same result by having
209 ;; each sentinel read&set process-mark, but since `cmd' needs
210 ;; to work both for async and sync processes, this would be
211 ;; difficult to achieve.
212 (vc-exec-after code)
213 (move-marker m (point)))
214 ;; But sometimes the sentinels really want to move point.
215 (when vc-sentinel-movepoint
216 (let ((win (get-buffer-window (current-buffer) 0)))
217 (if (not win)
218 (goto-char vc-sentinel-movepoint)
219 (with-selected-window win
220 (goto-char vc-sentinel-movepoint))))))))))
222 (defun vc-set-mode-line-busy-indicator ()
223 (setq mode-line-process
224 (concat " " (propertize "[waiting...]"
225 'face 'mode-line-emphasis
226 'help-echo
227 "A command is in progress in this buffer"))))
229 (defun vc-exec-after (code)
230 "Eval CODE when the current buffer's process is done.
231 If the current buffer has no process, just evaluate CODE.
232 Else, add CODE to the process' sentinel.
233 CODE should be a function of no arguments."
234 (let ((proc (get-buffer-process (current-buffer))))
235 (cond
236 ;; If there's no background process, just execute the code.
237 ;; We used to explicitly call delete-process on exited processes,
238 ;; but this led to timing problems causing process output to be
239 ;; lost. Terminated processes get deleted automatically
240 ;; anyway. -- cyd
241 ((or (null proc) (eq (process-status proc) 'exit))
242 ;; Make sure we've read the process's output before going further.
243 (when proc (accept-process-output proc))
244 (if (functionp code) (funcall code) (eval code)))
245 ;; If a process is running, add CODE to the sentinel
246 ((eq (process-status proc) 'run)
247 (vc-set-mode-line-busy-indicator)
248 (letrec ((fun (lambda (p _msg)
249 (remove-function (process-sentinel p) fun)
250 (vc--process-sentinel p code))))
251 (add-function :after (process-sentinel proc) fun)))
252 (t (error "Unexpected process state"))))
253 nil)
255 (defmacro vc-run-delayed (&rest body)
256 (declare (indent 0) (debug t))
257 `(vc-exec-after (lambda () ,@body)))
259 (defvar vc-post-command-functions nil
260 "Hook run at the end of `vc-do-command'.
261 Each function is called inside the buffer in which the command was run
262 and is passed 3 arguments: the COMMAND, the FILES and the FLAGS.")
264 (defvar w32-quote-process-args)
266 (defun vc-delistify (filelist)
267 "Smash a FILELIST into a file list string suitable for info messages."
268 ;; FIXME what about file names with spaces?
269 (if (not filelist) "." (mapconcat 'identity filelist " ")))
271 ;;;###autoload
272 (defun vc-do-command (buffer okstatus command file-or-list &rest flags)
273 "Execute a slave command, notifying user and checking for errors.
274 Output from COMMAND goes to BUFFER, or the current buffer if
275 BUFFER is t. If the destination buffer is not already current,
276 set it up properly and erase it. The command is considered
277 successful if its exit status does not exceed OKSTATUS (if
278 OKSTATUS is nil, that means to ignore error status, if it is
279 `async', that means not to wait for termination of the
280 subprocess; if it is t it means to ignore all execution errors).
281 FILE-OR-LIST is the name of a working file; it may be a list of
282 files or be nil (to execute commands that don't expect a file
283 name or set of files). If an optional list of FLAGS is present,
284 that is inserted into the command line before the filename.
285 Return the return value of the slave command in the synchronous
286 case, and the process object in the asynchronous case."
287 ;; FIXME: file-relative-name can return a bogus result because
288 ;; it doesn't look at the actual file-system to see if symlinks
289 ;; come into play.
290 (let* ((files
291 (mapcar (lambda (f) (file-relative-name (expand-file-name f)))
292 (if (listp file-or-list) file-or-list (list file-or-list))))
293 (full-command
294 ;; What we're doing here is preparing a version of the command
295 ;; for display in a debug-progress message. If it's fewer than
296 ;; 20 characters display the entire command (without trailing
297 ;; newline). Otherwise display the first 20 followed by an ellipsis.
298 (concat (if (string= (substring command -1) "\n")
299 (substring command 0 -1)
300 command)
302 (vc-delistify (mapcar (lambda (s) (if (> (length s) 20) (concat (substring s 0 2) "...") s)) flags))
303 " " (vc-delistify files))))
304 (save-current-buffer
305 (unless (or (eq buffer t)
306 (and (stringp buffer)
307 (string= (buffer-name) buffer))
308 (eq buffer (current-buffer)))
309 (vc-setup-buffer buffer))
310 ;; If there's some previous async process still running, just kill it.
311 (let ((squeezed (remq nil flags))
312 (inhibit-read-only t)
313 (status 0))
314 (when files
315 (setq squeezed (nconc squeezed files)))
316 (let (;; Since some functions need to parse the output
317 ;; from external commands, set LC_MESSAGES to C.
318 (process-environment (cons "LC_MESSAGES=C" process-environment))
319 (w32-quote-process-args t))
320 (if (eq okstatus 'async)
321 ;; Run asynchronously.
322 (let ((proc
323 (let ((process-connection-type nil))
324 (apply 'start-file-process command (current-buffer)
325 command squeezed))))
326 (when vc-command-messages
327 (message "Running %s in background..." full-command))
328 ;; Get rid of the default message insertion, in case we don't
329 ;; set a sentinel explicitly.
330 (set-process-sentinel proc #'ignore)
331 (set-process-filter proc 'vc-process-filter)
332 (setq status proc)
333 (when vc-command-messages
334 (vc-run-delayed
335 (message "Running %s in background... done" full-command))))
336 ;; Run synchronously
337 (when vc-command-messages
338 (message "Running %s in foreground..." full-command))
339 (let ((buffer-undo-list t))
340 (setq status (apply 'process-file command nil t nil squeezed)))
341 (when (and (not (eq t okstatus))
342 (or (not (integerp status))
343 (and okstatus (< okstatus status))))
344 (unless (eq ?\s (aref (buffer-name (current-buffer)) 0))
345 (pop-to-buffer (current-buffer))
346 (goto-char (point-min))
347 (shrink-window-if-larger-than-buffer))
348 (error "Running %s...FAILED (%s)" full-command
349 (if (integerp status) (format "status %d" status) status)))
350 (when vc-command-messages
351 (message "Running %s...OK = %d" full-command status))))
352 (vc-run-delayed
353 (run-hook-with-args 'vc-post-command-functions
354 command file-or-list flags))
355 status))))
357 (defun vc-do-async-command (buffer root command &rest args)
358 "Run COMMAND asynchronously with ARGS, displaying the result.
359 Send the output to BUFFER, which should be a buffer or the name
360 of a buffer, which is created.
361 ROOT should be the directory in which the command should be run.
362 Display the buffer in some window, but don't select it."
363 (let* ((dir default-directory)
364 (inhibit-read-only t)
365 window new-window-start)
366 (setq buffer (get-buffer-create buffer))
367 (if (get-buffer-process buffer)
368 (error "Another VC action on %s is running" root))
369 (with-current-buffer buffer
370 (setq default-directory root)
371 (goto-char (point-max))
372 (unless (eq (point) (point-min))
373 (insert "\f\n"))
374 (setq new-window-start (point))
375 (insert "Running \"" command)
376 (dolist (arg args)
377 (insert " " arg))
378 (insert "\"...\n")
379 ;; Run in the original working directory.
380 (let ((default-directory dir))
381 (apply 'vc-do-command t 'async command nil args)))
382 (setq window (display-buffer buffer))
383 (if window
384 (set-window-start window new-window-start))
385 buffer))
387 (defvar compilation-error-regexp-alist)
389 (defun vc-compilation-mode (backend)
390 "Setup `compilation-mode' after with the appropriate `compilation-error-regexp-alist'."
391 (require 'compile)
392 (let* ((error-regexp-alist
393 (vc-make-backend-sym backend 'error-regexp-alist))
394 (error-regexp-alist (and (boundp error-regexp-alist)
395 (symbol-value error-regexp-alist))))
396 (let ((compilation-error-regexp-alist error-regexp-alist))
397 (compilation-mode))
398 (set (make-local-variable 'compilation-error-regexp-alist)
399 error-regexp-alist)))
401 (declare-function vc-dir-refresh "vc-dir" ())
403 (defun vc-set-async-update (process-buffer)
404 "Set a `vc-exec-after' action appropriate to the current buffer.
405 This action will update the current buffer after the current
406 asynchronous VC command has completed. PROCESS-BUFFER is the
407 buffer for the asynchronous VC process.
409 If the current buffer is a VC Dir buffer, call `vc-dir-refresh'.
410 If the current buffer is a Dired buffer, revert it."
411 (let* ((buf (current-buffer))
412 (tick (buffer-modified-tick buf)))
413 (cond
414 ((derived-mode-p 'vc-dir-mode)
415 (with-current-buffer process-buffer
416 (vc-run-delayed
417 (if (buffer-live-p buf)
418 (with-current-buffer buf
419 (vc-dir-refresh))))))
420 ((derived-mode-p 'dired-mode)
421 (with-current-buffer process-buffer
422 (vc-run-delayed
423 (and (buffer-live-p buf)
424 (= (buffer-modified-tick buf) tick)
425 (with-current-buffer buf
426 (revert-buffer)))))))))
428 ;; These functions are used to ensure that the view the user sees is up to date
429 ;; even if the dispatcher client mode has messed with file contents (as in,
430 ;; for example, VCS keyword expansion).
432 (declare-function view-mode-exit "view" (&optional exit-only exit-action all-win))
434 (defun vc-position-context (posn)
435 "Save a bit of the text around POSN in the current buffer.
436 Used to help us find the corresponding position again later
437 if markers are destroyed or corrupted."
438 ;; A lot of this was shamelessly lifted from Sebastian Kremer's
439 ;; rcs.el mode.
440 (list posn
441 (buffer-size)
442 (buffer-substring posn
443 (min (point-max) (+ posn 100)))))
445 (defun vc-find-position-by-context (context)
446 "Return the position of CONTEXT in the current buffer.
447 If CONTEXT cannot be found, return nil."
448 (let ((context-string (nth 2 context)))
449 (if (equal "" context-string)
450 (point-max)
451 (save-excursion
452 (let ((diff (- (nth 1 context) (buffer-size))))
453 (when (< diff 0) (setq diff (- diff)))
454 (goto-char (nth 0 context))
455 (if (or (search-forward context-string nil t)
456 ;; Can't use search-backward since the match may continue
457 ;; after point.
458 (progn (goto-char (- (point) diff (length context-string)))
459 ;; goto-char doesn't signal an error at
460 ;; beginning of buffer like backward-char would
461 (search-forward context-string nil t)))
462 ;; to beginning of OSTRING
463 (- (point) (length context-string))))))))
465 (defun vc-context-matches-p (posn context)
466 "Return t if POSN matches CONTEXT, nil otherwise."
467 (let* ((context-string (nth 2 context))
468 (len (length context-string))
469 (end (+ posn len)))
470 (if (> end (1+ (buffer-size)))
472 (string= context-string (buffer-substring posn end)))))
474 (defun vc-buffer-context ()
475 "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE).
476 Used by `vc-restore-buffer-context' to later restore the context."
477 (let ((point-context (vc-position-context (point)))
478 ;; Use mark-marker to avoid confusion in transient-mark-mode.
479 (mark-context (when (eq (marker-buffer (mark-marker)) (current-buffer))
480 (vc-position-context (mark-marker))))
481 ;; Make the right thing happen in transient-mark-mode.
482 (mark-active nil))
483 (list point-context mark-context)))
485 (defun vc-restore-buffer-context (context)
486 "Restore point/mark, and reparse any affected compilation buffers.
487 CONTEXT is that which `vc-buffer-context' returns."
488 (let ((point-context (nth 0 context))
489 (mark-context (nth 1 context)))
490 ;; if necessary, restore point and mark
491 (if (not (vc-context-matches-p (point) point-context))
492 (let ((new-point (vc-find-position-by-context point-context)))
493 (when new-point (goto-char new-point))))
494 (and mark-active
495 mark-context
496 (not (vc-context-matches-p (mark) mark-context))
497 (let ((new-mark (vc-find-position-by-context mark-context)))
498 (when new-mark (set-mark new-mark))))))
500 (defun vc-revert-buffer-internal (&optional arg no-confirm)
501 "Revert buffer, keeping point and mark where user expects them.
502 Try to be clever in the face of changes due to expanded version-control
503 key words. This is important for typeahead to work as expected.
504 ARG and NO-CONFIRM are passed on to `revert-buffer'."
505 (interactive "P")
506 (widen)
507 (let ((context (vc-buffer-context)))
508 ;; Use save-excursion here, because it may be able to restore point
509 ;; and mark properly even in cases where vc-restore-buffer-context
510 ;; would fail. However, save-excursion might also get it wrong --
511 ;; in this case, vc-restore-buffer-context gives it a second try.
512 (save-excursion
513 ;; t means don't call normal-mode;
514 ;; that's to preserve various minor modes.
515 (revert-buffer arg no-confirm t))
516 (vc-restore-buffer-context context)))
518 (defvar vc-mode-line-hook nil)
519 (make-variable-buffer-local 'vc-mode-line-hook)
520 (put 'vc-mode-line-hook 'permanent-local t)
522 (defvar view-old-buffer-read-only)
524 (defun vc-resynch-window (file &optional keep noquery reset-vc-info)
525 "If FILE is in the current buffer, either revert or unvisit it.
526 The choice between revert (to see expanded keywords) and unvisit
527 depends on KEEP. NOQUERY if non-nil inhibits confirmation for
528 reverting. NOQUERY should be t *only* if it is known the only
529 difference between the buffer and the file is due to
530 modifications by the dispatcher client code, rather than user
531 editing!"
532 (and (string= buffer-file-name file)
533 (if keep
534 (when (file-exists-p file)
535 (when reset-vc-info
536 (vc-file-clearprops file))
537 (vc-revert-buffer-internal t noquery)
539 ;; VC operations might toggle the read-only state. In
540 ;; that case we need to adjust the `view-mode' status
541 ;; when `view-read-only' is non-nil.
542 (and view-read-only
543 (if (file-writable-p file)
544 (and view-mode
545 (let ((view-old-buffer-read-only nil))
546 (view-mode-exit t)))
547 (and (not view-mode)
548 (not (eq (get major-mode 'mode-class) 'special))
549 (view-mode-enter))))
551 ;; FIXME: Why use a hook? Why pass it buffer-file-name?
552 (run-hook-with-args 'vc-mode-line-hook buffer-file-name))
553 (kill-buffer (current-buffer)))))
555 (declare-function vc-dir-resynch-file "vc-dir" (&optional fname))
557 (defun vc-resynch-buffers-in-directory (directory &optional keep noquery reset-vc-info)
558 "Resync all buffers that visit files in DIRECTORY."
559 (dolist (buffer (buffer-list))
560 (let ((fname (buffer-file-name buffer)))
561 (when (and fname (string-prefix-p directory fname))
562 (with-current-buffer buffer
563 (vc-resynch-buffer fname keep noquery reset-vc-info))))))
565 (defun vc-resynch-buffer (file &optional keep noquery reset-vc-info)
566 "If FILE is currently visited, resynch its buffer."
567 (if (string= buffer-file-name file)
568 (vc-resynch-window file keep noquery reset-vc-info)
569 (if (file-directory-p file)
570 (vc-resynch-buffers-in-directory file keep noquery reset-vc-info)
571 (let ((buffer (get-file-buffer file)))
572 (when buffer
573 (with-current-buffer buffer
574 (vc-resynch-window file keep noquery reset-vc-info))))))
575 ;; Try to avoid unnecessary work, a *vc-dir* buffer is only present
576 ;; if this is true.
577 (when vc-dir-buffers
578 (vc-dir-resynch-file file)))
580 (defun vc-buffer-sync (&optional not-urgent)
581 "Make sure the current buffer and its working file are in sync.
582 NOT-URGENT means it is ok to continue if the user says not to save."
583 (when (buffer-modified-p)
584 (if (or vc-suppress-confirm
585 (y-or-n-p (format "Buffer %s modified; save it? " (buffer-name))))
586 (save-buffer)
587 (unless not-urgent
588 (error "Aborted")))))
590 ;; Command closures
592 ;; Set up key bindings for use while editing log messages
594 (declare-function log-edit-empty-buffer-p "log-edit" ())
596 (defun vc-log-edit (fileset mode backend)
597 "Set up `log-edit' for use on FILE."
598 (setq default-directory
599 (buffer-local-value 'default-directory vc-parent-buffer))
600 (require 'log-edit)
601 (log-edit 'vc-finish-logentry
602 ;; Setup a new log message if the log buffer is "empty",
603 ;; or was previously used for a different set of files.
604 (or (log-edit-empty-buffer-p)
605 (and (local-variable-p 'vc-log-fileset)
606 (not (equal vc-log-fileset fileset))))
607 `((log-edit-listfun
608 . (lambda ()
609 ;; FIXME: When fileset includes directories, and
610 ;; there are relevant ChangeLog files inside their
611 ;; children, we don't find them. Either handle it
612 ;; in `log-edit-insert-changelog-entries' by
613 ;; walking down the file trees, or somehow pass
614 ;; `fileset-only-files' from `vc-next-action'
615 ;; through to this function.
616 (let ((root (vc-root-dir)))
617 ;; Returns paths relative to the root, so that
618 ;; `log-edit-changelog-insert-entries'
619 ;; substitutes them in correctly later, even when
620 ;; `vc-checkin' was called from a file buffer, or
621 ;; a non-root VC-Dir buffer.
622 (mapcar
623 (lambda (file) (file-relative-name file root))
624 ',fileset))))
625 (log-edit-diff-function . vc-diff)
626 (log-edit-vc-backend . ,backend)
627 (vc-log-fileset . ,fileset))
629 mode)
630 (set-buffer-modified-p nil)
631 (setq buffer-file-name nil))
633 (defun vc-start-logentry (files comment initial-contents msg logbuf mode action &optional after-hook backend)
634 "Accept a comment for an operation on FILES.
635 If COMMENT is nil, pop up a LOGBUF buffer, emit MSG, and set the
636 action on close to ACTION. If COMMENT is a string and
637 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial
638 contents of the log entry buffer. If COMMENT is a string and
639 INITIAL-CONTENTS is nil, do action immediately as if the user had
640 entered COMMENT. If COMMENT is t, also do action immediately with an
641 empty comment. Remember the file's buffer in `vc-parent-buffer'
642 \(current one if no file). Puts the log-entry buffer in major-mode
643 MODE, defaulting to `log-edit-mode' if MODE is nil.
644 AFTER-HOOK specifies the local value for `vc-log-after-operation-hook'.
645 BACKEND, if non-nil, specifies a VC backend for the Log Edit buffer."
646 (let ((parent
647 (if (vc-dispatcher-browsing)
648 ;; If we are called from a directory browser, the parent buffer is
649 ;; the current buffer.
650 (current-buffer)
651 (if (and files (equal (length files) 1))
652 (get-file-buffer (car files))
653 (current-buffer)))))
654 (if (and comment (not initial-contents))
655 (set-buffer (get-buffer-create logbuf))
656 (pop-to-buffer (get-buffer-create logbuf)))
657 (set (make-local-variable 'vc-parent-buffer) parent)
658 (set (make-local-variable 'vc-parent-buffer-name)
659 (concat " from " (buffer-name vc-parent-buffer)))
660 (vc-log-edit files mode backend)
661 (make-local-variable 'vc-log-after-operation-hook)
662 (when after-hook
663 (setq vc-log-after-operation-hook after-hook))
664 (setq vc-log-operation action)
665 (when comment
666 (erase-buffer)
667 (when (stringp comment) (insert comment)))
668 (if (or (not comment) initial-contents)
669 (message "%s Type C-c C-c when done" msg)
670 (vc-finish-logentry (eq comment t)))))
672 (declare-function vc-dir-move-to-goal-column "vc-dir" ())
673 ;; vc-finish-logentry is typically called from a log-edit buffer (see
674 ;; vc-start-logentry).
675 (defun vc-finish-logentry (&optional nocomment)
676 "Complete the operation implied by the current log entry.
677 Use the contents of the current buffer as a check-in or registration
678 comment. If the optional arg NOCOMMENT is non-nil, then don't check
679 the buffer contents as a comment."
680 (interactive)
681 ;; Check and record the comment, if any.
682 (unless nocomment
683 (run-hooks 'vc-logentry-check-hook))
684 ;; Sync parent buffer in case the user modified it while editing the comment.
685 ;; But not if it is a vc-dir buffer.
686 (with-current-buffer vc-parent-buffer
687 (or (vc-dispatcher-browsing) (vc-buffer-sync)))
688 (unless vc-log-operation
689 (error "No log operation is pending"))
691 ;; save the parameters held in buffer-local variables
692 (let ((logbuf (current-buffer))
693 (log-operation vc-log-operation)
694 ;; FIXME: When coming from VC-Dir, we should check that the
695 ;; set of selected files is still equal to vc-log-fileset,
696 ;; to avoid surprises.
697 (log-fileset vc-log-fileset)
698 (log-entry (buffer-string))
699 (after-hook vc-log-after-operation-hook))
700 (pop-to-buffer vc-parent-buffer)
701 ;; OK, do it to it
702 (save-excursion
703 (funcall log-operation
704 log-fileset
705 log-entry))
707 ;; Quit windows on logbuf.
708 (cond
709 ((not logbuf))
710 (vc-delete-logbuf-window
711 (quit-windows-on logbuf t (selected-frame)))
713 (quit-windows-on logbuf nil 0)))
715 ;; Now make sure we see the expanded headers
716 (when log-fileset
717 (mapc
718 (lambda (file) (vc-resynch-buffer file t t))
719 log-fileset))
720 (when (vc-dispatcher-browsing)
721 (vc-dir-move-to-goal-column))
722 (run-hooks after-hook 'vc-finish-logentry-hook)))
724 (defun vc-dispatcher-browsing ()
725 "Are we in a directory browser buffer?"
726 (derived-mode-p 'vc-dir-mode))
728 ;; These are unused.
729 ;; (defun vc-dispatcher-in-fileset-p (fileset)
730 ;; (let ((member nil))
731 ;; (while (and (not member) fileset)
732 ;; (let ((elem (pop fileset)))
733 ;; (if (if (file-directory-p elem)
734 ;; (eq t (compare-strings buffer-file-name nil (length elem)
735 ;; elem nil nil))
736 ;; (eq (current-buffer) (get-file-buffer elem)))
737 ;; (setq member t))))
738 ;; member))
740 ;; (defun vc-dispatcher-selection-set (&optional observer)
741 ;; "Deduce a set of files to which to apply an operation. Return a cons
742 ;; cell (SELECTION . FILESET), where SELECTION is what the user chose
743 ;; and FILES is the flist with any directories replaced by the listed files
744 ;; within them.
746 ;; If we're in a directory display, the fileset is the list of marked files (if
747 ;; there is one) else the file on the current line. If not in a directory
748 ;; display, but the current buffer visits a file, the fileset is a singleton
749 ;; containing that file. Otherwise, throw an error."
750 ;; (let ((selection
751 ;; (cond
752 ;; ;; Browsing with vc-dir
753 ;; ((vc-dispatcher-browsing)
754 ;; ;; If no files are marked, temporarily mark current file
755 ;; ;; and choose on that basis (so we get subordinate files)
756 ;; (if (not (vc-dir-marked-files))
757 ;; (prog2
758 ;; (vc-dir-mark-file)
759 ;; (cons (vc-dir-marked-files) (vc-dir-marked-only-files))
760 ;; (vc-dir-unmark-all-files t))
761 ;; (cons (vc-dir-marked-files) (vc-dir-marked-only-files))))
762 ;; ;; Visiting an eligible file
763 ;; ((buffer-file-name)
764 ;; (cons (list buffer-file-name) (list buffer-file-name)))
765 ;; ;; No eligible file -- if there's a parent buffer, deduce from there
766 ;; ((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer)
767 ;; (with-current-buffer vc-parent-buffer
768 ;; (vc-dispatcher-browsing))))
769 ;; (with-current-buffer vc-parent-buffer
770 ;; (vc-dispatcher-selection-set)))
771 ;; ;; No good set here, throw error
772 ;; (t (error "No fileset is available here")))))
773 ;; ;; We assume, in order to avoid unpleasant surprises to the user,
774 ;; ;; that a fileset is not in good shape to be handed to the user if the
775 ;; ;; buffers visiting the fileset don't match the on-disk contents.
776 ;; (unless observer
777 ;; (save-some-buffers
778 ;; nil (lambda () (vc-dispatcher-in-fileset-p (cdr selection)))))
779 ;; selection))
781 (provide 'vc-dispatcher)
783 ;;; vc-dispatcher.el ends here