Proper tracking of file-level operations: rename, directories, merges

[Juanma Barranquero]

On Tue, Oct 25, 2011 at 18:44, Stephen J. Turnbull <stephen at xemacs.org> wrote:

> AFAIK
> bzr hasn't change UI on the Emacs people yet, but I'm pretty sure
> you'll hear about it if there are any UI changes that affect vc.el!


C:\emacs\trunk> bzr log -r 103636
------------------------------------------------------------
revno: 103636
committer: Juanma Barranquero <lekktu at gmail.com>
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).

C:\emacs\trunk> bzr diff -c 103636
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog      2011-03-12 15:19:29 +0000
+++ lisp/ChangeLog      2011-03-12 15:26:33 +0000
@@ -6,6 +6,10 @@

        * net/trampver.el: Update release number.

+2011-03-12  Juanma Barranquero  <lekktu at 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 at iro.umontreal.ca>

        * progmodes/compile.el (compilation--previous-directory): Fix up

=== modified file 'lisp/vc/vc-bzr.el'
--- lisp/vc/vc-bzr.el   2011-03-04 17:24:02 +0000
+++ 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)