Merge pull request #574 from Kobzol/rollup-merge-ignore-block

Remove `homu-ignore` blocks also in rollup merge commit messages

Author: Kobzol

src/bors/mod.rs

@@ -287,10 +287,8 @@ pub fn make_text_ignored_by_bors(text: &str) -> String {
     format!("{IGNORE_BLOCK_START}\n{text}\n{IGNORE_BLOCK_END}")
 }
 
-pub fn create_merge_commit_message(pr: handlers::PullRequestData, merge_type: MergeType) -> String {
-    /// Prefix used to specify custom try jobs in PR descriptions.
-    const CUSTOM_TRY_JOB_PREFIX: &str = "try-job:";
-
+/// Remove homu-ignore blocks from the merge message
+pub fn normalize_merge_message(message: &str) -> String {
     static IGNORE_REGEX: LazyLock<Regex> = LazyLock::new(|| {
         RegexBuilder::new(r"<!--\s*homu-ignore:start\s*-->.*?<!--\s*homu-ignore:end\s*-->")
             .multi_line(true)
@@ -299,6 +297,12 @@ pub fn create_merge_commit_message(pr: handlers::PullRequestData, merge_type: Me
             .build()
             .unwrap()
     });
+    IGNORE_REGEX.replace_all(message, "").to_string()
+}
+
+pub fn create_merge_commit_message(pr: handlers::PullRequestData, merge_type: MergeType) -> String {
+    /// Prefix used to specify custom try jobs in PR descriptions.
+    const CUSTOM_TRY_JOB_PREFIX: &str = "try-job:";
 
     let pr_number = pr.number();
 
@@ -322,7 +326,7 @@ pub fn create_merge_commit_message(pr: handlers::PullRequestData, merge_type: Me
         MergeType::Try { .. } => String::new(),
         MergeType::Auto => pr.github.message.clone(),
     };
-    let pr_description = IGNORE_REGEX.replace_all(&pr_description, "");
+    let pr_description = normalize_merge_message(&pr_description);
 
     let mut message = format!(
         r#"Auto merge of #{pr_number} - {pr_label}, r={reviewer}

src/github/rollup.rs

@@ -1,6 +1,6 @@
 use super::{GithubRepoName, PullRequest, PullRequestNumber};
 use crate::PgDbClient;
-use crate::bors::make_text_ignored_by_bors;
+use crate::bors::{make_text_ignored_by_bors, normalize_merge_message};
 use crate::github::api::client::GithubRepositoryClient;
 use crate::github::api::operations::MergeError;
 use crate::github::oauth::{OAuthClient, UserGitHubClient};
@@ -299,6 +299,7 @@ async fn create_rollup(
             pr.title,
             pr_github.message
         );
+        let merge_msg = normalize_merge_message(&merge_msg);
 
         // Merge the PR's head commit into the rollup branch
         let merge_attempt = user_client
@@ -675,6 +676,62 @@ mod tests {
         ");
     }
 
+    #[sqlx::test]
+    async fn rollup_remove_homu_ignore_block(pool: sqlx::PgPool) {
+        let gh = run_test((pool, rollup_state()), async |ctx: &mut BorsTester| {
+            let pr2 = ctx
+                .open_pr(default_repo_name(), |pr| {
+                    pr.description = r"This is a very good PR.
+
+<!-- homu-ignore:start -->
+ignore this 1
+<!-- homu-ignore:end -->
+
+include this
+
+<!-- homu-ignore:start -->
+ignore this 2
+<!-- homu-ignore:end -->
+
+also include this pls"
+                        .to_string();
+                })
+                .await?;
+            ctx.approve(pr2.id()).await?;
+
+            make_rollup(ctx, &[&pr2])
+                .await?
+                .assert_status(StatusCode::TEMPORARY_REDIRECT);
+            Ok(())
+        })
+        .await;
+        let rollup_branch = gh
+            .get_repo(fork_repo())
+            .lock()
+            .branches()
+            .iter()
+            .find(|branch| branch.name().starts_with("rollup"))
+            .unwrap()
+            .clone();
+        // Find the rollup merge commit
+        let rollup_merge_commit = rollup_branch.get_commit_history().last().unwrap().clone();
+        insta::assert_snapshot!(rollup_merge_commit.message(), @"
+        Rollup merge of #2 - pr-2, r=default-user
+
+        Title of PR 2
+
+        This is a very good PR.
+
+
+
+        include this
+
+
+
+        also include this pls
+        ");
+    }
+
     async fn make_rollup(
         ctx: &mut BorsTester,
         prs: &[&PullRequest],