skilleter-thingy 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

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/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.dist-info → skilleter_thingy-0.1.11.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.1.11.dist-info}/RECORD

@@ -17,7 +17,7 @@ skilleter_thingy/git_mr.py,sha256=g33FaRtJTbIQI0tfXv_a042YpGwtbg5fKw072aqjAdw,30
 skilleter_thingy/git_parent.py,sha256=DLy38mo06R0YDyJWQjrP8pQS-qc7tvLYcn8unKqzEiQ,2774
 skilleter_thingy/git_review.py,sha256=Vmepd1qHPM9eHYE19KNO0UWJIYhGhlwPlVBjbgFZ2PM,52448
 skilleter_thingy/git_update.py,sha256=nw-bnDFrMi7yNf7P6gGF8gzmJUjXU5PhWhOYPgApcX4,14350
-skilleter_thingy/git_wt.py,sha256=Xm4VBBXMI4GxNtH3QvF-QL9rtvo4RrlWSbNQDFpGZu8,2954
+skilleter_thingy/git_wt.py,sha256=YrMGDuLC_glRzN9-6wkTIfZkhtDqstWajzDjjCVjp9U,2176
 skilleter_thingy/gitcmp_helper.py,sha256=wutDHpBPOX8ZsXbsC5ApHxMY5tOKgD3P0eyFVs_mSAI,11214
 skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
 skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
@@ -51,7 +51,7 @@ skilleter_thingy/thingy/dircolors.py,sha256=5NbXMsGWdABLvvZfB70VPmN6N5HyyihfpgoQ
 skilleter_thingy/thingy/docker.py,sha256=9EFatudoVPfB1UbDEtzdJDB3o6ToHiNHv8-oLsUeqiQ,2449
 skilleter_thingy/thingy/files.py,sha256=oW6E6WWwVFSUPdrZnKMx7P_w_hh3etjoN7RrqvYHCHc,4705
 skilleter_thingy/thingy/git.py,sha256=5EYzj6kxXZCK8E7AhiNPOyLYydCB86amnU6uyDEPfS4,38902
-skilleter_thingy/thingy/git2.py,sha256=DE6osZamorZZ-351l8W8Z-bSCKSNKSy-45Z2-IVy5rM,37136
+skilleter_thingy/thingy/git2.py,sha256=5sBGIa01PyidcyViNSAqcj5C97zbK7qwMM2RHQKZhqM,37141
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dOeu8,2529
@@ -60,9 +60,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=UWpBWuIMCE1UonLJErb41yW3RtpXrK_bt4Z4cZR-eDU,5910
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.1.10.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.10.dist-info/METADATA,sha256=fEGixW3RcifB9BsfvxxQmL2y5LsWpRdD_jBeKSKTefM,29874
-skilleter_thingy-0.1.10.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-skilleter_thingy-0.1.10.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.1.10.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.10.dist-info/RECORD,,
+skilleter_thingy-0.1.11.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.11.dist-info/METADATA,sha256=yIfo6Rkwh-OiB1HH9K5VCeN7MDDptlnL48VCb65iUO8,29874
+skilleter_thingy-0.1.11.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+skilleter_thingy-0.1.11.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.1.11.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.11.dist-info/RECORD,,