[Emacs-diffs] /srv/bzr/emacs/trunk r99382: (vc-bzr-print-log): Use the more compact --line option

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99382
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-01-24 22:03:23 -0800
message:
  (vc-bzr-print-log): Use the more compact --line option
  for the short log.
  (vc-bzr-log-view-mode): Adjust regexp for the above change.
modified:
  lisp/ChangeLog
  lisp/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-25 05:03:35 +0000
+++ b/lisp/ChangeLog    2010-01-25 06:03:23 +0000
@@ -1,3 +1,9 @@
+2010-01-25  Dan Nicolaescu  <address@hidden>
+
+       * vc-bzr.el (vc-bzr-print-log): Use the more compact --line option
+       for the short log.
+       (vc-bzr-log-view-mode): Adjust regexp for the above change.
+
 2010-01-25  Mark A. Hershberger  <address@hidden>
 
        * progmodes/python.el: Replace reference to obsolete

=== modified file 'lisp/vc-bzr.el'
--- a/lisp/vc-bzr.el    2010-01-25 05:02:10 +0000
+++ b/lisp/vc-bzr.el    2010-01-25 06:03:23 +0000
@@ -487,7 +487,7 @@
   (set (make-local-variable 'log-view-file-re) "\\`a\\`")
   (set (make-local-variable 'log-view-message-re)
        (if vc-short-log
-          "^ *\\([0-9.]+\\) \\(.*?\\)[ 
\t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
+          "^ *\\([0-9.]+\\): \\(.*?\\)[ 
\t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
         "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
   (set (make-local-variable 'log-view-font-lock-keywords)
        ;; log-view-font-lock-keywords is careful to use the buffer-local
@@ -519,7 +519,7 @@
   (with-current-buffer buffer
     (apply 'vc-bzr-command "log" buffer 'async files
           (append
-           (when shortlog '("--short"))
+           (when shortlog '("--line"))
            (when start-revision (list (format "-r..%s" start-revision)))
            (when limit (list "-l" (format "%s" limit)))
            (if (stringp vc-bzr-log-switches)