/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/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/commit.py
211
211
            revprops = {}
212
212
        if possible_master_transports is None:
213
213
            possible_master_transports = []
214
 
        if (not 'branch-nick' in revprops and
 
214
        if (not u'branch-nick' in revprops and
215
215
                branch.repository._format.supports_storing_branch_nick):
216
 
            revprops['branch-nick'] = branch._get_nick(
 
216
            revprops[u'branch-nick'] = branch._get_nick(
217
217
                local,
218
218
                possible_master_transports)
219
219
        if authors is not None:
220
 
            if 'author' in revprops or 'authors' in revprops:
 
220
            if u'author' in revprops or u'authors' in revprops:
221
221
                # XXX: maybe we should just accept one of them?
222
222
                raise AssertionError('author property given twice')
223
223
            if authors:
225
225
                    if '\n' in individual:
226
226
                        raise AssertionError('\\n is not a valid character '
227
227
                                'in an author identity')
228
 
                revprops['authors'] = '\n'.join(authors)
 
228
                revprops[u'authors'] = '\n'.join(authors)
229
229
        return revprops
230
230
 
231
231
    def commit(self,