(vc-bzr-log-view-mode): "." can be part of a revno.

(vc-bzr-show-log-entry): Make regexp match more cases.
(vc-diff-switches-list): Remove autoload, not needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75913bef6c4f63b3846b1cca8cab2d9808aaf417..07eb1fb2f44e550300e7c6bebf8125c2c32dfcd6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-14  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-bzr.el (vc-bzr-log-view-mode): "." can be part of a revno.
+       (vc-bzr-show-log-entry): Make regexp match more cases.
+       (vc-diff-switches-list): Remove autoload, not needed.
+
 2008-03-14  Juri Linkov  <juri@jurta.org>
 
        * isearch.el (isearch-edit-string): Remove one call to

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index e126296d77913ec9817035b52b5b39d448f22ae2..8e91c5c1b4df28b7d631fa0b2654bbdb9c216166 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -378,7 +378,7 @@ EDITABLE is ignored."
   ;; Don't have file markers, so use impossible regexp.
   (set (make-local-variable 'log-view-file-re) "\\'\\`")
   (set (make-local-variable 'log-view-message-re)
-       "^ *-+\n *\\(?:revno: \\([0-9]+\\)\\|merged: .+\\)")
+       "^ *-+\n *\\(?: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
        ;; value of log-view-message-re only since Emacs-23.
@@ -408,12 +408,15 @@ EDITABLE is ignored."
   "Find entry for patch name REVISION in bzr change log buffer."
   (goto-char (point-min))
   (let (case-fold-search)
-    (if (re-search-forward (concat "^-+\nrevno: " revision "$") nil t)
+    (if (re-search-forward
+        ;; "revno:" can appear either at the beginning of a line, or indented.
+        (concat "^[ ]*-+\n[ ]*revno: " 
+                ;; The revision can contain ".", quote it so that it
+                ;; does not interfere with regexp matching.
+                (regexp-quote revision) "$") nil t)
         (beginning-of-line 0)
       (goto-char (point-min)))))
 
-(autoload 'vc-diff-switches-list "vc" nil nil t)
-
 (defun vc-bzr-diff (files &optional rev1 rev2 buffer)
   "VC bzr backend for diff."
   ;; `bzr diff' exits with code 1 if diff is non-empty