Merge branch 'master' into external-MR

Conflicts:
	marge/single_merge_job.py

Author: Jellby

marge/app.py

@@ -104,19 +104,21 @@ def regexp(str_regex):
         '--use-merge-strategy',
         action='store_true',
         help=(
-            'Use git merge instead of git rebase (EXPERIMENTAL)\n'
-            'Enable if you use a workflow based on merge-commits and not linear history.\n'
+            'Use git merge instead of git rebase to update the *source* branch (EXPERIMENTAL)\n'
+            'If you need to use a strict no-rebase workflow (in most cases\n'
+            'you don\'t want this, even if you configured gitlab to use merge requests\n'
+            'to use merge commits on the *target* branch (the default).)'
         ),
     )
-    experimental_group.add_argument(
+    parser.add_argument(
         '--add-tested',
         action='store_true',
         help='Add "Tested: marge-bot <$MR_URL>" for the final commit on branch after it passed CI.\n',
     )
-    experimental_group.add_argument(
+    parser.add_argument(
         '--batch',
         action='store_true',
-        help='Enable processing MRs in batches (EXPERIMENTAL)\n',
+        help='Enable processing MRs in batches\n',
     )
     parser.add_argument(
         '--add-part-of',
@@ -187,6 +189,11 @@ def regexp(str_regex):
     )
     config = parser.parse_args(args)
 
+    if config.use_merge_strategy and config.batch:
+        raise MargeBotCliArgError('--use-merge-strategy and --batch are currently mutually exclusive')
+    if config.use_merge_strategy and config.add_tested:
+        raise MargeBotCliArgError('--use-merge-strategy and --add-tested are currently mutually exclusive')
+
     cli_args = []
     # pylint: disable=protected-access
     for _, (_, value) in parser._source_to_settings.get(configargparse._COMMAND_LINE_SOURCE_KEY, {}).items():

marge/single_merge_job.py

@@ -71,6 +71,9 @@ def update_merge_request_and_accept(self, approvals):
                 time.sleep(2)
                 if self.opts.temp_branch and source_project is not self._project:
                     trust = False
+
+            self.ensure_mergeable_mr(merge_request)
+
             try:
                 merge_request.accept(remove_branch=True, sha=actual_sha, trust_pipeline=trust,
                                      project=self._project)

tests/test_app.py

@@ -118,7 +118,7 @@ def test_add_tested():
 
 def test_use_merge_strategy_and_add_tested_are_mutualy_exclusive():
     with env(MARGE_AUTH_TOKEN="NON-ADMIN-TOKEN", MARGE_SSH_KEY="KEY", MARGE_GITLAB_URL='http://foo.com'):
-        with pytest.raises(SystemExit):
+        with pytest.raises(app.MargeBotCliArgError):
             with main('--use-merge-strategy --add-tested'):
                 pass