* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files.

Fixes: debbugs:9726

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eec34f9d79c9c6ff5b8e736b1c94425fe5fb8321..5db9b8a5241dea0d373fa234ccae783ad248e572 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Glenn Morris  <rgm@gnu.org>
+
+       * vc/vc-bzr.el (vc-bzr-after-dir-status):
+       Ignore ignored files.  (Bug#9726)
+
 2011-10-19  Chong Yidong  <cyd@gnu.org>
 
        Doc fix for minor modes, stating that an omitted argument enables

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 3ab1caf28649d99369ef2e80c0663bf6136b9390..cc28db689e93e5b8fec90bd7bed12f7d86c2df05 100644 (file)
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -866,7 +866,7 @@ stream.  Standard error output is discarded."
                       (" M " . edited) ;; file text modified
                       ("  *" . edited) ;; execute bit changed
                       (" M*" . edited) ;; text modified + execute bit changed
-                      ;; FIXME: what about ignored files?
+                      ("I  " . ignored)
                       (" D " . missing)
                        ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
                       ("C  " . conflict)
@@ -916,7 +916,7 @@ stream.  Standard error output is discarded."
               (push (list new-name 'edited
                           (vc-bzr-create-extra-fileinfo old-name)) result)))
            ;; do nothing for non existent files
-           ((eq translated 'not-found))
+           ((memq translated '(not-found ignored)))
            (t
             (push (list (file-relative-name
                          (buffer-substring-no-properties