Implement release subcommand in clippy_dev

This is a QoL improvement for doing releases. The `release bump_version`
subcommand increments the version in all relevant `Cargo.toml` files. The
`release commit` command will only work with the new Josh syncs. Until then the
old way, using `git log` has to be used.

Author: flip1995

clippy_dev/src/main.rs

@@ -97,6 +97,7 @@ fn main() {
         },
         DevCommand::Release(ReleaseCommand { subcommand }) => match subcommand {
             ReleaseSubcommand::BumpVersion => release::bump_version(clippy.version),
+            ReleaseSubcommand::Commit { repo_path, branch } => release::rustc_clippy_commit(repo_path, branch),
         },
     }
 }
@@ -366,4 +367,11 @@ enum ReleaseSubcommand {
     #[command(name = "bump_version")]
     /// Bump the version in the Cargo.toml files
     BumpVersion,
+    /// Print the Clippy commit in the rustc repo for the specified branch
+    Commit {
+        /// The path to a rustc repo to look for the commit
+        repo_path: String,
+        /// For which branch to print the commit
+        branch: release::Branch,
+    },
 }

clippy_dev/src/release.rs

@@ -1,5 +1,10 @@
+use crate::sync::PUSH_PR_DESCRIPTION;
 use crate::utils::{FileUpdater, UpdateStatus, Version, parse_cargo_package};
-use std::fmt::Write;
+
+use std::fmt::{Display, Write};
+
+use clap::ValueEnum;
+use xshell::{Shell, cmd};
 
 static CARGO_TOML_FILES: &[&str] = &[
     "clippy_config/Cargo.toml",
@@ -28,3 +33,47 @@ pub fn bump_version(mut version: Version) {
         });
     }
 }
+
+#[derive(ValueEnum, Copy, Clone)]
+pub enum Branch {
+    Stable,
+    Beta,
+    Master,
+}
+
+impl Display for Branch {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Branch::Stable => write!(f, "stable"),
+            Branch::Beta => write!(f, "beta"),
+            Branch::Master => write!(f, "master"),
+        }
+    }
+}
+
+pub fn rustc_clippy_commit(rustc_path: String, branch: Branch) {
+    let sh = Shell::new().expect("failed to create shell");
+    sh.change_dir(rustc_path);
+
+    let base = branch.to_string();
+    cmd!(sh, "git fetch https://github.com/rust-lang/rust {base}")
+        .run()
+        .expect("failed to fetch base commit");
+    let last_rustup_commit = cmd!(
+        sh,
+        "git log -1 --merges --grep=\"{PUSH_PR_DESCRIPTION}\" FETCH_HEAD -- src/tools/clippy"
+    )
+    .read()
+    .expect("failed to run git log");
+
+    let commit = last_rustup_commit
+        .lines()
+        .find(|c| c.contains("Sync from Clippy commit:"))
+        .expect("no commit found")
+        .trim()
+        .rsplit_once('@')
+        .expect("no commit hash found")
+        .1;
+
+    println!("{commit}");
+}