/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/propose.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 19:12:43 UTC
  • mfrom: (7490.7.6 work)
  • mto: (7490.7.7 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200322191243-yx8ils8lvfmfh7rq
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/propose.py
202
202
 
203
203
    def create_proposal(self, description, reviewers=None, labels=None,
204
204
                        prerequisite_branch=None, commit_message=None,
205
 
                        work_in_progress=False):
 
205
                        work_in_progress=False, allow_collaboration=False):
206
206
        """Create a proposal to merge a branch for merging.
207
207
 
208
208
        :param description: Description for the merge proposal
212
212
        :param commit_message: Optional commit message
213
213
        :param work_in_progress:
214
214
            Whether this merge proposal is still a work-in-progress
 
215
        :param allow_collaboration:
 
216
            Whether to allow changes to the branch from the target branch
 
217
            maintainer(s)
215
218
        :return: A `MergeProposal` object
216
219
        """
217
220
        raise NotImplementedError(self.create_proposal)
237
240
    # Common values: 'plain', 'markdown'
238
241
    merge_proposal_description_format = None
239
242
 
 
243
    # Does this hoster support the allow_collaboration flag?
 
244
    supports_allow_collaboration = False
 
245
 
240
246
    def publish_derived(self, new_branch, base_branch, name, project=None,
241
247
                        owner=None, revision_id=None, overwrite=False,
242
 
                        allow_lossy=True):
 
248
                        allow_lossy=True, tag_selector=None):
243
249
        """Publish a branch to the site, derived from base_branch.
244
250
 
245
251
        :param base_branch: branch to derive the new branch from