From 62ccc42c60626e4816da02f1e1db89fa0fad156d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 26 Nov 2009 14:50:28 +0000 Subject: [PATCH] (vc-bzr-annotate-command): Make operation asynchronous. --- lisp/ChangeLog | 15 ++++++++++----- lisp/vc-bzr.el | 39 +++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81b22ead068..c437b242389 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-11-26 Stefan Monnier + + * vc-bzr.el (vc-bzr-annotate-command): Make operation asynchronous. + 2009-11-26 Dan Nicolaescu * finder.el (finder-mode-map): Add a menu. @@ -13,17 +17,18 @@ 2009-11-26 Wilson Snyder * verilog-mode.el (verilog-auto-insert-lisp, verilog-delete-auto) - (verilog-delete-empty-auto-pair, verilog-library-filenames): Fix - AUTOINSERTLISP to support insert-file. Reported by Clay Douglass. + (verilog-delete-empty-auto-pair, verilog-library-filenames): + Fix AUTOINSERTLISP to support insert-file. Reported by Clay Douglass. (verilog-auto-inst, verilog-auto-star-safe) - (verilog-delete-auto-star-implicit, verilog-read-sub-decls): Fix - removing "// Interfaces" when saving .* expansions. Reported by + (verilog-delete-auto-star-implicit, verilog-read-sub-decls): + Fix removing "// Interfaces" when saving .* expansions. Reported by Pierre-David Pfister. 2009-11-26 Glenn Morris - * eshell/em-dirs.el (eshell/cd): Don't throw to a tag outside the scope. + * eshell/em-dirs.el (eshell/cd): Don't throw to a tag outside + the scope. 2009-11-25 Johan Bockgård diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index a40aad73597..84153a29eb0 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -551,27 +551,34 @@ REV non-nil gets an error." "Prepare BUFFER for `vc-annotate' on FILE. Each line is tagged with the revision number, which has a `help-echo' property containing author and date information." - (apply #'vc-bzr-command "annotate" buffer 0 file "--long" "--all" + (apply #'vc-bzr-command "annotate" buffer 'async file "--long" "--all" (if revision (list "-r" revision))) - (with-current-buffer buffer - ;; Store the tags for the annotated source lines in a hash table - ;; to allow saving space by sharing the text properties. - (setq vc-bzr-annotation-table (make-hash-table :test 'equal)) - (goto-char (point-min)) - (while (re-search-forward "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\) |" - nil t) - (let* ((rev (match-string 1)) - (author (match-string 2)) - (date (match-string 3)) - (key (match-string 0)) - (tag (gethash key vc-bzr-annotation-table))) + (lexical-let ((table (make-hash-table :test 'equal))) + (set-process-filter + (get-buffer-process buffer) + (lambda (proc string) + (when (process-buffer proc) + (with-current-buffer (process-buffer proc) + (setq string (concat (process-get proc :vc-left-over) string)) + (while (string-match "^\\( *[0-9.]+ *\\) \\([^\n ]+\\) +\\([0-9]\\{8\\}\\)\\( |.*\n\\)" string) + (let* ((rev (match-string 1 string)) + (author (match-string 2 string)) + (date (match-string 3 string)) + (key (substring string (match-beginning 0) + (match-beginning 4))) + (line (match-string 4 string)) + (tag (gethash key table)) + (inhibit-read-only t)) + (setq string (substring string (match-end 0))) (unless tag (setq tag (propertize rev 'help-echo (concat "Author: " author ", date: " date) 'mouse-face 'highlight)) - (puthash key tag vc-bzr-annotation-table)) - (replace-match "") - (insert tag " |"))))) + (puthash key tag table)) + (goto-char (process-mark proc)) + (insert tag line) + (move-marker (process-mark proc) (point)))) + (process-put proc :vc-left-over string))))))) (declare-function vc-annotate-convert-time "vc-annotate" (time)) -- 2.11.4.GIT