~jelmer/brz/byov-trunk

« back to all changes in this revision

Viewing changes to breezy/plugins/propose/cmds.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-03-07 15:17:55 UTC
  • mfrom: (7496.1.2 trunk-merge-3.0)
  • Revision ID: breezy.the.bot@gmail.com-20200307151755-b5g0v8o9r80qhmp5
Merge the lp:brz/3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/380392

Show diffs side-by-side

added added

removed removed

Lines of Context:
149
149
                   help='Labels to apply.'),
150
150
        Option('no-allow-lossy',
151
151
               help='Allow fallback to lossy push, if necessary.'),
 
152
        Option('allow-collaboration',
 
153
               help='Allow collaboration from target branch maintainer(s)'),
152
154
        ]
153
155
    takes_args = ['submit_branch?']
154
156
 
156
158
 
157
159
    def run(self, submit_branch=None, directory='.', hoster=None,
158
160
            reviewers=None, name=None, no_allow_lossy=False, description=None,
159
 
            labels=None, prerequisite=None, commit_message=None, wip=False):
 
161
            labels=None, prerequisite=None, commit_message=None, wip=False,
 
162
            allow_collaboration=False):
160
163
        tree, branch, relpath = (
161
164
            controldir.ControlDir.open_containing_tree_or_branch(directory))
162
165
        if submit_branch is None:
196
199
                description=description, reviewers=reviewers,
197
200
                prerequisite_branch=prerequisite_branch, labels=labels,
198
201
                commit_message=commit_message,
199
 
                work_in_progress=wip)
 
202
                work_in_progress=wip, allow_collaboration=allow_collaboration)
200
203
        except _mod_propose.MergeProposalExists as e:
201
204
            note(gettext('There is already a branch merge proposal: %s'), e.url)
202
205
        else: