← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2006-05-05 00:44:25 UTC
  • mfrom: (1697 +trunk)
  • mto: (1697.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1701.
  • Revision ID: robertc@robertcollins.net-20060505004425-55597abf11998087
Merge HEAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1042
1042
        """
1043
1043
        return self.branch.last_revision()
1044
1044
 
 
1045
    def is_locked(self):
 
1046
        return self._control_files.is_locked()
 
1047
 
1045
1048
    def lock_read(self):
1046
1049
        """See Branch.lock_read, and WorkingTree.unlock."""
1047
1050
        self.branch.lock_read()
1060
1063
            self.branch.unlock()
1061
1064
            raise
1062
1065
 
 
1066
    def get_physical_lock_status(self):
 
1067
        return self._control_files.get_physical_lock_status()
 
1068
 
1063
1069
    def _basis_inventory_name(self):
1064
1070
        return 'basis-inventory'
1065
1071