/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/propose/cmds.py

  • Committer: Jelmer Vernooij
  • Date: 2019-09-21 17:08:09 UTC
  • mfrom: (7389 work)
  • mto: This revision was merged to the branch mainline in revision 7390.
  • Revision ID: jelmer@jelmer.uk-20190921170809-ejewbeue585deajo
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/cmds.py
199
199
                prerequisite_branch=prerequisite_branch, labels=labels,
200
200
                commit_message=commit_message)
201
201
        except _mod_propose.MergeProposalExists as e:
202
 
            raise errors.BzrCommandError(gettext(
203
 
                'There is already a branch merge proposal: %s') % e.url)
204
 
        note(gettext('Merge proposal created: %s') % proposal.url)
 
202
            note(gettext('There is already a branch merge proposal: %s'), e.url)
 
203
        else:
 
204
            note(gettext('Merge proposal created: %s') % proposal.url)
205
205
 
206
206
 
207
207
class cmd_find_merge_proposal(Command):
348
348
                            '(Merging %s into %s)\n' %
349
349
                            (mp.get_source_branch_url(),
350
350
                             mp.get_target_branch_url()))
351
 
                        self.outf.writelines(
352
 
                            ['\t%s\n' % l
353
 
                             for l in mp.get_description().splitlines()])
 
351
                        description = mp.get_description()
 
352
                        if description:
 
353
                            self.outf.writelines(
 
354
                                ['\t%s\n' % l
 
355
                                 for l in description.splitlines()])
354
356
                        self.outf.write('\n')
355
357
 
356
358