diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-11-17 19:36:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-11-17 19:36:29 +0200 |
| commit | 67a22c6062fdaff39c27611d21cd5866661f8e15 (patch) | |
| tree | 1fd5c36c012a81b74c1fb55f0b62594b59835b50 | |
| parent | 2e007571951887a94daad3a46ec3380ab83497b4 (diff) | |
| download | emacs-67a22c6062fdaff39c27611d21cd5866661f8e15.tar.gz | |
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.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc/vc-bzr.el | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d47a97f73ec..54df183c92a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-11-17 Eli Zaretskii <eliz@gnu.org> + + * 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 <fgallina@gnu.org> * 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 0730a9c72ce..e607f9d8d1a 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. |