/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: 2019-05-20 03:57:29 UTC
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190520035729-9rxvefxkvbbivygy
use default_user_agent function.

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 InterTree
 
51
from ..tree import find_previous_path
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)
205
204
        with tree.lock_read(), self.previous_tree.lock_read():
206
205
            for path, ie in tree.iter_entries_by_dir():
207
206
                if tree.supports_rename_tracking():
208
 
                    previous_path = previous_intertree.find_source_path(path)
 
207
                    previous_path = find_previous_path(
 
208
                        tree, self.previous_tree, path)
209
209
                else:
210
210
                    if self.previous_tree.is_versioned(path):
211
211
                        previous_path = path