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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 18:15:53 UTC
  • mfrom: (7045.4.7 python3-s)
  • Revision ID: breezy.the.bot@gmail.com-20180725181553-mz6zhncntlovb8ii
Fix another couple of hundred tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-s/+merge/350749

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/annotate.py
103
103
        text_parents = []
104
104
        for commit_parent in self.store[commit_id].parents:
105
105
            try:
106
 
                (path, text_parent) = self.change_scanner.find_last_change_revision(path, commit_parent)
 
106
                (path, text_parent) = self.change_scanner.find_last_change_revision(path.encode('utf-8'), commit_parent)
107
107
            except KeyError:
108
108
                continue
109
109
            if text_parent not in text_parents:
110
110
                text_parents.append(text_parent)
111
 
        return tuple([(path,
 
111
        return tuple([(path.decode('utf-8'),
112
112
            self.change_scanner.repository.lookup_foreign_revision_id(p)) for p
113
113
            in text_parents])
114
114
 
144
144
                yield GitAbsentContentFactory(store, path, text_revision)
145
145
                continue
146
146
            try:
147
 
                (mode, blob_sha) = tree_lookup_path(store.__getitem__, tree_id, path)
 
147
                (mode, blob_sha) = tree_lookup_path(store.__getitem__, tree_id, path.encode('utf-8'))
148
148
            except KeyError:
149
149
                yield GitAbsentContentFactory(store, path, text_revision)
150
150
            else: