diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-07-27 17:50:22 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-07-27 17:50:22 +0000 |
| commit | 1c0f0c3b5b5df332210f49e6c08fd73474f3655c (patch) | |
| tree | 0b0fdb3c4d0797d6fdef5a029025db5dbb30bba7 /lisp | |
| parent | d43c2b06cdf05b9e5d0d9f4785e6465cfdd44fe6 (diff) | |
| download | emacs-1c0f0c3b5b5df332210f49e6c08fd73474f3655c.tar.gz | |
(vc-bzr-print-log): Pass multiple arguments to bzr log.
(vc-bzr-log-view-mode): Adjust log-view-file-re.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 17 |
2 files changed, 9 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5053ea60b06..1b9f56415dc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-07-27 Dan Nicolaescu <dann@ics.uci.edu> + * vc-bzr.el (vc-bzr-print-log): Pass multiple arguments to bzr log. + (vc-bzr-log-view-mode): Adjust log-view-file-re. + * add-log.el (change-log-mode-map): Add a menu. 2009-07-27 Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 9ad346f1e12..b97190056b4 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -457,7 +457,7 @@ REV non-nil gets an error." (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack. (require 'add-log) (set (make-local-variable 'log-view-per-file-logs) nil) - (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)") + (set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-message-re) "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)") (set (make-local-variable 'log-view-font-lock-keywords) @@ -481,16 +481,11 @@ REV non-nil gets an error." ;; FIXME: `vc-bzr-command' runs `bzr log' with `LC_MESSAGES=C', so ;; the log display may not what the user wants - but I see no other ;; way of getting the above regexps working. - (dolist (file files) - (vc-exec-after - `(let ((inhibit-read-only t)) - (with-current-buffer buffer - ;; Insert the file name so that log-view.el can find it. - (insert "Working file: " ',file "\n")) ;; Like RCS/CVS. - (apply 'vc-bzr-command "log" ',buffer 'async ',file - ',(if (stringp vc-bzr-log-switches) - (list vc-bzr-log-switches) - vc-bzr-log-switches)))))) + (with-current-buffer buffer + (apply 'vc-bzr-command "log" buffer 'async files + (if (stringp vc-bzr-log-switches) + (list vc-bzr-log-switches) + vc-bzr-log-switches)))) (defun vc-bzr-show-log-entry (revision) "Find entry for patch name REVISION in bzr change log buffer." |