skilleter-thingy 0.0.77__py3-none-any.whl → 0.0.78__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -103,13 +103,26 @@ def mg_init(args, config, console):
        By default, it scans the tree for git directories and adds or updates them
        in the configuration, using the current branch as the default branch. """
 
+    # TODO: [ ] Update should remove or warn about repos that are no longer present
+
     # Search for .git directories
 
     for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
             show_progress(console.columns, repo)
 
-        config[repo] = {'default branch': git.branch(path=repo)}
+        if not repo in config:
+            config[repo] = {
+                'default branch': git.branch(path=repo)
+            }
+
+        remote = git.remotes(path=repo)
+
+        if 'origin' in remote:
+            config[repo]['origin'] = remote['origin']
+            config[repo]['name']= os.path.basename(remote['origin']).removesuffix('.git')
+        else:
+            config[repo]['name'] = os.path.basename(repo)
 
 ################################################################################
 
@@ -259,7 +272,7 @@ def mg_push(args, config, console):
             result = git.push(path=repo, force_with_lease=args.force)
 
             if result:
-	        colour.write(result, indent=4)
+                colour.write(result, indent=4)
 
             colour.write()
 
@@ -371,6 +384,27 @@ def mg_clean(args, config, console):
 
 ################################################################################
 
+def mg_dir(args, config, console):
+    """Return the location of a working tree, given the name. Returns an
+       error unless there is a unique match"""
+
+    location = []
+    search_dir = args.dir[0]
+    
+    breakpoint()
+    for repo in find_git_repos(args.directory, args.repos):
+        if fnmatch.fnmatch(config[repo]['name'], search_dir):
+            location.append(repo)
+            
+    if len(location) == 0:
+        error(f'No matches with {dir}')
+    elif len(location) > 1:
+        error(f'Multiple matches with {dir}')
+        
+    colour.write(location[0])
+
+################################################################################
+
 def main():
     """Main function"""
 
@@ -384,6 +418,7 @@ def main():
        'commit': mg_commit,
        'update': mg_update,
        'clean': mg_clean,
+       'dir': mg_dir,
     }
 
     # Parse args in the form COMMAND OPTIONS SUBCOMMAND SUBCOMMAND_OPTIONS PARAMETERS
@@ -431,6 +466,9 @@ def main():
     parser_clean.add_argument('-x', action='store_true', help='Don’t use the standard ignore rules, but still use the ignore rules given with -e options from the command line.')
     parser_clean.add_argument('-X', action='store_true', help='Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files.')
 
+    parser_dir = subparsers.add_parser('dir', help='Return the location of a working tree, given the repo name')
+    parser_dir.add_argument('dir', nargs=1, action='store', help='The name of the working tree')
+
     # Parse the command line
 
     args = parser.parse_args()

skilleter_thingy/thingy/git2.py

@@ -317,10 +317,10 @@ def merging():
 
 ################################################################################
 
-def remotes():
+def remotes(path=None):
     """ Return the list of git remotes """
 
-    repo = pygit2.Repository(os.getcwd())
+    repo = pygit2.Repository(path or os.getcwd())
 
     git_remotes = {}
 

{skilleter_thingy-0.0.77.dist-info → skilleter_thingy-0.0.78.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.77
+Version: 0.0.78
 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.77.dist-info → skilleter_thingy-0.0.78.dist-info}/RECORD

@@ -25,7 +25,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=Vb2zYTEFp26BYdkG810SRg9afyfDqvq4CLHTk-MFf60,22388
 skilleter_thingy/linecount.py,sha256=5voQtjJjDCVx4zjPwVRy620NpuLiwwFitzxjIsRGtxQ,4310
 skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980k,4470
-skilleter_thingy/multigit.py,sha256=DES_T2XpyR82jR30e26KvrXMgmSepUhSiSffjTru1AU,19026
+skilleter_thingy/multigit.py,sha256=R7f4dxe-jTBypnY_tI9W3_qFcL8NOu7zLTqleOmFbgo,20362
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -52,7 +52,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=qXWIduF4jbP5pKFYt_hW9Ex5iL9mSBBrcNKBkULhRTg,38834
-skilleter_thingy/thingy/git2.py,sha256=UEXeSyT5PlYGtdUAQDEZC7Sc7JmYdAlP6osa1tVmpO8,36620
+skilleter_thingy/thingy/git2.py,sha256=0sICXJLUKuZ3gBMv7IFSeQGUl_9Y1SexHxWAXEoXPec,36637
 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
@@ -61,9 +61,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.77.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.77.dist-info/METADATA,sha256=OuTAQKPCHRzc4K-j1oHaFnpO8piPz-pKO5uT-0uPs3s,5938
-skilleter_thingy-0.0.77.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.77.dist-info/entry_points.txt,sha256=uW11ofmIbfPP_5B-pxb8YDkHbeZ_xeCoO6358R9wGVI,2146
-skilleter_thingy-0.0.77.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.77.dist-info/RECORD,,
+skilleter_thingy-0.0.78.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.78.dist-info/METADATA,sha256=QXlQ8Q0gkgAgAJzzWv6moFcG16C8kYMSDy0Ep4f6GLA,5938
+skilleter_thingy-0.0.78.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skilleter_thingy-0.0.78.dist-info/entry_points.txt,sha256=uW11ofmIbfPP_5B-pxb8YDkHbeZ_xeCoO6358R9wGVI,2146
+skilleter_thingy-0.0.78.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.78.dist-info/RECORD,,