← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
697
697
                for path in path_names:
698
698
                    yield searcher.get_items(path)
699
699
 
700
 
    @needs_read_lock
701
700
    def _get_rules_searcher(self, default_searcher):
702
701
        """Get the RulesSearcher for this tree given the default one."""
703
702
        searcher = default_searcher
852
851
    will pass through to InterTree as appropriate.
853
852
    """
854
853
 
 
854
    # Formats that will be used to test this InterTree. If both are
 
855
    # None, this InterTree will not be tested (e.g. because a complex
 
856
    # setup is required)
 
857
    _matching_from_tree_format = None
 
858
    _matching_to_tree_format = None
 
859
 
855
860
    _optimisers = []
856
861
 
857
862
    def _changes_from_entries(self, source_entry, target_entry,
954
959
            a PathsNotVersionedError will be thrown.
955
960
        :param want_unversioned: Scan for unversioned paths.
956
961
        """
957
 
        # NB: show_status depends on being able to pass in non-versioned files
958
 
        # and report them as unknown
959
962
        trees = (self.source,)
960
963
        if extra_trees is not None:
961
964
            trees = trees + tuple(extra_trees)