Commit 13754b54 authored by Glenn Morris's avatar Glenn Morris
Browse files

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

Fixes: debbugs:9726
parent 293cc56e
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> 2011-10-19 Chong Yidong <cyd@gnu.org>
Doc fix for minor modes, stating that an omitted argument enables Doc fix for minor modes, stating that an omitted argument enables
......
...@@ -866,7 +866,7 @@ stream. Standard error output is discarded." ...@@ -866,7 +866,7 @@ stream. Standard error output is discarded."
(" M " . edited) ;; file text modified (" M " . edited) ;; file text modified
(" *" . edited) ;; execute bit changed (" *" . edited) ;; execute bit changed
(" M*" . edited) ;; text modified + execute bit changed (" M*" . edited) ;; text modified + execute bit changed
;; FIXME: what about ignored files? ("I " . ignored)
(" D " . missing) (" D " . missing)
;; For conflicts, should we list the .THIS/.BASE/.OTHER? ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
("C " . conflict) ("C " . conflict)
...@@ -916,7 +916,7 @@ stream. Standard error output is discarded." ...@@ -916,7 +916,7 @@ stream. Standard error output is discarded."
(push (list new-name 'edited (push (list new-name 'edited
(vc-bzr-create-extra-fileinfo old-name)) result))) (vc-bzr-create-extra-fileinfo old-name)) result)))
;; do nothing for non existent files ;; do nothing for non existent files
((eq translated 'not-found)) ((memq translated '(not-found ignored)))
(t (t
(push (list (file-relative-name (push (list (file-relative-name
(buffer-substring-no-properties (buffer-substring-no-properties
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment