/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/log.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-13 23:57:28 UTC
  • mfrom: (7490 work)
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200213235728-m6ds0mm3mbs4y182
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/log.py
85
85
    get_terminal_encoding,
86
86
    terminal_width,
87
87
    )
88
 
from .tree import find_previous_path
 
88
from .tree import (
 
89
    find_previous_path,
 
90
    InterTree,
 
91
    )
89
92
 
90
93
 
91
94
def find_touching_revisions(repository, last_revision, last_tree, last_path):
105
108
    revno = len(history)
106
109
    for revision_id in history:
107
110
        this_tree = repository.revision_tree(revision_id)
108
 
        this_path = find_previous_path(last_tree, this_tree, last_path)
 
111
        this_intertree = InterTree.get(this_tree, last_tree)
 
112
        this_path = this_intertree.find_source_path(last_path)
109
113
 
110
114
        # now we know how it was last time, and how it is in this revision.
111
115
        # are those two states effectively the same or not?