/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: 2020-01-30 18:07:32 UTC
  • mfrom: (7472 work)
  • mto: This revision was merged to the branch mainline in revision 7473.
  • Revision ID: jelmer@jelmer.uk-20200130180732-6xcdyr3bhipain1k
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/cmds.py
144
144
        Option('name', help='Name of the new remote branch.', type=str),
145
145
        Option('description', help='Description of the change.', type=str),
146
146
        Option('prerequisite', help='Prerequisite branch.', type=str),
 
147
        Option('wip', help='Mark merge request as work-in-progress'),
147
148
        Option(
148
149
            'commit-message',
149
150
            help='Set commit message for merge, if supported', type=str),
158
159
 
159
160
    def run(self, submit_branch=None, directory='.', hoster=None,
160
161
            reviewers=None, name=None, no_allow_lossy=False, description=None,
161
 
            labels=None, prerequisite=None, commit_message=None):
 
162
            labels=None, prerequisite=None, commit_message=None, wip=False):
162
163
        tree, branch, relpath = (
163
164
            controldir.ControlDir.open_containing_tree_or_branch(directory))
164
165
        if submit_branch is None:
197
198
            proposal = proposal_builder.create_proposal(
198
199
                description=description, reviewers=reviewers,
199
200
                prerequisite_branch=prerequisite_branch, labels=labels,
200
 
                commit_message=commit_message)
 
201
                commit_message=commit_message,
 
202
                work_in_progress=wip)
201
203
        except _mod_propose.MergeProposalExists as e:
202
204
            note(gettext('There is already a branch merge proposal: %s'), e.url)
203
205
        else: