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

  • Committer: Jelmer Vernooij
  • Date: 2019-03-02 22:31:28 UTC
  • mfrom: (7291 work)
  • mto: This revision was merged to the branch mainline in revision 7293.
  • Revision ID: jelmer@jelmer.uk-20190302223128-0qk1i5tozmzq5nyq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/commands.py
278
278
        exitcode = p.wait()
279
279
        if exitcode != 0:
280
280
            raise BzrCommandError(gettext("error running patch"))
281
 
        message = c.message
 
281
        message = c.message.decode('utf-8')
282
282
        if signoff:
283
283
            signed_off_by = wt.branch.get_config().username()
284
 
            message += "Signed-off-by: %s\n" % signed_off_by.encode('utf-8')
285
 
        wt.commit(authors=[c.author], message=message)
 
284
            message += "Signed-off-by: %s\n" % (signed_off_by, )
 
285
        wt.commit(authors=[c.author.decode('utf-8')], message=message)
286
286
 
287
287
    def run(self, patches_list=None, signoff=False, force=False):
288
288
        from ..errors import UncommittedChanges