skilleter-thingy 0.0.99__tar.gz → 0.1.1__tar.gz

{skilleter_thingy-0.0.99 → skilleter_thingy-0.1.1}/PKG-INFO

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

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

{skilleter_thingy-0.0.99 → skilleter_thingy-0.1.1}/skilleter_thingy/multigit.py

@@ -41,6 +41,9 @@ import thingy.colour as colour
 # TODO: If run in a subdirectory, only process working trees in that tree (or have an option to do so, or an option _not_ to do so; --all)
 # TODO: Ability to read default configuration options from ~/.config/thingy/multigit.rc - these are insert before argv[1] before argparse called
 # TODO: When we have something with multiple matches display a menu for user to select the one that they one - make it a library routine so can be used, for instance, for branch selection
+# TODO: Use pygit2
+# TODO: Use PathLib
+# TODO: Shell autocomplete for +dir
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
@@ -52,7 +55,7 @@ DEFAULT_BRANCH = 'DEFAULT'
 
 ################################################################################
 
-HELP_INFO = """usage: multigit [-h] [--verbose] [--quiet] [--config CONFIG] [--repos REPOS] [--modified] [--branched] [--tag TAGS]
+HELP_INFO = """usage: multigit [-h] [--verbose] [--quiet] [--config CONFIG] [--repos REPOS] [--modified] [--branched] [--sub] [--tag TAGS]
                 {+init, +config, +dir, GIT_COMMAND} ...
 
 Run git commands in multiple Git repos. DISCLAIMER: This is beta-quality software, with missing features and liable to fail with a stack trace, but shouldn't eat your data
@@ -69,6 +72,7 @@ options:
   --branched, -b        Select repos that do not have the default branch checked out
   --tag TAG, -t TAG     Select repos that have the specified tag (can be issued multiple times on the command line)
   --continue, -C        Continue if a git command returns an error (by default, executation terminates when a command fails)
+  --sub, -s             Select only the repos in the current directory and subdirectories
 
 Sub-commands:
   {+init,+dir,+config,GIT_COMMAND}
@@ -107,6 +111,7 @@ class Arguments():
     tag: list[str] = field(default_factory=list)
     modified: bool = False
     branched: bool = False
+    subdirectories: bool = False
 
     # Command to run with parameters
 
@@ -190,7 +195,7 @@ def find_working_trees(args):
 
 def select_git_repos(args, config):
     """Return git repos from the configuration that match the criteria on the
-       multigit command line (the --repos, --tag, --modified and --branched options)
+       multigit command line (the --repos, --tag, --modified, --sub and --branched options)
        or, return them all if no relevant options specified"""
 
     for repo_path in config.sections():
@@ -242,6 +247,14 @@ def select_git_repos(args, config):
             else:
                 matching = False
 
+        # If subdirectories specified, only match if the repo is in the current directory tree
+
+        if matching and args.subdirectories:
+            repo_path_rel = os.path.relpath(repo_path)
+
+            if repo_path_rel == '..' or repo_path_rel.startswith('../'):
+                matching = False
+
         # If we have a match, yield the config entry to the caller
 
         if matching:
@@ -263,8 +276,8 @@ def mg_init(args, config, console):
 
     # Sanity checks
 
-    if args.modified or args.branched or args.tag:
-        error('The "--tag", "--modified" and "--branched" options cannot be used with the "init" subcommand')
+    if args.modified or args.branched or args.tag or args.subdirectories:
+        error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "init" subcommand')
 
     # Search for .git directories and add any that aren't already in the configuration
 
@@ -361,8 +374,8 @@ def mg_dir(args, config, console):
             error(f'No matches with [BLUE:{search_name}]')
 
         if len(destination) > 1:
-            dest_list = "\n\t".join(destination)
-            error(f'Multiple matches with [BLUE:{search_name}]: {dest_list}')
+            dest_list = "\n\t".join([os.path.relpath(d) for d in destination])
+            error(f'Multiple matches with [BLUE:{search_name}]: \n\t{dest_list}')
 
         colour.write(os.path.join(os.path.dirname(args.configuration_file), destination[0]))
     else:
@@ -424,7 +437,7 @@ def mg_config(args, config, console):
     if len(args.parameters):
         error('The +config command does not take parameters')
 
-    colour.write(args.configuration_file)
+    colour.write(os.path.relpath(args.configuration_file))
 
 ################################################################################
 
@@ -440,7 +453,7 @@ def run_git_command(args, config, console):
         for cmd in args.parameters:
             repo_command.append(branch_name(cmd, repo['default branch']))
 
-        colour.write(f'\n[BOLD:{repo.name}]\n')
+        colour.write(f'\n[BOLD:{os.path.relpath(repo.name)}]\n')
 
         _, status = git.git_run_status(repo_command, path=repo.name, redirect=False)
 
@@ -505,6 +518,9 @@ def parse_command_line():
         elif param in ('--branched', '-b'):
             args.branched = True
 
+        elif param in ('--sub', '-s'):
+            args.subdirectories = True
+
         elif param in ('--continue', '-C'):
             args.error_continue = True
 

{skilleter_thingy-0.0.99 → skilleter_thingy-0.1.1}/skilleter_thingy.egg-info/PKG-INFO

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