/breezy/3.1

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/3.1

« back to all changes in this revision

Viewing changes to breezy/bzr/bundle/bundle_data.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-09 17:46:22 UTC
  • mfrom: (7357.1.8 intertree-find-target-path)
  • Revision ID: breezy.the.bot@gmail.com-20200209174622-7ucfq64y2r6v80wv
Use InterTree object when looking for renames.

Merged from https://code.launchpad.net/~jelmer/brz/intertree-renames/+merge/378777

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
from ..testament import StrictTestament
49
49
from ...trace import mutter, warning
50
50
from ...tree import (
 
51
    InterTree,
51
52
    Tree,
52
 
    find_previous_path,
53
53
    )
54
54
from ..xml5 import serializer_v5
55
55
 
492
492
        self.deleted = []
493
493
        self.revision_id = revision_id
494
494
        self._inventory = None
 
495
        self._base_inter = InterTree.get(self.base_tree, self)
495
496
 
496
497
    def __str__(self):
497
498
        return pprint.pformat(self.__dict__)
621
622
                in the text-store, so that the file contents would
622
623
                then be cached.
623
624
        """
624
 
        old_path = find_previous_path(self, self.base_tree, path)
 
625
        old_path = self._base_inter.find_source_path(path)
625
626
        if old_path is None:
626
627
            patch_original = None
627
628
        else: