aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-10-19 09:42:20 -0700
committerGlenn Morris2011-10-19 09:42:20 -0700
commit13754b5435db15ac235e4637ca91c7447c151a5b (patch)
tree6c08fd958b0eb386e2a7c8d6d2fda80dbd29341a
parent293cc56ee2e8976446e395e825cc7fdc4b1a1839 (diff)
downloademacs-13754b5435db15ac235e4637ca91c7447c151a5b.tar.gz
emacs-13754b5435db15ac235e4637ca91c7447c151a5b.zip
* lisp/vc/vc-bzr.el (vc-bzr-after-dir-status): Ignore ignored files.
Fixes: debbugs:9726
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-bzr.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eec34f9d79c..5db9b8a5241 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-10-19 Glenn Morris <rgm@gnu.org>
2
3 * vc/vc-bzr.el (vc-bzr-after-dir-status):
4 Ignore ignored files. (Bug#9726)
5
12011-10-19 Chong Yidong <cyd@gnu.org> 62011-10-19 Chong Yidong <cyd@gnu.org>
2 7
3 Doc fix for minor modes, stating that an omitted argument enables 8 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 3ab1caf2864..cc28db689e9 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -866,7 +866,7 @@ stream. Standard error output is discarded."
866 (" M " . edited) ;; file text modified 866 (" M " . edited) ;; file text modified
867 (" *" . edited) ;; execute bit changed 867 (" *" . edited) ;; execute bit changed
868 (" M*" . edited) ;; text modified + execute bit changed 868 (" M*" . edited) ;; text modified + execute bit changed
869 ;; FIXME: what about ignored files? 869 ("I " . ignored)
870 (" D " . missing) 870 (" D " . missing)
871 ;; For conflicts, should we list the .THIS/.BASE/.OTHER? 871 ;; For conflicts, should we list the .THIS/.BASE/.OTHER?
872 ("C " . conflict) 872 ("C " . conflict)
@@ -916,7 +916,7 @@ stream. Standard error output is discarded."
916 (push (list new-name 'edited 916 (push (list new-name 'edited
917 (vc-bzr-create-extra-fileinfo old-name)) result))) 917 (vc-bzr-create-extra-fileinfo old-name)) result)))
918 ;; do nothing for non existent files 918 ;; do nothing for non existent files
919 ((eq translated 'not-found)) 919 ((memq translated '(not-found ignored)))
920 (t 920 (t
921 (push (list (file-relative-name 921 (push (list (file-relative-name
922 (buffer-substring-no-properties 922 (buffer-substring-no-properties