← 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
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

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