Backport #47822 to 22.3: Place short return before big block, improve logging

tests/ci/merge_pr.py

@@ -100,55 +100,52 @@ def is_approved(self, team: List[NamedUser]) -> bool:
             if review.state == "APPROVED"
         }
 
-        if approved:
+        if not approved:
             logging.info(
-                "The following users from %s team approved the PR: %s",
+                "The PR #%s is not approved by any of %s team member",
+                self.pr.number,
                 TEAM_NAME,
-                ", ".join(user.login for user in approved.keys()),
             )
-            # The only reliable place to get the 100% accurate last_modified
-            # info is when the commit was pushed to GitHub. The info is
-            # available as a header 'last-modified' of /{org}/{repo}/commits/{sha}.
-            # Unfortunately, it's formatted as 'Wed, 04 Jan 2023 11:05:13 GMT'
-
-            commit = self.pr.head.repo.get_commit(self.pr.head.sha)
-            if commit.stats.last_modified is None:
-                logging.warning(
-                    "Unable to get info about the commit %s", self.pr.head.sha
-                )
-                return False
-
-            last_changed = datetime.strptime(
-                commit.stats.last_modified, "%a, %d %b %Y %H:%M:%S GMT"
-            )
-
-            approved_at = max(review.submitted_at for review in approved.values())
-            if approved_at == datetime.fromtimestamp(0):
-                logging.info(
-                    "Unable to get `datetime.fromtimestamp(0)`, "
-                    "here's debug info about reviews: %s",
-                    "\n".join(pformat(review) for review in self.reviews.values()),
-                )
-            else:
-                logging.info(
-                    "The PR is approved at %s",
-                    approved_at.isoformat(),
-                )
-
-            if approved_at < last_changed:
-                logging.info(
-                    "There are changes after approve at %s",
-                    approved_at.isoformat(),
-                )
-                return False
-            return True
+            return False
 
         logging.info(
-            "The PR #%s is not approved by any of %s team member",
-            self.pr.number,
+            "The following users from %s team approved the PR: %s",
             TEAM_NAME,
+            ", ".join(user.login for user in approved.keys()),
+        )
+
+        # The only reliable place to get the 100% accurate last_modified
+        # info is when the commit was pushed to GitHub. The info is
+        # available as a header 'last-modified' of /{org}/{repo}/commits/{sha}.
+        # Unfortunately, it's formatted as 'Wed, 04 Jan 2023 11:05:13 GMT'
+        commit = self.pr.head.repo.get_commit(self.pr.head.sha)
+        if commit.stats.last_modified is None:
+            logging.warning("Unable to get info about the commit %s", self.pr.head.sha)
+            return False
+
+        last_changed = datetime.strptime(
+            commit.stats.last_modified, "%a, %d %b %Y %H:%M:%S GMT"
         )
-        return False
+        logging.info("The PR is changed at %s", last_changed.isoformat())
+
+        approved_at = max(review.submitted_at for review in approved.values())
+        if approved_at == datetime.fromtimestamp(0):
+            logging.info(
+                "Unable to get `datetime.fromtimestamp(0)`, "
+                "here's debug info about reviews: %s",
+                "\n".join(pformat(review) for review in self.reviews.values()),
+            )
+        else:
+            logging.info("The PR is approved at %s", approved_at.isoformat())
+
+        if approved_at < last_changed:
+            logging.info(
+                "There are changes done at %s after approval at %s",
+                last_changed.isoformat(),
+                approved_at.isoformat(),
+            )
+            return False
+        return True
 
 
 def get_workflows_for_head(repo: Repository, head_sha: str) -> List[WorkflowRun]: