← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

Fix some trivial test failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1503
1503
            search_key_func=search_key_func)
1504
1504
        result.id_to_entry._ensure_root()
1505
1505
        result.id_to_entry._root_node.set_maximum_size(maximum_size)
 
1506
        parent_id_basename_delta = []
1506
1507
        if self.parent_id_basename_to_file_id is not None:
1507
1508
            result.parent_id_basename_to_file_id = chk_map.CHKMap(
1508
1509
                self.parent_id_basename_to_file_id._store,
1514
1515
            p_id_root = self.parent_id_basename_to_file_id._root_node
1515
1516
            result_p_id_root.set_maximum_size(p_id_root.maximum_size)
1516
1517
            result_p_id_root._key_width = p_id_root._key_width
1517
 
            parent_id_basename_delta = []
1518
1518
        else:
1519
1519
            result.parent_id_basename_to_file_id = None
1520
1520
        result.root_id = self.root_id
1851
1851
        if self._children is not None:
1852
1852
            return self._children
1853
1853
        # No longer supported
1854
 
        assert self._chk_inventory.parent_id_basename_to_file_id is not None
 
1854
        if self._chk_inventory.parent_id_basename_to_file_id is None:
 
1855
            raise AssertionError
1855
1856
        result = {}
1856
1857
        # XXX: Todo - use proxy objects for the children rather than loading
1857
1858
        # all when the attribute is referenced.