cli version: Show date as part of the version next to the commit id, shorten commit id

cli/Cargo.toml

@@ -49,6 +49,7 @@ name = "runner"
 
 [build-dependencies]
 cargo_metadata = { workspace = true }
+chrono = { workspace = true }
 
 [dependencies]
 chrono = { workspace = true }

cli/build.rs

@@ -12,11 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+extern crate chrono;
+
 use std::path::Path;
 use std::process::Command;
 use std::str;
 
 use cargo_metadata::MetadataCommand;
+use chrono::prelude::*;
 
 const GIT_HEAD_PATH: &str = "../.git/HEAD";
 const JJ_OP_HEADS_PATH: &str = "../.jj/repo/op_heads/heads";
@@ -41,21 +44,51 @@ fn main() -> std::io::Result<()> {
     }
     println!("cargo:rerun-if-env-changed=NIX_JJ_GIT_HASH");
 
-    if let Some(git_hash) = get_git_hash() {
-        println!("cargo:rustc-env=JJ_VERSION={}-{}", version, git_hash);
+    if let Some((mut git_hash, maybe_date)) = get_git_timestamp_and_hash() {
+        git_hash.truncate(16);
+        println!(
+            "cargo:rustc-env=JJ_VERSION={}+{}-{}",
+            version,
+            maybe_date
+                .map(|d| d.format("%Y%m%d").to_string())
+                .unwrap_or_else(|| "dateunknown".to_string()),
+            git_hash
+        );
     } else {
         println!("cargo:rustc-env=JJ_VERSION={}", version);
     }
 
     Ok(())
 }
 
-fn get_git_hash() -> Option<String> {
-    if let Some(nix_hash) = std::env::var("NIX_JJ_GIT_HASH")
+/// Convert a string with a unix timestamp to a date
+fn timestamp_to_date(ts_str: &str) -> Option<DateTime<Utc>> {
+    ts_str
+        .parse::<i64>()
         .ok()
-        .filter(|s| !s.is_empty())
-    {
-        return Some(nix_hash);
+        .and_then(|ts| DateTime::<Utc>::from_timestamp(ts, 0))
+}
+
+/// Return the UTC committer date (maybe) and the git hash
+fn get_git_timestamp_and_hash() -> Option<(String, Option<DateTime<Utc>>)> {
+    if let (Ok(nix_hash), maybe_nix_timestamp) = (
+        std::env::var("NIX_JJ_GIT_HASH"),
+        std::env::var("NIX_JJ_GIT_TIMESTAMP"),
+    ) {
+        if !nix_hash.is_empty() {
+            return Some((
+                nix_hash,
+                maybe_nix_timestamp
+                    .ok()
+                    .and_then(|ts_str| timestamp_to_date(&ts_str)),
+            ));
+        }
+    }
+
+    fn parse_timestamp_vbar_hash(bytes: &[u8]) -> (String, Option<DateTime<Utc>>) {
+        let s = str::from_utf8(bytes).unwrap().trim_end();
+        let (ts_str, id) = s.split_once('|').unwrap();
+        (id.to_owned(), timestamp_to_date(ts_str))
     }
     if let Ok(output) = Command::new("jj")
         .args([
@@ -64,19 +97,21 @@ fn get_git_hash() -> Option<String> {
             "log",
             "--no-graph",
             "-r=@-",
-            "-T=commit_id",
+            r#"-T=committer.timestamp().utc().format("%s") ++ "|" ++ commit_id"#,
         ])
         .output()
     {
         if output.status.success() {
-            return Some(String::from_utf8(output.stdout).unwrap());
+            return Some(parse_timestamp_vbar_hash(&output.stdout));
         }
     }
 
-    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
+    if let Ok(output) = Command::new("git")
+        .args(["log", "-1", "--format=%ct|%H", "HEAD"])
+        .output()
+    {
         if output.status.success() {
-            let line = str::from_utf8(&output.stdout).unwrap();
-            return Some(line.trim_end().to_owned());
+            return Some(parse_timestamp_vbar_hash(&output.stdout));
         }
     }
 

cli/tests/test_global_opts.rs

@@ -48,7 +48,9 @@ fn test_version() {
     let sanitized = stdout.replace(|c: char| c.is_ascii_hexdigit(), "?");
     let expected = [
         "jj ?.??.?\n",
-        "jj ?.??.?-????????????????????????????????????????\n",
+        "jj ?.??.?+????????-????????????????\n",
+        // `dateunknown` turns into `??t?unknown` since d,a,e are hex digits.
+        "jj ?.??.?+??t?unknown-????????????????\n",
     ];
     assert!(
         expected.contains(&sanitized.as_str()),

flake.nix

@@ -18,6 +18,11 @@
   } //
   (flake-utils.lib.eachDefaultSystem (system:
     let
+      # TODO(aseipp): Use dirtyRev and dirtyShortRev to record dirty checkout
+      # when we update `build.rs` to understand dirty checkouts.
+      gitRev = self.rev or "";
+      gitTimestamp = toString self.lastModified;
+
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
@@ -100,7 +105,8 @@
           ZSTD_SYS_USE_PKG_CONFIG = "1";
           LIBSSH2_SYS_USE_PKG_CONFIG = "1";
           RUSTFLAGS = pkgs.lib.optionalString useMoldLinker "-C link-arg=-fuse-ld=mold";
-          NIX_JJ_GIT_HASH = self.rev or "";
+          NIX_JJ_GIT_HASH = gitRev;
+          NIX_JJ_GIT_TIMESTAMP = gitTimestamp;
           CARGO_INCREMENTAL = "0";
 
           preCheck = ''
@@ -175,8 +181,10 @@
           export RUST_BACKTRACE=1
           export ZSTD_SYS_USE_PKG_CONFIG=1
           export LIBSSH2_SYS_USE_PKG_CONFIG=1
-
           export RUSTFLAGS="-Zthreads=0"
+
+          export NIX_JJ_GIT_HASH="${gitRev}"
+          export NIX_JJ_GIT_TIMESTAMP="${gitTimestamp}";
         '' + pkgs.lib.optionalString useMoldLinker ''
           export RUSTFLAGS+=" -C link-arg=-fuse-ld=mold -C link-arg=-Wl,--compress-debug-sections=zstd"
         '' + darwinNextestHack;