Commit 755da7fa authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

(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.
parent 6a6d15ab
2010-01-25 Dan Nicolaescu <dann@ics.uci.edu>
* 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 <mah@everybody.org> 2010-01-25 Mark A. Hershberger <mah@everybody.org>
* progmodes/python.el: Replace reference to obsolete * progmodes/python.el: Replace reference to obsolete
......
...@@ -487,7 +487,7 @@ REV non-nil gets an error." ...@@ -487,7 +487,7 @@ REV non-nil gets an error."
(set (make-local-variable 'log-view-file-re) "\\`a\\`") (set (make-local-variable 'log-view-file-re) "\\`a\\`")
(set (make-local-variable 'log-view-message-re) (set (make-local-variable 'log-view-message-re)
(if vc-short-log (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: .+\\)")) "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
(set (make-local-variable 'log-view-font-lock-keywords) (set (make-local-variable 'log-view-font-lock-keywords)
;; log-view-font-lock-keywords is careful to use the buffer-local ;; log-view-font-lock-keywords is careful to use the buffer-local
...@@ -519,7 +519,7 @@ REV non-nil gets an error." ...@@ -519,7 +519,7 @@ REV non-nil gets an error."
(with-current-buffer buffer (with-current-buffer buffer
(apply 'vc-bzr-command "log" buffer 'async files (apply 'vc-bzr-command "log" buffer 'async files
(append (append
(when shortlog '("--short")) (when shortlog '("--line"))
(when start-revision (list (format "-r..%s" start-revision))) (when start-revision (list (format "-r..%s" start-revision)))
(when limit (list "-l" (format "%s" limit))) (when limit (list "-l" (format "%s" limit)))
(if (stringp vc-bzr-log-switches) (if (stringp vc-bzr-log-switches)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment