mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 03:20:39 -08:00
Code Issues Projects Releases Wiki Activity

(vc-bzr-print-log): Use the more compact --line option

Browse source 
for the short log.
(vc-bzr-log-view-mode): Adjust regexp for the above change.
This commit is contained in:
Dan Nicolaescu 2010-01-24 22:03:23 -08:00
parent 6a6d15ab4f
commit 755da7fa20
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
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>
* progmodes/python.el: Replace reference to obsolete

4
lisp/vc-bzr.el
View file

@ -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-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 @@ REV non-nil gets an error."
(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)