/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 breezy/tests/matchers.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-09 17:10:01 UTC
  • mto: This revision was merged to the branch mainline in revision 7489.
  • Revision ID: jelmer@jelmer.uk-20200209171001-0h0snwtiu51f1sjf
Remove the InterTree object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/matchers.py
48
48
from ..sixish import (
49
49
    text_type,
50
50
    )
51
 
from ..tree import find_previous_path
 
51
from ..tree import InterTree
52
52
 
53
53
from testtools.matchers import Equals, Mismatch, Matcher
54
54
 
201
201
 
202
202
    def get_path_map(self, tree):
203
203
        """Get the (path, previous_path) pairs for the current tree."""
 
204
        previous_intertree = InterTree.get(self.previous_tree, tree)
204
205
        with tree.lock_read(), self.previous_tree.lock_read():
205
206
            for path, ie in tree.iter_entries_by_dir():
206
207
                if tree.supports_rename_tracking():
207
 
                    previous_path = find_previous_path(
208
 
                        tree, self.previous_tree, path)
 
208
                    previous_path = previous_intertree.find_source_path(path)
209
209
                else:
210
210
                    if self.previous_tree.is_versioned(path):
211
211
                        previous_path = path