remove logic judging commits

Signed-off-by: xizheyin <[email protected]>

Author: xizheyin

src/config.rs

@@ -432,10 +432,6 @@ pub(crate) struct NoMentionsConfig {}
 #[derive(PartialEq, Eq, Debug, serde::Deserialize)]
 #[serde(deny_unknown_fields)]
 pub(crate) struct BehindMasterConfig {
-    /// The threshold of commits behind master to trigger a warning.
-    /// Default is 100 if not specified.
-    pub(crate) commits_behind_threshold: Option<usize>,
-
     /// The threshold of days for parent commit age to trigger a warning.
     /// Default is 14 days if not specified.
     pub(crate) parent_age_threshold: Option<usize>,

src/github.rs

@@ -1077,52 +1077,6 @@ impl Issue {
         Ok(())
     }
 
-    /// Returns the comparison between the PR and the base branch.
-    /// `BranchComparison::commits` are commits behind the base branch.
-    ///
-    /// Returns `None` if this is not a PR or if getting the comparison fails.
-    pub async fn branch_comparison(
-        &self,
-        client: &GithubClient,
-    ) -> anyhow::Result<BranchComparison> {
-        let repo_info = match client.repository(&self.repository().full_repo_name()).await {
-            Ok(repo) => repo,
-            Err(e) => {
-                log::error!(
-                    "Error getting repository info for PR #{}: {}",
-                    self.number,
-                    e
-                );
-                return Err(e);
-            }
-        };
-
-        let Some(base) = &self.base else {
-            return Err(anyhow::anyhow!(
-                "No base branch found for PR #{}",
-                self.number
-            ));
-        };
-
-        let Some(head) = &self.head else {
-            return Err(anyhow::anyhow!(
-                "No head branch found for PR #{}",
-                self.number
-            ));
-        };
-
-        // head ref is something like `username:branch-name`
-        let head_label = &head.label;
-        // base label is `rust-lang:master``
-        let base_label = &base.label;
-
-        let comparison = repo_info
-            .compare_branches(client, base_label, head_label)
-            .await?;
-
-        Ok(comparison)
-    }
-
     /// Checks if the PR's parent commit is too old.
     ///
     /// This determines if a PR needs updating by examining the first parent of the PR's head commit,
@@ -1335,7 +1289,6 @@ struct PullRequestEventFields {}
 
 #[derive(Clone, Debug, serde::Deserialize)]
 pub struct CommitBase {
-    pub label: String,
     pub sha: String,
     #[serde(rename = "ref")]
     pub git_ref: String,
@@ -2099,28 +2052,6 @@ impl Repository {
             .await
             .with_context(|| format!("{} failed to get pulls for commit {sha}", self.full_name))
     }
-
-    /// Compare two branches, possibly across repositories
-    ///
-    /// Format for head and base:
-    ///   - For same repo: "branch_name"
-    ///   - For different repo: "owner:branch_name"
-    ///
-    /// Example: compare_branches(client, "main", "user:feature-branch").await
-    /// This will compare user:feature-branch against the main branch of the current repo
-    /// Note: GitHub API has a limit of 250 commits per page. So, we fetch **one** page is enough
-    pub async fn compare_branches(
-        &self,
-        client: &GithubClient,
-        base: &str,
-        head: &str,
-    ) -> anyhow::Result<BranchComparison> {
-        let url = format!("{}/compare/{}...{}", self.url(client), base, head);
-        client
-            .json(client.get(&url))
-            .await
-            .with_context(|| format!("Failed to compare branches: {} vs {}", base, head))
-    }
 }
 
 /// Information about a merge conflict on a PR.
@@ -3349,23 +3280,6 @@ impl Submodule {
     }
 }
 
-#[derive(Debug, serde::Deserialize)]
-pub struct BranchComparison {
-    pub url: String,
-    pub html_url: String,
-    pub permalink_url: String,
-    pub diff_url: String,
-    pub patch_url: String,
-    pub base_commit: GithubCommit,
-    pub merge_base_commit: GithubCommit,
-    pub status: String,
-    pub ahead_by: u32,
-    pub behind_by: u32,
-    pub total_commits: u32,
-    pub commits: Vec<GithubCommit>,
-    pub files: Option<Vec<PullRequestFile>>,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/handlers/check_commits.rs

@@ -96,21 +96,12 @@ pub(super) async fn handle(ctx: &Context, event: &Event, config: &Config) -> any
 
     // Check if PR is behind master branch by a significant number of commits
     if let Some(behind_master) = &config.behind_master {
-        let commits_behind_threshold = behind_master
-            .commits_behind_threshold
-            .unwrap_or(behind_master::DEFAULT_COMMITS_BEHIND_THRESHOLD);
-
         let parent_age_threshold = behind_master
             .parent_age_threshold
             .unwrap_or(behind_master::DEFAULT_PARENT_AGE_THRESHOLD);
 
-        if let Some(warning) = behind_master::behind_master(
-            parent_age_threshold,
-            commits_behind_threshold,
-            event,
-            &ctx.github,
-        )
-        .await
+        if let Some(warning) =
+            behind_master::behind_master(parent_age_threshold, event, &ctx.github).await
         {
             warnings.push(warning);
         }

src/handlers/check_commits/behind_master.rs

@@ -1,17 +1,13 @@
 use crate::github::{GithubClient, IssuesEvent};
 use tracing as log;
 
-/// Default threshold for the number of commits behind master to trigger a warning
-pub const DEFAULT_COMMITS_BEHIND_THRESHOLD: usize = 100;
-
 /// Default threshold for parent commit age in days to trigger a warning
 pub const DEFAULT_PARENT_AGE_THRESHOLD: usize = 14;
 
 /// Check if the PR is behind the main branch by a significant number of commits
 /// or based on an old parent commit
 pub async fn behind_master(
     age_threshold: usize,
-    merge_commits_threshold: usize,
     event: &IssuesEvent,
     client: &GithubClient,
 ) -> Option<String> {
@@ -21,22 +17,6 @@ pub async fn behind_master(
 
     log::debug!("Checking if PR #{} is behind master", event.issue.number);
 
-    // Get the repository info to determine default branch
-    let repo_info = match client
-        .repository(&event.issue.repository().full_repo_name())
-        .await
-    {
-        Ok(repo) => repo,
-        Err(e) => {
-            log::error!(
-                "Error getting repository info for PR #{}: {}",
-                event.issue.number,
-                e
-            );
-            return None;
-        }
-    };
-
     // First try the parent commit age check as it's more accurate
     match event
         .issue
@@ -74,103 +54,5 @@ It's recommended to update your branch according to the \
         }
     }
 
-    // Fall back to the commit count method
-    // check only auto-merge and rollup-merge commits
-    let comparison = match event.issue.branch_comparison(client).await {
-        Ok(comparison) => comparison,
-        Err(e) => {
-            log::error!(
-                "Error getting branch comparison for PR #{}: {}",
-                event.issue.number,
-                e
-            );
-            return None;
-        }
-    };
-
-    // Total commits behind master
-    let total_behind_by = comparison.behind_by as usize;
-
-    // First check if we're not totaly behind by much, no need to filter commits to make the check faster
-    if total_behind_by < merge_commits_threshold {
-        return None;
-    }
-
-    log::debug!(
-        "PR #{} is {} commits behind {}. Counting auto-merge and rollup-merge commits...",
-        event.issue.number,
-        total_behind_by,
-        repo_info.default_branch
-    );
-
-    // Count only auto-merge and rollup commits
-    let mut auto_merge_commits = Vec::new();
-    let mut rollup_merge_commits = Vec::new();
-
-    for commit in &comparison.commits {
-        let message = &commit.commit.message;
-        if message.starts_with("Auto merge of #") {
-            auto_merge_commits.push(commit);
-        } else if message.starts_with("Rollup merge of #") {
-            rollup_merge_commits.push(commit);
-        }
-    }
-
-    let merge_commits_count = auto_merge_commits.len() + rollup_merge_commits.len();
-
-    log::info!(
-        "PR #{} is {} commits behind {} (only including {} auto-merge and {} rollup commits)",
-        event.issue.number,
-        merge_commits_count,
-        repo_info.default_branch,
-        auto_merge_commits.len(),
-        rollup_merge_commits.len()
-    );
-
-    // Log detailed information about the auto-merge and rollup commits
-    for commit in &auto_merge_commits {
-        log::trace!(
-            "Auto-merge commit: {} - {}",
-            commit.sha,
-            first_line(&commit.commit.message)
-        );
-    }
-
-    for commit in &rollup_merge_commits {
-        log::trace!(
-            "Rollup commit: {} - {}",
-            commit.sha,
-            first_line(&commit.commit.message)
-        );
-    }
-
-    // If there are at least the threshold of merge commits, generate a warning
-    if merge_commits_count >= merge_commits_threshold as usize {
-        log::info!(
-            "PR #{} has {} merge commits ({} auto-merge and {} rollup) behind {} (threshold: {})",
-            event.issue.number,
-            merge_commits_count,
-            auto_merge_commits.len(),
-            rollup_merge_commits.len(),
-            repo_info.default_branch,
-            merge_commits_threshold
-        );
-
-        return Some(format!(
-            "This PR is missing {} important merge commits from the `{}` branch ({} auto-merge and {} rollup commits). \
-It's recommended to update your branch according to the \
-[Rustc Dev Guide](https://rustc-dev-guide.rust-lang.org/contributing.html#keeping-your-branch-up-to-date).",
-            merge_commits_count,
-            repo_info.default_branch,
-            auto_merge_commits.len(),
-            rollup_merge_commits.len()
-        ));
-    }
-
     None
 }
-
-// Helper function to get the first line of a commit message
-fn first_line(message: &str) -> &str {
-    message.lines().next().unwrap_or("")
-}