skilleter-thingy 0.1.10__tar.gz → 0.1.11__tar.gz

{skilleter_thingy-0.1.10 → skilleter_thingy-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.10
+Version: 0.1.11
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk

{skilleter_thingy-0.1.10 → skilleter_thingy-0.1.11}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.1.10"
+version = "0.1.11"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.1.10 → skilleter_thingy-0.1.11}/skilleter_thingy/git_wt.py

@@ -14,7 +14,7 @@ import sys
 import argparse
 import os
 
-import pygit2
+import thingy.git2 as git
 
 ################################################################################
 
@@ -28,48 +28,27 @@ def main():
                         help='If we are already at the top of the working tree, check if the parent directory is in a working tree and output the top-level directory of that tree.')
     parser.add_argument('--dir', '-d', action='store', default=os.getcwd(),
                         help='Find the location of the top-level directory in the working tree starting at the specified directory')
-    parser.add_argument('level', nargs='?', type=int, default=0, help='Number of levels below the top-level directory to report')
+
     args = parser.parse_args()
 
-    if not os.path.isdir(args.dir):
-        print(f'Unable to locate directory {args.dir}')
+    start_dir = os.path.abspath(args.dir)
+
+    if not os.path.isdir(start_dir):
+        sys.stderr.write(f'Unable to locate directory {args.dir}\n')
         sys.exit(1)
 
-    # Try to get the current working tree
+    # Search for a .git directory in the current or parent directories
 
-    try:
-        working_tree = pygit2.Repository(args.dir).workdir
-    except pygit2.GitError:
-        print(f'Directory {args.dir} is not in a Git working tree')
-        sys.exit(2)
+    working_tree = git.working_tree(start_dir)
 
     # If we are in a working tree and also looking for the parent working
     # tree, check if we are at the top of the current tree, and, if so,
     # hop up a level and try again.
 
-    if args.parent:
-        current_directory = os.getcwd()
-
-        if os.path.samefile(working_tree, current_directory):
-            os.chdir('..')
-            current_directory = os.getcwd()
-
-            try:
-                working_tree = pygit2.Repository(current_directory).workdir
-            except pygit2.GitError:
-                print(f'Parent directory {current_directory} is not in a Git working tree')
-                sys.exit(3)
-
-    # Output the result, if we have one
-
-    if args.level:
-        start = args.dir.split('/')
-        working = working_tree.split('/')
-
-        working_tree = os.path.join(working_tree, '/'.join(start[len(working):len(working) + int(args.level)]))
+    if args.parent and working_tree == start_dir:
+        working_tree = git.working_tree(working_tree.parent)
 
-    if working_tree:
-        print(working_tree)
+    print(working_tree)
 
 ################################################################################
 

{skilleter_thingy-0.1.10 → skilleter_thingy-0.1.11}/skilleter_thingy/thingy/git2.py

@@ -477,7 +477,7 @@ def working_tree(start_dir=None):
     repo_dir = git_dir(start_dir)
 
     if repo_dir:
-        return os.path.abspath(os.path.join(repo_dir, '..'))
+        return os.path.abspath(os.path.join(repo_dir, os.pardir))
 
     return None
 

{skilleter_thingy-0.1.10 → skilleter_thingy-0.1.11}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.10
+Version: 0.1.11
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk