/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/git/annotate.py

  • Committer: Breezy landing bot
  • Author(s): Vincent Ladeuil
  • Date: 2019-11-19 20:32:00 UTC
  • mfrom: (7413.1.2 trunk)
  • Revision ID: breezy.the.bot@gmail.com-20191119203200-fy55qqighr2xkr8r
Merge lp:brz/3.0 after 3.0.2 release.

Merged from https://code.launchpad.net/~vila/brz/trunk/+merge/375724

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/annotate.py
100
100
            self.change_scanner.repository.lookup_bzr_revision_id(
101
101
                text_revision))
102
102
        text_parents = []
 
103
        path = path.encode('utf-8')
103
104
        for commit_parent in self.store[commit_id].parents:
104
105
            try:
105
106
                (path, text_parent) = (
106
107
                    self.change_scanner.find_last_change_revision(
107
 
                        path.encode('utf-8'), commit_parent))
 
108
                        path, commit_parent))
108
109
            except KeyError:
109
110
                continue
110
111
            if text_parent not in text_parents: