skilleter-thingy 0.0.81__tar.gz → 0.0.82__tar.gz

{skilleter_thingy-0.0.81/skilleter_thingy.egg-info → skilleter_thingy-0.0.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.81
+Version: 0.0.82
 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.81 → skilleter_thingy-0.0.82}/pyproject.toml

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

{skilleter_thingy-0.0.81 → skilleter_thingy-0.0.82}/skilleter_thingy/multigit.py

@@ -8,7 +8,6 @@ import argparse
 import fnmatch
 import configparser
 import shlex
-import pathlib
 from collections import defaultdict
 
 import thingy.git2 as git
@@ -102,13 +101,23 @@ def select_git_repos(args, config):
        or, return them all if no relevant options specified"""
 
     for repo in config.sections():
-        # If wildcards are specified, then only match wildcards
+        # If repos are specified, then only match according to wildcards, full
+        # path or just basename.
 
         if args.repos:
-            for card in args.repos:
-                if fnmatch.fnmatch(repo, card):
+            for entry in args.repos:
+                if '?' in entry or '*' in entry:
+                    if fnmatch.fnmatch(repo, entry):
+                        matching = True
+                        break
+                elif '/' in entry:
+                    if repo == entry:
+                        matching = True
+                        break
+                elif os.path.basename(repo) == entry:
                     matching = True
                     break
+
             else:
                 matching = False
         else:
@@ -139,6 +148,7 @@ def branch_name(name, default_branch):
 ################################################################################
 
 def run_git_status(cmd, path, cont=False, redirect=True):
+    """Run a git command and exit if it fails"""
 
     output, status = git.git_run_status(cmd, path=path, redirect=redirect)
 
@@ -351,7 +361,7 @@ def mg_checkout(args, config, console):
         if not args.quiet:
             show_progress(console.columns, repo.name)
 
-        branch = branch_name(args.branch or repo.name['default branch'])
+        branch = branch_name(args.branch, repo['default branch'])
 
         if git.branch(path=repo.name) != branch:
             colour.write(f'Checking out [BLUE:{branch}] in [BOLD:{repo.name}]')
@@ -407,7 +417,7 @@ def mg_update(args, config, console):
             git.checkout(default_branch, path=repo.name)
 
         if not args.quiet:
-            colour.write(f'Pulling updates from remote', indent=4)
+            colour.write('Pulling updates from remote', indent=4)
 
         git.pull(path=repo.name)
 

{skilleter_thingy-0.0.81 → skilleter_thingy-0.0.82/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.81
+Version: 0.0.82
 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