Resolve file paths to their absolute path, make error messages more succinct.

Author: NouberNou

git_template_repo/git_template_repo.py

@@ -4,6 +4,7 @@
 import shutil
 import subprocess
 import sys
+import pathlib
 
 from ._version import version as __version__
 
@@ -21,18 +22,25 @@ def make_call(*args, error_msg=None, suppress_output=True):
             print(error_msg)
             print("")
         print(e)
-        raise e
+        sys.exit()
 
 
 def is_sha1(sha):
     match = re.match(r'\b[0-9a-f]{40}\b', sha)
     return match is not None
 
+def is_remote(location):
+    if "https://" in location or "http://" in location or "ssh://" in location:
+        return True
+    return False
 
 def execute(args):
     new_repo = args.new_repo
     template_repo = args.template_repo
 
+    if not is_remote(template_repo):
+        template_repo = pathlib.Path(template_repo).resolve()
+
     clone_dir = args.clone_dir
     new_root_branch = args.new_root
     no_clone = args.no_clone
@@ -48,7 +56,7 @@ def execute(args):
               suppress_output=False)
 
     local_new = True
-    if push_origin or "https://" in new_repo or "http://" in new_repo or "ssh://" in new_repo:
+    if push_origin or is_remote(new_repo):
         local_new = False
 
     if local_new:

tests/test_commands.py

@@ -71,6 +71,15 @@ def test_template_from_local_commit(self):
         self.assertIsDir(TEST_REPO_DIR_GIT)
         self.assertEqual(int(git_template_repo.make_call("git", "--git-dir", str(TEST_REPO_DIR_GIT), "rev-list", "--all", "--count")), 1)
 
+    def test_template_from_local_commit_relative_path(self):
+        sha = git_template_repo.make_call("git", "rev-parse", "--verify", "HEAD").decode()[:-1]
+        sys.argv = ["git-template-repo", str(TEST_REPO_DIR), ".", "--template-branch", sha]
+        ret = git_template_repo.main()
+        self.assertEqual(ret, 0)
+        self.assertIsDir(TEST_REPO_DIR)
+        self.assertIsDir(TEST_REPO_DIR_GIT)
+        self.assertEqual(int(git_template_repo.make_call("git", "--git-dir", str(TEST_REPO_DIR_GIT), "rev-list", "--all", "--count")), 1)
+
     def test_template_push(self):
         git_template_repo.make_call("git", "init", str(TEST_DIR), "--bare")
         self.assertIsDir(TEST_DIR)