[Emacs-diffs] emacs/lisp ChangeLog vc-bzr.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/07/27 17:50:27

Modified files:
        lisp           : ChangeLog vc-bzr.el 

Log message:
        (vc-bzr-print-log): Pass multiple arguments to bzr log.
        (vc-bzr-log-view-mode): Adjust log-view-file-re.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15862&r2=1.15863
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-bzr.el?cvsroot=emacs&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15862
retrieving revision 1.15863
diff -u -b -r1.15862 -r1.15863
--- ChangeLog   27 Jul 2009 17:41:38 -0000      1.15862
+++ ChangeLog   27 Jul 2009 17:50:22 -0000      1.15863
@@ -1,5 +1,8 @@
 2009-07-27  Dan Nicolaescu  <address@hidden>
 
+       * 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  <address@hidden>

Index: vc-bzr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-bzr.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- vc-bzr.el   17 May 2009 03:38:44 -0000      1.78
+++ vc-bzr.el   27 Jul 2009 17:50:27 -0000      1.79
@@ -457,7 +457,7 @@
   (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 @@
   ;; 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)
+    (apply 'vc-bzr-command "log" buffer 'async files
+          (if (stringp vc-bzr-log-switches)
                      (list vc-bzr-log-switches)
-                   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."