/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-07-06 16:21:16 UTC
  • mfrom: (7359.1.5 propose-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20190706162116-gypul33l15pj5rxb
Misc fixes for interacting with GitLab repositories.

Merged from https://code.launchpad.net/~jelmer/brz/propose-fixes/+merge/369487

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):