Merge pull request #631 from rust-lang/revert-630-bors-squash

Revert "Implement `@bors squash` command"

Author: Kobzol

src/bors/command/mod.rs

@@ -134,6 +134,4 @@ pub enum BorsCommand {
     Retry,
     /// Cancel an auto build currently running on a given PR (without removing it from the queue).
     Cancel,
-    /// Squash all commits of a pull request into a single commit.
-    Squash,
 }

src/bors/command/parser.rs

@@ -138,7 +138,6 @@ const DEFAULT_PARSERS: &[ParserFn] = &[
     parser_retry,
     parser_tree_ops,
     parser_cancel,
-    parser_squash,
 ];
 
 fn parse_command(input: &str, parsers: &[ParserFn]) -> ParseResult {
@@ -443,14 +442,6 @@ fn parser_cancel(command: &CommandPart<'_>, _parts: &[CommandPart<'_>]) -> Parse
     }
 }
 
-/// Parses `@bors squash` command.
-fn parser_squash(command: &CommandPart<'_>, _parts: &[CommandPart<'_>]) -> ParseResult {
-    match command {
-        CommandPart::Bare("squash") => Some(Ok(BorsCommand::Squash)),
-        _ => None,
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::bors::command::parser::{CommandParseError, CommandParser};
@@ -1363,13 +1354,6 @@ for the crater",
         assert_eq!(cmds[0], Ok(BorsCommand::Cancel));
     }
 
-    #[test]
-    fn parse_squash() {
-        let cmds = parse_commands("@bors squash");
-        assert_eq!(cmds.len(), 1);
-        assert_eq!(cmds[0], Ok(BorsCommand::Squash));
-    }
-
     #[test]
     fn parse_in_html_command() {
         let cmds = parse_commands(

src/bors/handlers/help.rs

@@ -52,7 +52,6 @@ mod tests {
             - `try cancel`: Cancel a running try build on the current PR.
             - `retry`: Clear a failed auto build status from an approved PR. This will cause the merge queue to eventually attempt to merge the PR again.
             - `cancel` | `yield`: Cancel a running auto build on the current PR.
-            - `squash`: Squash the commits of a PR into a single commit.
             - `info`: Get information about the current PR
 
             ## Repository management

src/bors/handlers/mod.rs

@@ -15,7 +15,6 @@ use crate::bors::handlers::refresh::{
 use crate::bors::handlers::review::{
     command_approve, command_close_tree, command_open_tree, command_unapprove,
 };
-use crate::bors::handlers::squash::command_squash;
 use crate::bors::handlers::trybuild::{command_try_build, command_try_cancel};
 use crate::bors::handlers::workflow::{handle_workflow_completed, handle_workflow_started};
 use crate::bors::labels::handle_label_trigger;
@@ -47,7 +46,6 @@ mod ping;
 mod pr_events;
 mod refresh;
 mod review;
-mod squash;
 mod trybuild;
 mod workflow;
 
@@ -537,12 +535,6 @@ async fn handle_comment(
                         .instrument(span)
                         .await
                     }
-                    BorsCommand::Squash => {
-                        let span = tracing::info_span!("Squash");
-                        command_squash(repo, database, pr, &comment.author, ctx.parser.prefix())
-                            .instrument(span)
-                            .await
-                    }
                 };
                 if result.is_err() {
                     return result.context("Cannot execute Bors command");

src/bors/handlers/squash.rs

@@ -78,7 +78,6 @@ pub fn format_help() -> &'static str {
         BorsCommand::TreeClosed(_) => {}
         BorsCommand::Retry => {}
         BorsCommand::Cancel => {}
-        BorsCommand::Squash => {}
     }
 
     r#"
@@ -107,7 +106,6 @@ You can use the following commands:
 - `try cancel`: Cancel a running try build on the current PR.
 - `retry`: Clear a failed auto build status from an approved PR. This will cause the merge queue to eventually attempt to merge the PR again.
 - `cancel` | `yield`: Cancel a running auto build on the current PR.
-- `squash`: Squash the commits of a PR into a single commit.
 - `info`: Get information about the current PR
 
 ## Repository management

src/bors/mod.rs

@@ -697,7 +697,6 @@ pub fn pr_needs_update_in_db(db_pr: &PullRequestModel, gh_pr: &PullRequest) -> b
         number: _,
         head_label: _,
         head,
-        head_repository: _,
         base,
         title,
         // It seems that when we query PRs in bulk from GitHub, the mergeability status is
@@ -709,7 +708,6 @@ pub fn pr_needs_update_in_db(db_pr: &PullRequestModel, gh_pr: &PullRequest) -> b
         status,
         labels: _,
         html_url: _,
-        commit_count: _,
     } = gh_pr;
     if status != db_status {
         return true;

src/database/mod.rs

@@ -187,50 +187,6 @@ impl GithubRepositoryClient {
         Ok(prs)
     }
 
-    pub async fn get_pull_request_commits(
-        &self,
-        number: PullRequestNumber,
-    ) -> anyhow::Result<Vec<Commit>> {
-        let commits = perform_retryable(
-            "get_pull_request_commits",
-            RetryMethod::default(),
-            || async {
-                let response = self
-                    .client
-                    .pulls(self.repository().owner(), self.repository().name())
-                    .pr_commits(number.0)
-                    .per_page(100)
-                    .send()
-                    .await
-                    .map_err(|error| {
-                        anyhow::anyhow!(
-                            "Could not get PR {}#{number}: {error:?}",
-                            self.repository()
-                        )
-                    })?;
-
-                let mut commits = Vec::new();
-                let mut stream = std::pin::pin!(response.into_stream(&self.client));
-                while let Some(gh_commit) = stream.try_next().await? {
-                    let commit = Commit {
-                        sha: CommitSha(gh_commit.sha),
-                        parents: gh_commit
-                            .parents
-                            .into_iter()
-                            .filter_map(|p| p.sha.map(CommitSha))
-                            .collect(),
-                        tree: TreeSha(gh_commit.commit.tree.sha),
-                        author: CommitAuthor::from_gh(gh_commit.commit.author),
-                    };
-                    commits.push(commit);
-                }
-                anyhow::Ok(commits)
-            },
-        )
-        .await?;
-        Ok(commits)
-    }
-
     /// Post a comment to the pull request with the given number.
     /// The comment will be posted as the Github App user of the bot.
     pub async fn post_comment(
@@ -264,34 +220,7 @@ impl GithubRepositoryClient {
         force: ForcePush,
     ) -> Result<(), crate::github::api::operations::BranchUpdateError> {
         perform_retryable("set_branch_to_sha", RetryMethod::default(), || async {
-            set_branch_to_commit(self, self.repository(), branch.to_string(), sha, force)
-                .await
-                .map_err(|e| match e {
-                    error @ (BranchUpdateError::Conflict(_)
-                    | BranchUpdateError::ValidationFailed(_)) => ShouldRetry::No(error),
-                    error => ShouldRetry::Yes(error),
-                })
-        })
-        .await
-        .map_err(|error| match error {
-            RetryableOpError::Err(error) => error,
-            RetryableOpError::AllAttemptsExhausted(_) => BranchUpdateError::Timeout,
-        })
-    }
-
-    /// Set the given branch **of a fork** to a commit with the given `sha`.
-    /// Must not be called on the same repository of this client.
-    pub async fn set_fork_branch_to_sha(
-        &self,
-        repo: &GithubRepoName,
-        branch: &str,
-        sha: &CommitSha,
-        force: ForcePush,
-    ) -> Result<(), crate::github::api::operations::BranchUpdateError> {
-        assert_ne!(self.repository(), repo);
-
-        perform_retryable("set_fork_branch_to_sha", RetryMethod::default(), || async {
-            set_branch_to_commit(self, repo, branch.to_string(), sha, force)
+            set_branch_to_commit(self, branch.to_string(), sha, force)
                 .await
                 .map_err(|e| match e {
                     error @ (BranchUpdateError::Conflict(_)
@@ -310,7 +239,7 @@ impl GithubRepositoryClient {
     pub async fn create_branch(&self, branch: &str, sha: &CommitSha) -> anyhow::Result<()> {
         perform_retryable("create_branch", RetryMethod::default(), || async {
             anyhow::Ok(
-                create_branch(self, self.repository(), branch.to_string(), sha)
+                create_branch(self, branch.to_string(), sha)
                     .await
                     .map_err(|err| anyhow::anyhow!("{err}"))?,
             )
@@ -800,27 +729,12 @@ pub struct CheckRunOutput {
     pub summary: String,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug)]
 pub struct CommitAuthor {
     pub name: String,
     pub email: String,
 }
 
-impl CommitAuthor {
-    pub fn from_gh(gh_author: Option<octocrab::models::repos::CommitAuthor>) -> Option<Self> {
-        if let Some(author) = gh_author
-            && let Some(email) = author.email
-        {
-            Some(Self {
-                name: author.name,
-                email,
-            })
-        } else {
-            None
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::github::GithubRepoName;