← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

[merge] from robert and fix up tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
# FIXME: This refactoring of the workingtree code doesn't seem to keep 
 
18
# the WorkingTree's copy of the inventory in sync with the branch.  The
 
19
# branch modifies its working inventory when it does a commit to make
 
20
# missing files permanently removed.
17
21
 
18
22
# TODO: Maybe also keep the full path of the entry, and the children?
19
23
# But those depend on its position within a particular inventory, and
883
887
        parent_path = parts[:-1]
884
888
        parent_id = self.path2id(parent_path)
885
889
        if parent_id == None:
886
 
            raise NotVersionedError(parent_path)
887
 
 
 
890
            raise NotVersionedError(path=parent_path)
888
891
        if kind == 'directory':
889
892
            ie = InventoryDirectory(file_id, parts[-1], parent_id)
890
893
        elif kind == 'file':