Merge lp:~jelmer/brz/trunk-merge-3.1 into lp:brz

[Jelmer Vernooij]

Merge the lp:brz/3.1 branch.

Merge the lp:brz/3.1 branch.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-02-18 01:57:45 +0000
+++ breezy/git/remote.py	2020-03-07 14:57:03 +0000
@@ -545,7 +545,7 @@
 
     def push_branch(self, source, revision_id=None, overwrite=False,
                     remember=False, create_prefix=False, lossy=False,
-                    name=None):
+                    name=None, tag_selector=None):
         """Push the source branch into this ControlDir."""
         if revision_id is None:
             # No revision supplied by the user, default to the branch
@@ -590,6 +590,8 @@
             ret[actual_refname] = new_sha
             if fetch_tags:
                 for tagname, revid in source.tags.get_tag_dict().items():
+                    if tag_selector and not tag_selector(tagname):
+                        continue
                     if lossy:
                         try:
                             new_sha = source_store._lookup_revision_sha1(revid)

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/propose/cmds.py	2020-03-07 14:57:03 +0000
@@ -149,6 +149,8 @@
                    help='Labels to apply.'),
         Option('no-allow-lossy',
                help='Allow fallback to lossy push, if necessary.'),
+        Option('allow-collaboration',
+               help='Allow collaboration from target branch maintainer(s)'),
         ]
     takes_args = ['submit_branch?']
 
@@ -156,7 +158,8 @@
 
     def run(self, submit_branch=None, directory='.', hoster=None,
             reviewers=None, name=None, no_allow_lossy=False, description=None,
-            labels=None, prerequisite=None, commit_message=None, wip=False):
+            labels=None, prerequisite=None, commit_message=None, wip=False,
+            allow_collaboration=False):
         tree, branch, relpath = (
             controldir.ControlDir.open_containing_tree_or_branch(directory))
         if submit_branch is None:
@@ -196,7 +199,7 @@
                 description=description, reviewers=reviewers,
                 prerequisite_branch=prerequisite_branch, labels=labels,
                 commit_message=commit_message,
-                work_in_progress=wip)
+                work_in_progress=wip, allow_collaboration=allow_collaboration)
         except _mod_propose.MergeProposalExists as e:
             note(gettext('There is already a branch merge proposal: %s'), e.url)
         else:

=== modified file 'breezy/plugins/propose/github.py'
--- breezy/plugins/propose/github.py	2020-02-21 03:58:42 +0000
+++ breezy/plugins/propose/github.py	2020-03-07 14:57:03 +0000
@@ -275,12 +275,14 @@
             return json.loads(response.text)
         raise InvalidHttpResponse(path, response.text)
 
-    def _create_pull(self, path, title, head, base, body=None, labels=None, assignee=None, draft=False):
+    def _create_pull(self, path, title, head, base, body=None, labels=None,
+                     assignee=None, draft=False, maintainer_can_modify=False):
         data = {
             'title': title,
             'head': head,
             'base': base,
             'draft': draft,
+            'maintainer_can_modify': maintainer_can_modify,
         }
         if labels is not None:
             data['labels'] = labels
@@ -551,7 +553,7 @@
 
     def create_proposal(self, description, reviewers=None, labels=None,
                         prerequisite_branch=None, commit_message=None,
-                        work_in_progress=False):
+                        work_in_progress=False, allow_collaboration=False):
         """Perform the submission."""
         if prerequisite_branch is not None:
             raise PrerequisiteBranchUnsupported(self)
@@ -561,7 +563,6 @@
             self.target_repo_name = self.target_repo_name[:-4]
         # TODO(jelmer): Allow setting title explicitly?
         title = determine_title(description)
-        # TODO(jelmer): Set maintainers_can_modify?
         target_repo = self.gh._get_repo(
             self.target_owner, self.target_repo_name)
         assignees = []
@@ -582,7 +583,9 @@
                 head="%s:%s" % (self.source_owner, self.source_branch_name),
                 base=self.target_branch_name,
                 labels=labels, assignee=assignees,
-                draft=(not work_in_progress))
+                draft=work_in_progress,
+                maintainer_can_modify=allow_collaboration,
+                )
         except ValidationFailed:
             raise MergeProposalExists(self.source_branch.user_url)
         return GitHubMergeProposal(self.gh, pull_request)

=== modified file 'breezy/plugins/propose/gitlabs.py'
--- breezy/plugins/propose/gitlabs.py	2020-02-21 03:58:42 +0000
+++ breezy/plugins/propose/gitlabs.py	2020-03-07 14:57:03 +0000
@@ -583,7 +583,7 @@
 
     def create_proposal(self, description, reviewers=None, labels=None,
                         prerequisite_branch=None, commit_message=None,
-                        work_in_progress=False):
+                        work_in_progress=False, allow_collaboration=False):
         """Perform the submission."""
         # https://docs.gitlab.com/ee/api/merge_requests.html#create-mr
         if prerequisite_branch is not None:
@@ -595,7 +595,6 @@
         title = determine_title(description)
         if work_in_progress:
             title = 'WIP: %s' % title
-        # TODO(jelmer): Allow setting allow_collaboration field
         # TODO(jelmer): Allow setting milestone field
         # TODO(jelmer): Allow setting squash field
         kwargs = {
@@ -604,7 +603,8 @@
             'target_project_id': target_project['id'],
             'source_branch_name': self.source_branch_name,
             'target_branch_name': self.target_branch_name,
-            'description': description}
+            'description': description,
+            'allow_collaboration': allow_collaboration}
         if labels:
             kwargs['labels'] = ','.join(labels)
         if reviewers:

=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py	2020-02-21 03:58:42 +0000
+++ breezy/plugins/propose/launchpad.py	2020-03-07 14:57:03 +0000
@@ -548,7 +548,7 @@
 
     def create_proposal(self, description, reviewers=None, labels=None,
                         prerequisite_branch=None, commit_message=None,
-                        work_in_progress=False):
+                        work_in_progress=False, allow_collaboration=False):
         """Perform the submission."""
         if labels:
             raise LabelsUnsupported(self)

=== modified file 'breezy/propose.py'
--- breezy/propose.py	2020-02-21 03:58:42 +0000
+++ breezy/propose.py	2020-03-07 14:57:03 +0000
@@ -200,7 +200,7 @@
 
     def create_proposal(self, description, reviewers=None, labels=None,
                         prerequisite_branch=None, commit_message=None,
-                        work_in_progress=False):
+                        work_in_progress=False, allow_collaboration=False):
         """Create a proposal to merge a branch for merging.
 
         :param description: Description for the merge proposal
@@ -210,6 +210,9 @@
         :param commit_message: Optional commit message
         :param work_in_progress:
             Whether this merge proposal is still a work-in-progress
+        :param allow_collaboration:
+            Whether to allow changes to the branch from the target branch
+            maintainer(s)
         :return: A `MergeProposal` object
         """
         raise NotImplementedError(self.create_proposal)