← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Martin Pool
  • Date: 2008-05-22 05:48:22 UTC
  • mfrom: (3407.2.16 controlfiles)
  • mto: This revision was merged to the branch mainline in revision 3448.
  • Revision ID: mbp@sourcefrog.net-20080522054822-lrq17tx62wbfzj8r
merge further LockableFile deprecations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
138
138
        # if branch is at our basedir and is a format 6 or less
139
139
        # assume all other formats have their own control files.
140
140
        self._control_files = _control_files
 
141
        self._transport = self._control_files._transport
141
142
        self._dirty = None
142
143
        #-------------
143
144
        # during a read or write lock these objects are set, and are
1307
1308
        control_files = self._open_control_files(a_bzrdir)
1308
1309
        control_files.create_lock()
1309
1310
        control_files.lock_write()
1310
 
        control_files.put_utf8('format', self.get_format_string())
 
1311
        transport.put_bytes('format', self.get_format_string(),
 
1312
            mode=control_files._file_mode)
1311
1313
        if from_branch is not None:
1312
1314
            branch = from_branch
1313
1315
        else:
2533
2535
 
2534
2536
    def update_format(self, tree):
2535
2537
        """Change the format marker."""
2536
 
        tree._control_files.put_utf8('format',
2537
 
            self.target_format.get_format_string())
 
2538
        tree._transport.put_bytes('format',
 
2539
            self.target_format.get_format_string(),
 
2540
            mode=tree._control_files._file_mode)