/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-06-03 22:38:47 UTC
  • mfrom: (7296.8.2 suggest-commit-message)
  • Revision ID: breezy.the.bot@gmail.com-20190603223847-9zoz582m44jzmf2l
Add commit-message option to 'brz propose'.h

Merged from https://code.launchpad.net/~jelmer/brz/suggest-commit-message/+merge/366610

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/cmds.py
143
143
        Option('name', help='Name of the new remote branch.', type=str),
144
144
        Option('description', help='Description of the change.', type=str),
145
145
        Option('prerequisite', help='Prerequisite branch.', type=str),
 
146
        Option(
 
147
            'commit-message',
 
148
            help='Set commit message for merge, if supported', type=str),
146
149
        ListOption('labels', short_name='l', type=text_type,
147
150
                   help='Labels to apply.'),
148
151
        Option('no-allow-lossy',
154
157
 
155
158
    def run(self, submit_branch=None, directory='.', hoster=None,
156
159
            reviewers=None, name=None, no_allow_lossy=False, description=None,
157
 
            labels=None, prerequisite=None):
 
160
            labels=None, prerequisite=None, commit_message=None):
158
161
        tree, branch, relpath = (
159
162
            controldir.ControlDir.open_containing_tree_or_branch(directory))
160
163
        if submit_branch is None:
191
194
        try:
192
195
            proposal = proposal_builder.create_proposal(
193
196
                description=description, reviewers=reviewers,
194
 
                prerequisite_branch=prerequisite_branch, labels=labels)
 
197
                prerequisite_branch=prerequisite_branch, labels=labels,
 
198
                commit_message=commit_message)
195
199
        except _mod_propose.MergeProposalExists as e:
196
200
            raise errors.BzrCommandError(gettext(
197
201
                'There is already a branch merge proposal: %s') % e.url)