[Emacs-diffs] /srv/bzr/emacs/trunk r103636: lisp/vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).

[Juanma Barranquero]

------------------------------------------------------------
revno: 103636
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-12 16:26:33 +0100
message:
  lisp/vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).
modified:
  lisp/ChangeLog
  lisp/vc/vc-bzr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-12 15:19:29 +0000
+++ b/lisp/ChangeLog    2011-03-12 15:26:33 +0000
@@ -6,6 +6,10 @@
 
        * net/trampver.el: Update release number.
 
+2011-03-12  Juanma Barranquero  <address@hidden>
+
+       * vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).
+
 2011-03-12  Stefan Monnier  <address@hidden>
 
        * progmodes/compile.el (compilation--previous-directory): Fix up

=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2011-03-04 17:24:02 +0000
+++ b/lisp/vc/vc-bzr.el 2011-03-12 15:26:33 +0000
@@ -435,8 +435,13 @@
 (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)