Merge branch 'main' into jan_09_mypy

Author: JerrySentry

webhook_handlers/tests/test_github.py

@@ -266,17 +266,19 @@ def test_push_updates_only_unmerged_commits_with_branch_name(self):
         commit2.refresh_from_db()
         merged_commit.refresh_from_db()
 
-        assert commit1.branch == unmerged_branch_name
-        assert commit2.branch == unmerged_branch_name
         assert not commit1.merged
         assert not commit2.merged
 
         assert merged_commit.branch == merged_branch_name
 
     @patch("redis.Redis.sismember", lambda x, y, z: False)
     def test_push_updates_commit_on_default_branch(self):
-        commit1 = CommitFactory(merged=False, repository=self.repo)
-        commit2 = CommitFactory(merged=False, repository=self.repo)
+        commit1 = CommitFactory(
+            merged=False, repository=self.repo, branch="feature-branch"
+        )
+        commit2 = CommitFactory(
+            merged=False, repository=self.repo, branch="feature-branch"
+        )
 
         merged_branch_name = "merged"
         repo_branch = self.repo.branch

webhook_handlers/tests/test_github_enterprise.py

@@ -222,17 +222,19 @@ def test_push_updates_only_unmerged_commits_with_branch_name(self):
         commit2.refresh_from_db()
         merged_commit.refresh_from_db()
 
-        assert commit1.branch == unmerged_branch_name
-        assert commit2.branch == unmerged_branch_name
         assert not commit1.merged
         assert not commit2.merged
 
         assert merged_commit.branch == merged_branch_name
 
     @patch("redis.Redis.sismember", lambda x, y, z: False)
     def test_push_updates_commit_on_default_branch(self):
-        commit1 = CommitFactory(merged=False, repository=self.repo)
-        commit2 = CommitFactory(merged=False, repository=self.repo)
+        commit1 = CommitFactory(
+            merged=False, repository=self.repo, branch="feature-branch"
+        )
+        commit2 = CommitFactory(
+            merged=False, repository=self.repo, branch="feature-branch"
+        )
 
         merged_branch_name = "merged"
         repo_branch = self.repo.branch

webhook_handlers/views/github.py

@@ -5,6 +5,7 @@
 from hashlib import sha1, sha256
 from typing import Optional
 
+from django.db.models import Q
 from django.utils import timezone
 from django.utils.crypto import constant_time_compare
 from rest_framework import status
@@ -239,42 +240,33 @@ def push(self, request, *args, **kwargs):
             )
             return Response(data=WebhookHandlerErrorMessages.SKIP_WEBHOOK_IGNORED)
 
-        branch_name = self.request.data.get("ref")[11:]
+        pushed_to_branch_name = self.request.data.get("ref")[11:]
         commits = self.request.data.get("commits", [])
 
         if not commits:
             log.debug(
-                f"No commits in webhook payload for branch {branch_name}",
+                f"No commits in webhook payload for branch {pushed_to_branch_name}",
                 extra=dict(repoid=repo.repoid, github_webhook_event=self.event),
             )
             return Response()
 
-        commits_queryset = Commit.objects.filter(
-            repository=repo,
-            commitid__in=[commit.get("id") for commit in commits],
-            merged=False,
-        )
-        commits_queryset.update(branch=branch_name)
-        if branch_name == repo.branch:
-            commits_queryset.update(merged=True)
+        if pushed_to_branch_name == repo.branch:
+            commits_queryset = Commit.objects.filter(
+                ~Q(branch=pushed_to_branch_name),
+                repository=repo,
+                commitid__in=[commit.get("id") for commit in commits],
+                merged=False,
+            )
+            commits_queryset.update(branch=pushed_to_branch_name, merged=True)
             log.info(
-                "Pushed commits to default branch; setting merged to True",
+                f"Branch name updated for commits to {pushed_to_branch_name}; setting merged to True",
                 extra=dict(
                     repoid=repo.repoid,
                     github_webhook_event=self.event,
                     commits=[commit.get("id") for commit in commits],
                 ),
             )
 
-        log.info(
-            f"Branch name updated for commits to {branch_name}",
-            extra=dict(
-                repoid=repo.repoid,
-                github_webhook_event=self.event,
-                commits=[commit.get("id") for commit in commits],
-            ),
-        )
-
         most_recent_commit = commits[-1]
 
         if regexp_ci_skip(most_recent_commit.get("message")):
@@ -300,7 +292,7 @@ def push(self, request, *args, **kwargs):
             TaskService().status_set_pending(
                 repoid=repo.repoid,
                 commitid=most_recent_commit.get("id"),
-                branch=branch_name,
+                branch=pushed_to_branch_name,
                 on_a_pull_request=False,
             )