Merge pull request #44 from inQWIRE/fix/pre-commit-stash-issue

Fix usability issues with hooks

.hooks/Name_validator.py

@@ -1,8 +1,15 @@
 #!/usr/bin/env python3
-
 import re
 import os
 import sys
+import sys
+
+
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+  print(f"Your python version is {sys.version_info.major}.{sys.version_info.minor}. {MIN_PYTHON[0]}.{MIN_PYTHON[1]} is required")
+  exit(3)
+
 
 args = sys.argv[1:]
 

.hooks/Nocheck_finder.py

@@ -4,6 +4,13 @@
 import os
 import sys
 
+
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+  print(f"Your python version is {sys.version_info.major}.{sys.version_info.minor}. {MIN_PYTHON[0]}.{MIN_PYTHON[1]} is required")
+  exit(3)
+
+
 b_color_yellow = '\033[93m'
 b_color_reset = '\033[0m'
 

.hooks/Search_validator.py

@@ -4,6 +4,11 @@
 import os
 import sys
 
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+  print(f"Your python version is {sys.version_info.major}.{sys.version_info.minor}. {MIN_PYTHON[0]}.{MIN_PYTHON[1]} is required")
+  exit(3)
+
 args = sys.argv[1:]
 
 usage = "./Name_validator.py [--interactive]"

.hooks/Z_X_rules_validator.py

@@ -2,6 +2,14 @@
 
 import re
 import os
+import sys
+
+
+MIN_PYTHON = (3, 10)
+if sys.version_info < MIN_PYTHON:
+  print(f"Your python version is {sys.version_info.major}.{sys.version_info.minor}. {MIN_PYTHON[0]}.{MIN_PYTHON[1]} is required")
+  exit(3)
+
 
 b_color_yellow = '\033[93m'
 b_color_reset = '\033[0m'

.hooks/pre-commit

@@ -4,9 +4,18 @@ BASEDIR=$(dirname "$0")
 
 # Stash changes that are not staged to check if the commited state if valid
 # Make sure to pop later!
-git stash --keep-index -u > /dev/null 2>/dev/null
+git stash --keep-index -u 2>/dev/null
 
-"$BASEDIR/Z_X_rules_validator.py" || (echo "Error - disallowing commit: Z_X validator failed"; git stash pop > /dev/null 2>/dev/null; exit 1)
-"$BASEDIR/Search_validator.py" || (echo "Error - disallowing commit: Search validator failed"; git stash pop > /dev/null 2>/dev/null; exit 1)
-"$BASEDIR/Name_validator.py" || (echo "Error - disallowing commit: Naming validator failed"; git stash pop > /dev/null 2>/dev/null; exit 1)
-git stash pop > /dev/null 2>/dev/null || exit 0
+unstash() {
+  git stash pop > /dev/null 2>/dev/null
+  exit $1
+}
+
+
+"$BASEDIR/Z_X_rules_validator.py" || { echo "Error - disallowing commit: Z_X validator failed"; unstash 1; }
+
+"$BASEDIR/Search_validator.py" || { echo "Error - disallowing commit: Search validator failed"; unstash 1; }
+
+"$BASEDIR/Name_validator.py" || { echo "Error - disallowing commit: Naming validator failed"; unstash 1; }
+
+unstash 0