~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Martin Pool
  • Date: 2005-08-01 20:25:47 UTC
  • Revision ID: mbp@sourcefrog.net-20050801202547-213acc4fb7e2148a
- fix circular imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
 
28
28
from bzrlib.osutils import uuid, quotefn, splitpath, joinpath, appendpath
29
29
from bzrlib.trace import mutter
30
 
from bzrlib.branch import gen_file_id
31
30
from bzrlib.errors import NotVersionedError
32
31
        
33
32
 
432
431
        """Add entry from a path.
433
432
 
434
433
        The immediate parent must already be versioned"""
 
434
        from bzrlib.branch import gen_file_id
 
435
        
435
436
        parts = bzrlib.osutils.splitpath(relpath)
436
437
        if len(parts) == 0:
437
438
            raise BzrError("cannot re-add root of inventory")