← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
399
399
            # the basis tree is a ghost so return an empty tree.
400
400
            return self.branch.repository.revision_tree(None)
401
401
 
 
402
    def _cleanup(self):
 
403
        self._flush_ignore_list_cache()
 
404
 
402
405
    @staticmethod
403
406
    @deprecated_method(zero_eight)
404
407
    def create(branch, directory):
2406
2409
            raise
2407
2410
 
2408
2411
    def unlock(self):
 
2412
        # do non-implementation specific cleanup
 
2413
        self._cleanup()
 
2414
 
2409
2415
        # we share control files:
2410
2416
        if self._control_files._lock_count == 3:
2411
2417
            # _inventory_is_modified is always False during a read lock.
2477
2483
        return _mod_conflicts.ConflictList.from_stanzas(RioReader(confile))
2478
2484
 
2479
2485
    def unlock(self):
 
2486
        # do non-implementation specific cleanup
 
2487
        self._cleanup()
2480
2488
        if self._control_files._lock_count == 1:
2481
2489
            # _inventory_is_modified is always False during a read lock.
2482
2490
            if self._inventory_is_modified: