/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: Andrew Bennetts
  • Date: 2008-11-27 06:29:56 UTC
  • mfrom: (3861 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3863.
  • Revision ID: andrew.bennetts@canonical.com-20081127062956-v0a19icwk85iosx4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
from bzrlib import symbol_versioning
86
86
from bzrlib.decorators import needs_read_lock, needs_write_lock
87
87
from bzrlib.inventory import InventoryEntry, Inventory, ROOT_ID, TreeReference
88
 
from bzrlib.lockable_files import LockableFiles, TransportLock
 
88
from bzrlib.lockable_files import LockableFiles
89
89
from bzrlib.lockdir import LockDir
90
90
import bzrlib.mutabletree
91
91
from bzrlib.mutabletree import needs_tree_write_lock
2509
2509
                self)._get_rules_searcher(default_searcher)
2510
2510
        return self._rules_searcher
2511
2511
 
 
2512
    def get_shelf_manager(self):
 
2513
        """Return the ShelfManager for this WorkingTree."""
 
2514
        from bzrlib.shelf import ShelfManager
 
2515
        return ShelfManager(self, self._transport)
 
2516
 
2512
2517
 
2513
2518
class WorkingTree2(WorkingTree):
2514
2519
    """This is the Format 2 working tree.