Merge pull request RustPython#1434 from ChJR/feature/sys._git

Add sys._git (RustPython#1358)

Author: coolreader18

vm/build.rs

@@ -6,17 +6,22 @@ fn main() {
         "cargo:rustc-env=RUSTPYTHON_GIT_TIMESTAMP={}",
         git_timestamp()
     );
+    println!("cargo:rustc-env=RUSTPYTHON_GIT_TAG={}", git_tag());
     println!("cargo:rustc-env=RUSTPYTHON_GIT_BRANCH={}", git_branch());
 }
 
 fn git_hash() -> String {
-    git(&["rev-parse", "HEAD"])
+    git(&["rev-parse", "--short", "HEAD"])
 }
 
 fn git_timestamp() -> String {
     git(&["log", "-1", "--format=%cd"])
 }
 
+fn git_tag() -> String {
+    git(&["describe", "--all", "--always", "--dirty"])
+}
+
 fn git_branch() -> String {
     git(&["rev-parse", "--abbrev-ref", "HEAD"])
 }

vm/src/sysmodule.rs

@@ -163,6 +163,14 @@ fn sys_exc_info(vm: &VirtualMachine) -> PyResult {
     }))
 }
 
+fn sys_git_info(vm: &VirtualMachine) -> PyObjectRef {
+    vm.ctx.new_tuple(vec![
+        vm.ctx.new_str("RustPython".to_string()),
+        vm.ctx.new_str(version::get_git_identifier()),
+        vm.ctx.new_str(version::get_git_revision()),
+    ])
+}
+
 // TODO: raise a SystemExit here
 fn sys_exit(code: OptionalArg<i32>, _vm: &VirtualMachine) -> PyResult<()> {
     let code = code.unwrap_or(0);
@@ -360,6 +368,7 @@ settrace() -- set the global debug tracing function
       "settrace" => ctx.new_rustfunc(sys_settrace),
       "version" => vm.new_str(version::get_version()),
       "version_info" => version_info,
+      "_git" => sys_git_info(vm),
       "exc_info" => ctx.new_rustfunc(sys_exc_info),
       "prefix" => ctx.new_str(prefix.to_string()),
       "base_prefix" => ctx.new_str(base_prefix.to_string()),

vm/src/version.rs

@@ -38,8 +38,23 @@ pub fn get_git_revision() -> String {
     option_env!("RUSTPYTHON_GIT_HASH").unwrap_or("").to_string()
 }
 
+pub fn get_git_tag() -> String {
+    option_env!("RUSTPYTHON_GIT_TAG").unwrap_or("").to_string()
+}
+
 pub fn get_git_branch() -> String {
     option_env!("RUSTPYTHON_GIT_BRANCH")
         .unwrap_or("")
         .to_string()
 }
+
+pub fn get_git_identifier() -> String {
+    let git_tag = get_git_tag();
+    let git_branch = get_git_branch();
+
+    if git_tag.is_empty() || git_tag == "undefined" {
+        git_branch
+    } else {
+        git_tag
+    }
+}