/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Deprecate LockableFiles.put_utf8 and put_bytes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
800
800
 
801
801
    def _set_merges_from_parent_ids(self, parent_ids):
802
802
        merges = parent_ids[1:]
803
 
        self._control_files.put_bytes('pending-merges', '\n'.join(merges))
 
803
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
 
804
            mode=self._control_files._file_mode)
804
805
 
805
806
    @needs_tree_write_lock
806
807
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
882
883
    def _put_rio(self, filename, stanzas, header):
883
884
        self._must_be_locked()
884
885
        my_file = rio_file(stanzas, header)
885
 
        self._control_files.put(filename, my_file)
 
886
        self._transport.put_file(filename, my_file,
 
887
            mode=self._control_files._file_mode)
886
888
 
887
889
    @needs_write_lock # because merge pulls data into the branch.
888
890
    def merge_from_branch(self, branch, to_revision=None, from_revision=None,
1110
1112
        sio = StringIO()
1111
1113
        self._serialize(self._inventory, sio)
1112
1114
        sio.seek(0)
1113
 
        self._control_files.put('inventory', sio)
 
1115
        self._transport.put_file('inventory', sio,
 
1116
            mode=self._control_files._file_mode)
1114
1117
        self._inventory_is_modified = False
1115
1118
 
1116
1119
    def _kind(self, relpath):
1831
1834
        assert isinstance(xml, str), 'serialised xml must be bytestring.'
1832
1835
        path = self._basis_inventory_name()
1833
1836
        sio = StringIO(xml)
1834
 
        self._control_files.put(path, sio)
 
1837
        self._transport.put_file(path, sio,
 
1838
            mode=self._control_files._file_mode)
1835
1839
 
1836
1840
    def _create_basis_xml_from_inventory(self, revision_id, inventory):
1837
1841
        """Create the text that will be saved in basis-inventory"""
2603
2607
                pass
2604
2608
            return False
2605
2609
        else:
2606
 
            self._control_files.put_bytes('last-revision', revision_id)
 
2610
            self._transport.put_bytes('last-revision', revision_id,
 
2611
                mode=self._control_files._file_mode)
2607
2612
            return True
2608
2613
 
2609
2614
    @needs_tree_write_lock
2774
2779
        inv = Inventory()
2775
2780
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
2776
2781
        sio.seek(0)
2777
 
        control_files.put('inventory', sio)
2778
 
 
2779
 
        control_files.put_bytes('pending-merges', '')
 
2782
        control_files._transport.put_file('inventory', sio,
 
2783
            mode=control_files._file_mode)
 
2784
        control_files._transport.put_bytes('pending-merges', '',
 
2785
            mode=control_files._file_mode)
2780
2786
        
2781
2787
 
2782
2788
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,