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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 23:11:39 UTC
  • mfrom: (6973.12.13 python3-k)
  • Revision ID: breezy.the.bot@gmail.com-20180630231139-tf5t5khh6bu5ntpm
Fix some more tests on python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/commit.py
205
205
        c = Commit()
206
206
        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
207
207
        c.tree = commit_tree(self.store, self._iterblobs())
208
 
        c.encoding = self._revprops.pop('git-explicit-encoding', 'utf-8')
 
208
        c.encoding = self._revprops.pop(u'git-explicit-encoding', 'utf-8')
209
209
        c.committer = fix_person_identifier(self._committer.encode(c.encoding))
210
210
        c.author = fix_person_identifier(self._revprops.pop('author', self._committer).encode(c.encoding))
211
211
        if self._revprops: