Mercurial > emacs

comparison lisp/vc-bzr.el @ 106985:e9c454218ac8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sun, 24 Jan 2010 22:03:23 -0800
parents 38312121c181
children 6791d69ed71e
comparison
equal deleted inserted replaced
106984:61edd42cf483 106985:e9c454218ac8
485 (require 'add-log) 485 (require 'add-log)
486 (set (make-local-variable 'log-view-per-file-logs) nil) 486 (set (make-local-variable 'log-view-per-file-logs) nil)
487 (set (make-local-variable 'log-view-file-re) "\\`a\\`") 487 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
488 (set (make-local-variable 'log-view-message-re) 488 (set (make-local-variable 'log-view-message-re)
489 (if vc-short-log 489 (if vc-short-log
490 "^ *\\([0-9.]+\\) \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?" 490 "^ *\\([0-9.]+\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
491 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)")) 491 "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
492 (set (make-local-variable 'log-view-font-lock-keywords) 492 (set (make-local-variable 'log-view-font-lock-keywords)
493 ;; log-view-font-lock-keywords is careful to use the buffer-local 493 ;; log-view-font-lock-keywords is careful to use the buffer-local
494 ;; value of log-view-message-re only since Emacs-23. 494 ;; value of log-view-message-re only since Emacs-23.
495 (if vc-short-log 495 (if vc-short-log
517 ;; the log display may not what the user wants - but I see no other 517 ;; the log display may not what the user wants - but I see no other
518 ;; way of getting the above regexps working. 518 ;; way of getting the above regexps working.
519 (with-current-buffer buffer 519 (with-current-buffer buffer
520 (apply 'vc-bzr-command "log" buffer 'async files 520 (apply 'vc-bzr-command "log" buffer 'async files
521 (append 521 (append
522 (when shortlog '("--short")) 522 (when shortlog '("--line"))
523 (when start-revision (list (format "-r..%s" start-revision))) 523 (when start-revision (list (format "-r..%s" start-revision)))
524 (when limit (list "-l" (format "%s" limit))) 524 (when limit (list "-l" (format "%s" limit)))
525 (if (stringp vc-bzr-log-switches) 525 (if (stringp vc-bzr-log-switches)
526 (list vc-bzr-log-switches) 526 (list vc-bzr-log-switches)
527 vc-bzr-log-switches))))) 527 vc-bzr-log-switches)))))