← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Martin Pool
  • Date: 2005-07-29 13:29:17 UTC
  • Revision ID: mbp@sourcefrog.net-20050729132917-f4c36e163315d157
- remove unnecessary internal imports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
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
from bzrlib.errors import NotVersionedError
 
32
        
30
33
 
31
34
class InventoryEntry(object):
32
35
    """Description of a versioned file.
429
432
        """Add entry from a path.
430
433
 
431
434
        The immediate parent must already be versioned"""
432
 
        from bzrlib.errors import NotVersionedError
433
 
        
434
435
        parts = bzrlib.osutils.splitpath(relpath)
435
436
        if len(parts) == 0:
436
437
            raise BzrError("cannot re-add root of inventory")
437
438
 
438
439
        if file_id == None:
439
 
            from bzrlib.branch import gen_file_id
440
440
            file_id = gen_file_id(relpath)
441
441
 
442
442
        parent_path = parts[:-1]