Handle temporary new bors e-mail

Author: Kobzol

src/git.rs

@@ -13,7 +13,7 @@ use git2::build::RepoBuilder;
 use git2::{Commit as Git2Commit, Repository};
 use log::debug;
 
-use crate::{Author, Commit, GitDate, BORS_AUTHOR};
+use crate::{Author, Commit, GitDate, BORS_AUTHORS};
 
 impl Commit {
     // Takes &mut because libgit2 internally caches summaries
@@ -153,9 +153,9 @@ pub fn get_commits_between(first_commit: &str, last_commit: &str) -> anyhow::Res
     // two commits are merge commits made by bors
     let assert_by_bors = |c: &Git2Commit<'_>| -> anyhow::Result<()> {
         match c.author().name() {
-            Some(author) if author == BORS_AUTHOR => Ok(()),
+            Some(author) if BORS_AUTHORS.contains(&author) => Ok(()),
             Some(author) => bail!(
-                "Expected author {author} to be {BORS_AUTHOR} for {}.\n \
+                "Expected author {author} to be one of {BORS_AUTHORS:?} for {}.\n \
                 Make sure specified commits are on the default branch!",
                 c.id()
             ),
@@ -179,7 +179,12 @@ pub fn get_commits_between(first_commit: &str, last_commit: &str) -> anyhow::Res
         res.push(Commit::from_git2_commit(&mut current));
         match current.parents().next() {
             Some(c) => {
-                if c.author().name() != Some(BORS_AUTHOR) {
+                if !c
+                    .author()
+                    .name()
+                    .map(|name| BORS_AUTHORS.contains(&name))
+                    .unwrap_or(false)
+                {
                     debug!(
                         "{:?} has non-bors author: {:?}, skipping",
                         c.id(),

src/github.rs

@@ -3,7 +3,7 @@ use reqwest::header::{HeaderMap, HeaderValue, InvalidHeaderValue, AUTHORIZATION,
 use reqwest::{blocking::Client, blocking::Response};
 use serde::{Deserialize, Serialize};
 
-use crate::{parse_to_naive_date, Author, Commit, GitDate, BORS_AUTHOR};
+use crate::{parse_to_naive_date, Author, Commit, GitDate, BORS_AUTHORS};
 
 #[derive(Serialize, Deserialize, Debug)]
 struct GithubCommitComparison {
@@ -141,42 +141,44 @@ impl CommitsQuery<'_> {
 
         // focus on Pull Request merges, all authored and committed by bors.
         let client = Client::builder().default_headers(headers()?).build()?;
-        for page in 1.. {
-            let url = CommitsUrl {
-                page,
-                author: BORS_AUTHOR,
-                since: self.since_date,
-                sha: self.most_recent_sha,
-            }
-            .url();
-
-            let response: Response = client.get(&url).send()?;
-            let status = response.status();
-            if !status.is_success() {
-                bail!(
-                    "error: url <{}> response {}: {}",
-                    url,
-                    status,
-                    response.text().unwrap_or_else(|_| format!("<empty>"))
-                );
-            }
+        for bors_author in BORS_AUTHORS {
+            for page in 1.. {
+                let url = CommitsUrl {
+                    page,
+                    author: bors_author,
+                    since: self.since_date,
+                    sha: self.most_recent_sha,
+                }
+                .url();
 
-            let action = parse_paged_elems(response, |elem: GithubCommitElem| {
-                let found_last = elem.sha == self.earliest_sha;
-                if found_last {
-                    eprintln!(
-                        "ending github query because we found starting sha: {}",
-                        elem.sha
+                let response: Response = client.get(&url).send()?;
+                let status = response.status();
+                if !status.is_success() {
+                    bail!(
+                        "error: url <{}> response {}: {}",
+                        url,
+                        status,
+                        response.text().unwrap_or_else(|_| format!("<empty>"))
                     );
                 }
-                let commit = elem.git_commit()?;
-                commits.push(commit);
 
-                Ok(if found_last { Loop::Break } else { Loop::Next })
-            })?;
+                let action = parse_paged_elems(response, |elem: GithubCommitElem| {
+                    let found_last = elem.sha == self.earliest_sha;
+                    if found_last {
+                        eprintln!(
+                            "ending github query because we found starting sha: {}",
+                            elem.sha
+                        );
+                    }
+                    let commit = elem.git_commit()?;
+                    commits.push(commit);
+
+                    Ok(if found_last { Loop::Break } else { Loop::Next })
+                })?;
 
-            if let Loop::Break = action {
-                break;
+                if let Loop::Break = action {
+                    break;
+                }
             }
         }
 

src/main.rs

@@ -36,7 +36,8 @@ use crate::toolchains::{
     ToolchainSpec, YYYY_MM_DD,
 };
 
-const BORS_AUTHOR: &str = "bors";
+/// Git usernames used by bors.
+const BORS_AUTHORS: &[&str] = &["bors", "rust-bors[bot]"];
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Commit {
@@ -997,9 +998,9 @@ impl Config {
         let start = access.commit(start_sha)?;
         let end = access.commit(end_sha)?;
         let assert_by_bors = |c: &Commit| -> anyhow::Result<()> {
-            if c.committer.name != BORS_AUTHOR {
+            if !BORS_AUTHORS.contains(&c.committer.name.as_str()) {
                 bail!(
-                    "Expected author {} to be {BORS_AUTHOR} for {}.\n \
+                    "Expected author {} to be one of {BORS_AUTHORS:?} for {}.\n \
                      Make sure specified commits are on the default branch \
                      and refer to a bors merge commit!",
                     c.committer.name,