← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2006-12-11 05:27:48 UTC
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20061211052748-672fjh70mzze3qkh
Ensure added references are serialized properly, beef up Workingtreee3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
66
66
    urlutils,
67
67
    xml5,
68
68
    xml6,
 
69
    xml7,
69
70
    )
70
71
import bzrlib.branch
71
72
from bzrlib.transport import get_transport
943
944
        if self._control_files._lock_mode != 'w':
944
945
            raise errors.NotWriteLocked(self)
945
946
        sio = StringIO()
946
 
        xml5.serializer_v5.write_inventory(self._inventory, sio)
 
947
        self._serialize(self._inventory, sio)
947
948
        sio.seek(0)
948
949
        self._control_files.put('inventory', sio)
949
950
        self._inventory_is_modified = False
950
951
 
 
952
    def _serialize(self, inventory, out_file):
 
953
        xml5.serializer_v5.write_inventory(self._inventory, out_file)
 
954
 
 
955
    def _deserialize(selt, in_file):
 
956
        return xml5.serializer_v5.read_inventory(in_file)
 
957
 
951
958
    def list_files(self, include_root=False):
952
959
        """Recursively list all files as (path, class, kind, id, entry).
953
960
 
1608
1615
        # binary.
1609
1616
        if self._inventory_is_modified:
1610
1617
            raise errors.InventoryModified(self)
1611
 
        result = xml5.serializer_v5.read_inventory(
1612
 
            self._control_files.get('inventory'))
 
1618
        result = self._deserialize(self._control_files.get('inventory'))
1613
1619
        self._set_inventory(result, dirty=False)
1614
1620
        return result
1615
1621
 
2014
2020
        entry = TreeReference(sub_tree_id, name, parent_id, None, 
2015
2021
                              None)
2016
2022
        self.inventory.add(entry)
 
2023
        self._write_inventory(self.inventory)
 
2024
 
 
2025
    def _serialize(self, inventory, out_file):
 
2026
        xml7.serializer_v7.write_inventory(self._inventory, out_file)
 
2027
 
 
2028
    def _deserialize(selt, in_file):
 
2029
        return xml7.serializer_v7.read_inventory(in_file)
2017
2030
 
2018
2031
 
2019
2032
def get_conflicted_stem(path):