← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Andrew Bennetts
  • Date: 2010-02-12 04:33:05 UTC
  • mfrom: (5031 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5032.
  • Revision ID: andrew.bennetts@canonical.com-20100212043305-ujdbsdoviql2t7i3
Merge lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
1
 
# Copyright (C) 2005, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
98
98
    def iter_changes(self, from_tree, include_unchanged=False,
99
99
                     specific_files=None, pb=None, extra_trees=None,
100
100
                     require_versioned=True, want_unversioned=False):
 
101
        """See InterTree.iter_changes"""
101
102
        intertree = InterTree.get(from_tree, self)
102
103
        return intertree.iter_changes(include_unchanged, specific_files, pb,
103
104
            extra_trees, require_versioned, want_unversioned=want_unversioned)
697
698
                for path in path_names:
698
699
                    yield searcher.get_items(path)
699
700
 
700
 
    @needs_read_lock
701
701
    def _get_rules_searcher(self, default_searcher):
702
702
        """Get the RulesSearcher for this tree given the default one."""
703
703
        searcher = default_searcher
852
852
    will pass through to InterTree as appropriate.
853
853
    """
854
854
 
 
855
    # Formats that will be used to test this InterTree. If both are
 
856
    # None, this InterTree will not be tested (e.g. because a complex
 
857
    # setup is required)
 
858
    _matching_from_tree_format = None
 
859
    _matching_to_tree_format = None
 
860
 
855
861
    _optimisers = []
856
862
 
857
863
    def _changes_from_entries(self, source_entry, target_entry,
954
960
            a PathsNotVersionedError will be thrown.
955
961
        :param want_unversioned: Scan for unversioned paths.
956
962
        """
957
 
        # NB: show_status depends on being able to pass in non-versioned files
958
 
        # and report them as unknown
959
963
        trees = (self.source,)
960
964
        if extra_trees is not None:
961
965
            trees = trees + tuple(extra_trees)