Mercurial > emacs
diff lisp/vc.el @ 92093:a0193ceeaa83
* vc.el (vc-exec-after): Move setting mode-line-process in the
busy case ...
(vc-set-mode-line-busy-indicator): ... in this new function.
(vc-status-refresh): Call vc-set-mode-line-busy-indicator.
(vc-update-vc-status-buffer): Reset mode-line-process.
(vc-status-mark-all-files, vc-status-unmark-all-files): Change to
mark/unmark all the files with the same state as the current one.
With a prefix argument mark/unmark all files.
(vc-status-mode-menu): Adjust strings.
(vc-update-vc-status-buffer): Only do something when the argument
is not nil.
(vc-status-kill-dir-status-process): New function.
(vc-status-mode-map): Bind it.
(vc-status-process-buffer): New variable.
(vc-status-mode): Make it local.
(vc-status-refresh): Set it.
* vc-hg.el (vc-hg-dir-status):
* vc-git.el (vc-git-dir-status):
* vc-svn.el (vc-svn-dir-status): Return the buffer in which the
command is run.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Fri, 22 Feb 2008 07:44:08 +0000 |
parents | f6aa0a65fa82 |
children | 74bf6df13b6c |
line wrap: on
line diff
--- a/lisp/vc.el Fri Feb 22 05:02:59 2008 +0000 +++ b/lisp/vc.el Fri Feb 22 07:44:08 2008 +0000 @@ -174,6 +174,8 @@ ;; this list, it should be run asynchronously. When RESULT is ;; computed, it should be passed back by doing: ;; (funcall UPDATE-FUNCTION RESULT STATUS-BUFFER) +;; Return the buffer used for the asynchronous call. This buffer +;; is used to kill the status update process on demand. ;; This function is used by vc-status, a replacement for vc-dired. ;; vc-status is still under development, and is NOT feature ;; complete. As such, the requirements for this function might @@ -2715,6 +2717,7 @@ (define-key map "o" 'vc-status-find-file-other-window) (define-key map "q" 'bury-buffer) (define-key map "g" 'vc-status-refresh) + (define-key map "\C-c\C-c" 'vc-status-kill-dir-status-process) ;; Not working yet. Functions like vc-status-find-file need to ;; find the file from the mouse position, not `point'. ;; (define-key map [(down-mouse-3)] 'vc-status-menu) @@ -2785,6 +2788,9 @@ (interactive "e") (popup-menu vc-status-mode-menu e)) +(defvar vc-status-process-buffer nil + "The buffer used for the asynchronous call that computes the VC status.") + (defun vc-status-mode () "Major mode for VC status. \\{vc-status-mode-map}" @@ -2796,6 +2802,7 @@ (backend (vc-responsible-backend default-directory)) entries) (erase-buffer) + (set (make-local-variable 'vc-status-process-buffer) nil) (set (make-local-variable 'vc-status) (ewoc-create #'vc-status-printer (vc-status-headers backend default-directory))) @@ -2805,10 +2812,11 @@ (defun vc-update-vc-status-buffer (entries buffer) (with-current-buffer buffer - (dolist (entry entries) - (ewoc-enter-last vc-status - (vc-status-create-fileinfo (cdr entry) (car entry)))) - (ewoc-goto-node vc-status (ewoc-nth vc-status 0)) + (when entries + (dolist (entry entries) + (ewoc-enter-last vc-status + (vc-status-create-fileinfo (cdr entry) (car entry)))) + (ewoc-goto-node vc-status (ewoc-nth vc-status 0))) (setq mode-line-process nil))) (defun vc-status-refresh () @@ -2822,9 +2830,19 @@ ;; be asynchronous. It should compute the results and call the ;; function passed as a an arg to update the vc-status buffer with ;; the results. - (vc-call-backend - backend 'dir-status default-directory - #'vc-update-vc-status-buffer (current-buffer)))) + (setq vc-status-process-buffer + (vc-call-backend + backend 'dir-status default-directory + #'vc-update-vc-status-buffer (current-buffer))))) + +(defun vc-status-kill-dir-status-process () + "Kill the temporary buffer and associated process." + (interactive) + (when (and (bufferp vc-status-process-buffer) + (buffer-live-p vc-status-process-buffer)) + (let ((proc (get-buffer-process vc-status-process-buffer))) + (when proc (delete-process proc)) + (setq mode-line-process nil)))) (defun vc-status-next-line (arg) "Go to the next line.