← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-06 07:44:17 UTC
  • mfrom: (1553.5.64 bzr.mbp.locks)
  • Revision ID: pqm@pqm.ubuntu.com-20060306074417-344f1d83d99b9730
Integrate LockDirs into new format, etc

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 (
68
68
                            abspath,
255
255
            assert isinstance(self._format, WorkingTreeFormat3)
256
256
            self._control_files = LockableFiles(
257
257
                self.bzrdir.get_workingtree_transport(None),
258
 
                'lock')
 
258
                'lock', TransportLock)
259
259
 
260
260
        # update the whole cache up front and write to disk if anything changed;
261
261
        # in the future we might want to do this more selectively
1429
1429
        if not isinstance(a_bzrdir.transport, LocalTransport):
1430
1430
            raise errors.NotLocalUrl(a_bzrdir.transport.base)
1431
1431
        transport = a_bzrdir.get_workingtree_transport(self)
1432
 
        control_files = LockableFiles(transport, 'lock')
 
1432
        control_files = LockableFiles(transport, 'lock', TransportLock)
1433
1433
        control_files.put_utf8('format', self.get_format_string())
1434
1434
        branch = a_bzrdir.open_branch()
1435
1435
        if revision_id is None: