← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-18 02:24:28 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050818022428-4c0bf84005f4dba8
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472

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