More git info

Author: randomairborne

xpd-common/build.rs

@@ -4,15 +4,25 @@ use std::{
 };
 
 fn main() {
-    let commit_msg = match get_sha() {
+    let commit_sha = match get_sha() {
         Ok(v) => v,
         Err(err) => {
             println!("cargo::warning={err:?}");
-            "(Failed to get version)".to_owned()
+            "(Failed to get git commit sha)".to_owned()
         }
     };
 
-    println!("cargo::rustc-env=GIT_HASH_EXPERIENCED={}", commit_msg);
+    let rev_num = match get_rev() {
+        Ok(v) => v,
+        Err(err) => {
+            println!("cargo::warning={err:?}");
+            "(Failed to get revision number)".to_owned()
+        }
+    };
+
+    println!("cargo::rustc-env=GIT_HASH_EXPERIENCED={}", commit_sha);
+    println!("cargo::rustc-env=GIT_REV_COUNT_EXPERIENCED={}", rev_num)
+
 }
 
 fn get_sha() -> Result<String, Error> {
@@ -34,24 +44,43 @@ fn get_sha() -> Result<String, Error> {
     Ok(output)
 }
 
+fn get_rev() -> Result<String, Error> {
+    let output = Command::new("git")
+        .arg("rev-list")
+        .arg("--count")
+        .arg("HEAD")
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .stdin(Stdio::null())
+        .spawn()?
+        .wait_with_output()?;
+    if !output.status.success() {
+        return Err(Error::BadStatus(output.status));
+    }
+    let output = String::from_utf8(output.stdout)?.trim().to_string();
+    Ok(output)
+}
+
 #[derive(Debug)]
 enum Error {
     TryFromString,
     BadStatus(ExitStatus),
     Io(std::io::Error),
+    ParseInt(std::num::ParseIntError),
     NoOutput,
 }
 
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Self::TryFromString => write!(f, "Invalid UTF-8 in `git rev-parse HEAD` output")?,
+            Self::TryFromString => write!(f, "Invalid UTF-8 in `git` output")?,
             Self::BadStatus(exit_status) => write!(
                 f,
-                "`git rev-parse HEAD` exited with non-zero status {exit_status}"
+                "`git` exited with non-zero status {exit_status}"
             )?,
-            Self::Io(error) => write!(f, "I/O error trying to run `git rev-parse HEAD`: {error}")?,
-            Self::NoOutput => write!(f, "No output from git-rev-parse")?,
+            Self::Io(error) => write!(f, "I/O error trying to run `git`: {error}")?,
+            Self::NoOutput => write!(f, "No output from `git`")?,
+            Self::ParseInt(error) => write!(f, "Could not convert to int: {error}")?
         }
         Ok(())
     }
@@ -74,3 +103,10 @@ impl From<std::io::Error> for Error {
         Self::Io(value)
     }
 }
+
+
+impl From<std::num::ParseIntError> for Error {
+    fn from(value: std::num::ParseIntError) -> Self {
+        Self::ParseInt(value)
+    }
+}

xpd-common/src/lib.rs

@@ -20,6 +20,7 @@ use twilight_model::{
 };
 
 pub const CURRENT_GIT_SHA: &str = env!("GIT_HASH_EXPERIENCED");
+pub const CURRENT_GIT_REV_COUNT: &str = env!("GIT_REV_COUNT_EXPERIENCED");
 pub const DISCORD_EPOCH_MS: i64 = 1_420_070_400_000;
 pub const DISCORD_EPOCH_SECS: i64 = DISCORD_EPOCH_MS / 1000;
 

xpd-slash/src/admin.rs

@@ -8,7 +8,7 @@ use twilight_model::{
     },
 };
 use twilight_util::builder::embed::EmbedBuilder;
-use xpd_common::{CURRENT_GIT_SHA, DEFAULT_MESSAGE_COOLDOWN, DISCORD_EPOCH_SECS};
+use xpd_common::{CURRENT_GIT_SHA, DEFAULT_MESSAGE_COOLDOWN, DISCORD_EPOCH_SECS, CURRENT_GIT_REV_COUNT};
 use xpd_slash_defs::admin::{
     self, AdminCommand, AdminCommandBanGuild, AdminCommandGuildStats, AdminCommandInspectCooldown,
     AdminCommandLeave, AdminCommandPardonGuild, AdminCommandResetGuild, AdminCommandResetUser,
@@ -123,7 +123,7 @@ fn fmt_opt_u64(item: Option<u64>) -> impl Display {
 async fn get_bot_stats(state: SlashState) -> Result<String, Error> {
     let levels_held = xpd_database::total_levels(&state.db).await?;
     Ok(format!(
-        "Roughly {levels_held} levels in database. Bot version `git-{CURRENT_GIT_SHA}`"
+        "Roughly {levels_held} levels in database. Bot git revision `{CURRENT_GIT_SHA}`, commit number `{CURRENT_GIT_REV_COUNT}`"
     ))
 }