← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: mbp at sourcefrog
  • Date: 2005-03-27 09:53:02 UTC
  • Revision ID: mbp@sourcefrog.net-20050327095302-64cb33f2b4e4d9e4
Skip control directories in recursive add

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
67
67
        if kind == 'directory' and recurse:
68
68
            for subf in os.listdir(af):
69
69
                subp = appendpath(rf, subf)
70
 
                if tree.is_ignored(subp):
 
70
                if subf == bzrlib.BZRDIR:
 
71
                    mutter("skip control directory %r" % subp)
 
72
                elif tree.is_ignored(subp):
71
73
                    mutter("skip ignored sub-file %r" % subp)
72
74
                else:
73
75
                    mutter("queue to add sub-file %r" % (subp))