← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
123
123
 
124
124
        mutter("smart add of %r, abs=%r", f, af)
125
125
        
126
 
        if is_control_file(af):
 
126
        if tree.is_control_filename(af):
127
127
            raise ForbiddenFileError('cannot add control file %s' % f)
128
128
            
129
129
        versioned = (inv.path2id(rf) != None)
152
152
        if kind == 'directory' and recurse and not sub_tree:
153
153
            for subf in os.listdir(af):
154
154
                subp = bzrlib.osutils.pathjoin(rf, subf)
155
 
                if subf == bzrlib.BZRDIR:
 
155
                if tree.is_control_filename(subp):
156
156
                    mutter("skip control directory %r", subp)
157
157
                else:
158
158
                    ignore_glob = tree.is_ignored(subp)