/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/bzr/bundle/bundle_data.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-25 00:38:06 UTC
  • mfrom: (7490.3.5 work)
  • mto: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200225003806-7i1vt6f65ywyxqfy
Merge 3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/bundle/bundle_data.py
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: