Merge pull request #1485 from ChJR/feature/sys.version

windelbouwman · web-flow · commit d3ff1c6c2dc7 · 2019-10-08T20:24:09.000+02:00
Change format of sys.version
diff --git a/vm/build.rs b/vm/build.rs
@@ -15,15 +15,15 @@ fn git_hash() -> String {
 }
 
 fn git_timestamp() -> String {
-    git(&["log", "-1", "--format=%cd"])
+    git(&["log", "-1", "--format=%ct"])
 }
 
 fn git_tag() -> String {
     git(&["describe", "--all", "--always", "--dirty"])
 }
 
 fn git_branch() -> String {
-    git(&["rev-parse", "--abbrev-ref", "HEAD"])
+    git(&["name-rev", "--name-only", "HEAD"])
 }
 
 fn git(args: &[&str]) -> String {
diff --git a/vm/src/stdlib/platform.rs b/vm/src/stdlib/platform.rs
@@ -32,7 +32,8 @@ fn platform_python_compiler(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
 
 fn platform_python_build(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
     arg_check!(vm, args);
-    let (git_hash, git_timestamp) = version::get_build_info();
+    let git_hash = version::get_git_identifier();
+    let git_timestamp = version::get_git_datetime();
     Ok(vm
         .ctx
         .new_tuple(vec![vm.new_str(git_hash), vm.new_str(git_timestamp)]))
diff --git a/vm/src/version.rs b/vm/src/version.rs
@@ -16,10 +16,14 @@ pub struct VersionInfo {
     releaselevel: &'static str,
     serial: usize,
 }
+extern crate chrono;
+use chrono::prelude::DateTime;
+use chrono::Local;
+use std::time::{Duration, UNIX_EPOCH};
 
 pub fn get_version() -> String {
     format!(
-        "{} {:?} {}",
+        "{:.80} ({:.80}) {:.80}",
         get_version_number(),
         get_build_info(),
         get_compiler()
@@ -42,16 +46,28 @@ pub fn get_version_number() -> String {
 
 pub fn get_compiler() -> String {
     let rustc_version = rustc_version_runtime::version_meta();
-    format!("rustc {}", rustc_version.semver)
+    format!("\n[rustc {}]", rustc_version.semver)
 }
 
-pub fn get_build_info() -> (String, String) {
-    let git_hash = get_git_revision();
+pub fn get_build_info() -> String {
     // See: https://reproducible-builds.org/docs/timestamps/
-    let git_timestamp = option_env!("RUSTPYTHON_GIT_TIMESTAMP")
-        .unwrap_or("")
-        .to_string();
-    (git_hash, git_timestamp)
+    let git_revision = get_git_revision();
+    let separator = if git_revision.is_empty() { "" } else { ":" };
+
+    let git_identifier = get_git_identifier();
+
+    format!(
+        "{id}{sep}{revision}, {date:.20}, {time:.9}",
+        id = if git_identifier.is_empty() {
+            "default".to_string()
+        } else {
+            git_identifier
+        },
+        sep = separator,
+        revision = git_revision,
+        date = get_git_date(),
+        time = get_git_time(),
+    )
 }
 
 pub fn get_git_revision() -> String {
@@ -78,3 +94,34 @@ pub fn get_git_identifier() -> String {
         git_tag
     }
 }
+
+fn get_git_timestamp_datetime() -> DateTime<Local> {
+    let timestamp = option_env!("RUSTPYTHON_GIT_TIMESTAMP")
+        .unwrap_or("")
+        .to_string();
+    let timestamp = timestamp.parse::<u64>().unwrap_or(0);
+
+    let datetime = UNIX_EPOCH + Duration::from_secs(timestamp);
+    let datetime = DateTime::<Local>::from(datetime);
+
+    datetime
+}
+
+pub fn get_git_date() -> String {
+    let datetime = get_git_timestamp_datetime();
+
+    datetime.format("%b %e %Y").to_string()
+}
+
+pub fn get_git_time() -> String {
+    let datetime = get_git_timestamp_datetime();
+
+    datetime.format("%H:%M:%S").to_string()
+}
+
+pub fn get_git_datetime() -> String {
+    let date = get_git_date();
+    let time = get_git_time();
+
+    format!("{} {}", date, time)
+}

Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ fn git_hash() -> String {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`fn git_timestamp() -> String {`
`18`		`- git(&["log", "-1", "--format=%cd"])`
	`18`	`+ git(&["log", "-1", "--format=%ct"])`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`fn git_tag() -> String {`
`22`	`22`	`git(&["describe", "--all", "--always", "--dirty"])`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`fn git_branch() -> String {`
`26`		`- git(&["rev-parse", "--abbrev-ref", "HEAD"])`
	`26`	`+ git(&["name-rev", "--name-only", "HEAD"])`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`fn git(args: &[&str]) -> String {`