[Emacs-diffs] [emacs] 01/01: Don't assume "bzr log" uses --long format by default.

[Eli Zaretskii]

branch: emacs-24
commit 67a22c6062fdaff39c27611d21cd5866661f8e15
Author: Eli Zaretskii <address@hidden>
Date:   Mon Nov 17 19:36:29 2014 +0200

    Don't assume "bzr log" uses --long format by default.
    
     lisp/vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
     Don't assume --long is the default for "bzr log", always specify
     it explicitly, in case the user defined an alias for 'log' that
     uses some other format.
---
 lisp/ChangeLog    |    7 +++++++
 lisp/vc/vc-bzr.el |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d47a97f..54df183 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-17  Eli Zaretskii  <address@hidden>
+
+       * vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
+       Don't assume --long is the default for "bzr log", always specify
+       it explicitly, in case the user defined an alias for 'log' that
+       uses some other format.
+
 2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (python-eldoc--get-doc-at-point): Strip
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 0730a9c..e607f9d 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -722,7 +722,7 @@ If LIMIT is non-nil, show no more than this many entries."
   (with-current-buffer buffer
     (apply 'vc-bzr-command "log" buffer 'async files
           (append
-           (when shortlog '("--line"))
+           (if shortlog '("--line") '("--long"))
            ;; The extra complications here when start-revision and limit
            ;; are set are due to bzr log's --forward argument, which
            ;; could be enabled via an alias in bazaar.conf.
@@ -757,7 +757,7 @@ If LIMIT is non-nil, show no more than this many entries."
 (defun vc-bzr-expanded-log-entry (revision)
   (with-temp-buffer
     (apply 'vc-bzr-command "log" t nil nil
-          (list (format "-r%s" revision)))
+          (list "--long" (format "-r%s" revision)))
     (goto-char (point-min))
     (when (looking-at "^-+\n")
       ;; Indent the expanded log entry.