/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-03-22 19:39:52 UTC
  • mfrom: (7490.7.6 work)
  • mto: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200322193952-i9nl0jdw4pb2exn0
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

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