[Pkg-bazaar-commits] ./bzr/unstable r103: Skip control directories in recursive add

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 103
committer: mbp at sourcefrog.net
timestamp: Sun 2005-03-27 19:53:02 +1000
message:
  Skip control directories in recursive add
modified:
  bzrlib/add.py
-------------- next part --------------
=== modified file 'bzrlib/add.py'
--- a/bzrlib/add.py	2005-03-25 08:22:36 +0000
+++ b/bzrlib/add.py	2005-03-27 09:53:02 +0000
@@ -67,7 +67,9 @@
         if kind == 'directory' and recurse:
             for subf in os.listdir(af):
                 subp = appendpath(rf, subf)
-                if tree.is_ignored(subp):
+                if subf == bzrlib.BZRDIR:
+                    mutter("skip control directory %r" % subp)
+                elif tree.is_ignored(subp):
                     mutter("skip ignored sub-file %r" % subp)
                 else:
                     mutter("queue to add sub-file %r" % (subp))