skilleter-thingy 0.0.58__tar.gz → 0.0.60__tar.gz

{skilleter_thingy-0.0.58/skilleter_thingy.egg-info → skilleter_thingy-0.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.58
+Version: 0.0.60
 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.0.58 → skilleter_thingy-0.0.60}/pyproject.toml

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

{skilleter_thingy-0.0.58 → skilleter_thingy-0.0.60}/skilleter_thingy/git_wt.py

@@ -26,8 +26,6 @@ def main():
     parser = argparse.ArgumentParser(description='Report top-level directory of the current git working tree.')
     parser.add_argument('--parent', '-p', action='store_true',
                         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('--repo', '-r', action='store_true',
-                        help='If we are already at the top of the working tree, look for a parent directory with a repo control file (.repo directory or .mrconfig file) and output that directory.')
     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')
@@ -40,39 +38,27 @@ def main():
     # Try to get the current working tree
 
     try:
-        git_dir = pygit2.Repository(args.dir).workdir
+        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 = os.path.abspath(os.path.join(git_dir, os.pardir))
-
     # 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 and working_tree:
+    if args.parent:
         current_directory = os.getcwd()
 
         if os.path.samefile(working_tree, current_directory):
             os.chdir('..')
+            current_directory = os.getcwd()
 
-            working_tree = pygit2.Repository(current_directory).workdir
-
-    # If we are also looking for a multi-repo control file or directory, and haven't
-    # found the git working tree root scan up the tree until we find one.
-
-    if args.repo and not working_tree:
-        while True:
-            working_tree = os.getcwd()
-
-            if os.path.isdir('.repo') or os.path.isfile('../.mrconfig'):
-                break
-
-            if working_tree == '/':
-                sys.exit(2)
-
-            os.chdir('..')
+            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
 

{skilleter_thingy-0.0.58 → skilleter_thingy-0.0.60/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.58
+Version: 0.0.60
 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