/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

  • Committer: Robert Collins
  • Date: 2006-02-15 08:11:37 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060215081137-4c27377517e96dd1
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
223
223
        assert isinstance(basedir, basestring), \
224
224
            "base directory %r is not a string" % basedir
225
225
        basedir = safe_unicode(basedir)
226
 
        mutter("openeing working tree %r", basedir)
 
226
        mutter("opening working tree %r", basedir)
227
227
        if deprecated_passed(branch):
228
228
            if not _internal:
229
229
                warn("WorkingTree(..., branch=XXX) is deprecated as of bzr 0.8."
1127
1127
        
1128
1128
        # TODO: split this per format so there is no ugly if block
1129
1129
        if self._hashcache.needs_write and (
 
1130
            # dedicated lock files
1130
1131
            self._control_files._lock_count==1 or 
 
1132
            # shared lock files
1131
1133
            (self._control_files is self.branch.control_files and 
1132
 
             self._control_files._lock_count==2)):
 
1134
             self._control_files._lock_count==3)):
1133
1135
            self._hashcache.write()
1134
1136
        # reverse order of locking.
1135
1137
        result = self._control_files.unlock()