/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/fastimport/bzr_commit_handler.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/fastimport/bzr_commit_handler.py
279
279
 
280
280
    def build_revision(self):
281
281
        rev_props = self._legal_revision_properties(self.command.properties)
282
 
        if 'branch-nick' not in rev_props:
283
 
            rev_props['branch-nick'] = self.cache_mgr.branch_mapper.git_to_bzr(
 
282
        if u'branch-nick' not in rev_props:
 
283
            rev_props[u'branch-nick'] = self.cache_mgr.branch_mapper.git_to_bzr(
284
284
                    self.branch_ref)
285
285
        self._save_author_info(rev_props)
286
286
        committer = self.command.committer
331
331
        else:
332
332
            return
333
333
        # If we reach here, there are authors worth storing
334
 
        rev_props['authors'] = "\n".join(author_ids)
 
334
        rev_props[u'authors'] = "\n".join(author_ids)
335
335
 
336
336
    def _modify_item(self, path, kind, is_executable, data, inv):
337
337
        """Add to or change an item in the inventory."""