← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2006-03-06 05:01:35 UTC
  • mto: This revision was merged to the branch mainline in revision 1593.
  • Revision ID: mbp@sourcefrog.net-20060306050135-9e422a1633679d5f
Lock type is now mandatory for LockableFiles constructor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
62
62
                           NoSuchFile,
63
63
                           NotVersionedError)
64
64
from bzrlib.inventory import InventoryEntry, Inventory
65
 
from bzrlib.lockable_files import LockableFiles
 
65
from bzrlib.lockable_files import LockableFiles, TransportLock
66
66
from bzrlib.merge import merge_inner, transform_tree
67
67
from bzrlib.osutils import (appendpath,
68
68
                            compact_date,
254
254
            assert isinstance(self._format, WorkingTreeFormat3)
255
255
            self._control_files = LockableFiles(
256
256
                self.bzrdir.get_workingtree_transport(None),
257
 
                'lock')
 
257
                'lock', TransportLock)
258
258
 
259
259
        # update the whole cache up front and write to disk if anything changed;
260
260
        # in the future we might want to do this more selectively
1388
1388
        if not isinstance(a_bzrdir.transport, LocalTransport):
1389
1389
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1390
1390
        transport = a_bzrdir.get_workingtree_transport(self)
1391
 
        control_files = LockableFiles(transport, 'lock')
 
1391
        control_files = LockableFiles(transport, 'lock', TransportLock)
1392
1392
        control_files.put_utf8('format', self.get_format_string())
1393
1393
        branch = a_bzrdir.open_branch()
1394
1394
        if revision_id is None: