/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: Jelmer Vernooij
  • Date: 2018-11-06 01:18:08 UTC
  • mfrom: (7143 work)
  • mto: This revision was merged to the branch mainline in revision 7151.
  • Revision ID: jelmer@jelmer.uk-20181106011808-y870f4vq0ork3ahu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit.py
70
70
                      splitpath,
71
71
                      )
72
72
from .trace import mutter, note, is_quiet
73
 
from .bzr.inventory import Inventory, InventoryEntry, make_entry
74
73
from .urlutils import unescape_for_display
75
74
from .i18n import gettext
76
75
 
212
211
            revprops = {}
213
212
        if possible_master_transports is None:
214
213
            possible_master_transports = []
215
 
        if (not 'branch-nick' in revprops and
 
214
        if (not u'branch-nick' in revprops and
216
215
                branch.repository._format.supports_storing_branch_nick):
217
 
            revprops['branch-nick'] = branch._get_nick(
 
216
            revprops[u'branch-nick'] = branch._get_nick(
218
217
                local,
219
218
                possible_master_transports)
220
219
        if authors is not None:
221
 
            if 'author' in revprops or 'authors' in revprops:
 
220
            if u'author' in revprops or u'authors' in revprops:
222
221
                # XXX: maybe we should just accept one of them?
223
222
                raise AssertionError('author property given twice')
224
223
            if authors:
226
225
                    if '\n' in individual:
227
226
                        raise AssertionError('\\n is not a valid character '
228
227
                                'in an author identity')
229
 
                revprops['authors'] = '\n'.join(authors)
 
228
                revprops[u'authors'] = '\n'.join(authors)
230
229
        return revprops
231
230
 
232
231
    def commit(self,