Uses only project enforced

Author: anuragagarwal561994

marge/job.py

@@ -39,9 +39,6 @@ def opts(self):
     def execute(self):
         raise NotImplementedError
 
-    def is_auto_squash_enabled(self, merge_request):
-        return self._project.squash_option == "always" or merge_request.squash
-
     def ensure_mergeable_mr(self, merge_request):
         merge_request.refetch_info()
         log.info('Ensuring MR !%s is mergeable', merge_request.iid)
@@ -50,7 +47,12 @@ def ensure_mergeable_mr(self, merge_request):
         if merge_request.work_in_progress:
             raise CannotMerge("Sorry, I can't merge requests marked as Work-In-Progress!")
 
-        if self.is_auto_squash_enabled(merge_request) and self._options.requests_commit_tagging:
+        auto_squash = (
+            self._project.squash_enforced or
+            merge_request.squash
+        )
+
+        if auto_squash and self._options.requests_commit_tagging:
             raise CannotMerge(
                 "Sorry, merging requests marked as auto-squash would ruin my commit tagging!"
             )

marge/merge_request.py

@@ -159,9 +159,6 @@ def blocking_discussions_resolved(self):
     def force_remove_source_branch(self):
         return self.info['force_remove_source_branch']
 
-    def auto_squash(self, project):
-        return project.squash_option == "always" or self.squash
-
     def update_sha(self, sha):
         """record the updated sha. We don't use refetch_info instead as it may hit cache."""
         self._info['sha'] = sha

marge/project.py

@@ -91,7 +91,7 @@ def merge_requests_enabled(self):
 
     @property
     def squash_option(self):
-        return self.info['squash_option']
+        return self.info.get('squash_option', None)
 
     @property
     def only_allow_merge_if_pipeline_succeeds(self):
@@ -116,6 +116,10 @@ def access_level(self):
         assert effective_access is not None, "GitLab failed to provide user permissions on project"
         return AccessLevel(effective_access['access_level'])
 
+    @property
+    def squash_enforced(self):
+        return self.squash_option == 'always'
+
 
 # pylint: disable=invalid-name
 @unique

marge/single_merge_job.py

@@ -92,9 +92,7 @@ def update_merge_request_and_accept(self, approvals):
 
             self.ensure_mergeable_mr(merge_request)
 
-            auto_squash = None
-            if self.is_auto_squash_enabled(merge_request):
-                auto_squash = True
+            auto_squash = True if target_project.squash_enforced else None
 
             try:
                 ret = merge_request.accept(

pylintrc

@@ -30,7 +30,7 @@ max-line-length=110
 [DESIGN]
 max-args=10
 max-attributes=15
-max-public-methods=40
+max-public-methods=35
 # Maximum number of locals for function / method body
 max-locals=25
 

tests/test_project.py

@@ -13,7 +13,6 @@
     'default_branch': 'master',
     'only_allow_merge_if_pipeline_succeeds': True,
     'only_allow_merge_if_all_discussions_are_resolved': False,
-    'squash_option': 'never',
     'permissions': {
         'project_access': {
             'access_level': AccessLevel.developer.value,