← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-17 03:20:35 UTC
  • mfrom: (4792.4.3 456036)
  • Revision ID: pqm@pqm.ubuntu.com-20091117032035-s3sgtlixj1lrminn
(Gordon Tyler) Fix IndexError during 'bzr ignore /' (#456036)

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
700
701
    def _get_rules_searcher(self, default_searcher):
701
702
        """Get the RulesSearcher for this tree given the default one."""
702
703
        searcher = default_searcher
851
852
    will pass through to InterTree as appropriate.
852
853
    """
853
854
 
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
 
 
860
855
    _optimisers = []
861
856
 
862
857
    def _changes_from_entries(self, source_entry, target_entry,
959
954
            a PathsNotVersionedError will be thrown.
960
955
        :param want_unversioned: Scan for unversioned paths.
961
956
        """
 
957
        # NB: show_status depends on being able to pass in non-versioned files
 
958
        # and report them as unknown
962
959
        trees = (self.source,)
963
960
        if extra_trees is not None:
964
961
            trees = trees + tuple(extra_trees)