lisp/vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb7272ded5805c6dc121aa9f5727c14642f86f9c..429a86ad0e4a45f0f75bb1a139a6d256b7c6e5f5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,10 @@
 
        * net/trampver.el: Update release number.
 
+2011-03-12  Juanma Barranquero  <lekktu@gmail.com>
+
+       * vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).
+
 2011-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/compile.el (compilation--previous-directory): Fix up

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index a0a16601ed7bfee77e8e00c66830f7cf29d9a4d3..21cb86a984088ebf56f899f875c8d0b288edb1fa 100644 (file)
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -435,8 +435,13 @@ If any error occurred in running `bzr status', then return nil."
 (defun vc-bzr-state (file)
   (lexical-let ((result (vc-bzr-status file)))
     (when (consp result)
-      (when (cdr result)
-       (message "Warnings in `bzr' output: %s" (cdr result)))
+      (let ((warnings (cdr result)))
+        (when warnings
+          ;; bzr 2.3.0 returns info about shelves, which is not really a warning
+          (when (string-match "[1-9]+ shel\\(f\\|ves\\) exists?\\..*?\n" warnings)
+            (setq warnings (replace-match "" nil nil warnings)))
+          (unless (string= warnings "")
+            (message "Warnings in `bzr' output: %s" warnings))))
       (cdr (assq (car result)
                  '((added . added)
                    (kindchanged . edited)