← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Martin Pool
  • Date: 2006-06-20 04:45:30 UTC
  • mto: This revision was merged to the branch mainline in revision 1798.
  • Revision ID: mbp@sourcefrog.net-20060620044530-6e8a6f4b6f3bc525
Cleanup of imports; undeprecate all_revision_ids()

Thanks to John for review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
154
154
        # validate user parameters. Our recursive code avoids adding new files
155
155
        # that need such validation 
156
156
        if tree.is_control_filename(rf.raw_path):
157
 
            raise errors.ForbiddenFileError(filename=rf)
 
157
            raise errors.ForbiddenControlFileError(filename=rf)
158
158
        
159
159
        abspath = tree.abspath(rf.raw_path)
160
160
        kind = bzrlib.osutils.file_kind(abspath)