skilleter-thingy 0.1.24__tar.gz → 0.1.26__tar.gz

{skilleter_thingy-0.1.24 → skilleter_thingy-0.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.24
+Version: 0.1.26
 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
@@ -90,7 +90,11 @@ The command takes a number of options that can be used to select the list of wor
 
 `--tag TAG` / `-t TAG` Run only in working trees that are tagged with the specified tag
 
-`--subdir` / `-s` Run only in working trees that are in the current directory tree.
+`--sub` / `-s` Run only in working trees that are in the current directory tree.
+
+`--continue` / `-o` Continue if a git command returns an error (by default, executation terminates when a command fails)
+
+`--path PATH` / `-C PATH` Run as if the command was started in PATH instead of the current working directory
 
 These options are AND-ed together, so specifying `--modified --branched --tag WOMBAT` will select only working trees that are modified AND branched AND tagged with `WOMBAT`, but the parameters to the `--repos` and `--tag` options are OR-ed together, so specifying `--tag WOMBAT --tag EMU` will select repos that are tagged as `WOMBAT` *OR* `EMU`.
 
@@ -106,12 +110,16 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+dir NAME` - Given the name of a working tree, output relative path(s) to one or more matching working trees. If `NAME` does NOT contains wildcard characters (`*` or `?`) then matching takes place as if `*` were prefixed and appended to it, otherwise, the wildcards are used as specified. If `NAME` is not specified then the location of the directory where the multigit configuration file resides is output.
 
+`+list` - Return a list of the top level directories of each of the Git repos
+
 `+config` - Print the name and location of the multigit configuration file.
 
 `+tag TAG` - If no tag specified list tags applied to the specified working trees. If a tag *is* specified, then *apply* the tag to the specified working trees.
 
 `+untag TAG` - Remove the tag from the specified working trees (do nothing if the tag is not applied in the first place).
 
+`+run COMMAND` - Run the specified command in each of the specified working trees
+
 Any command *not* prefixed with `+` is run in each of the working trees (filtered by the various multigit options) as a git command.
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.
@@ -179,10 +187,10 @@ Note that the concept of the default branch `DEFAULT` mentioned above *only* app
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
 
         usage: git-ca [-h] [--added] [--all] [--everything] [--ignored] [--patch] [--verbose] [--dry-run] [files ...]
-    
+
         positional arguments:
           files             List of files to add to the commit
-    
+
         options:
           -h, --help        show this help message and exit
           --added, -A       Update files in the current commit, including files added with `git add`
@@ -198,11 +206,11 @@ Improved version of 'git commit --amend'. Updates files that are already in the
 List or delete branches that have already been merged and delete tracking branches that are no longer on the remote.
 
         git-cleanup [-h] [--delete] [--master MASTER] [--force] [--unmerged] [--yes] [--debug] [branches ...]
-    
+
         positional arguments:
-    
+
         branches              List of branches to check (default is all branches)
-    
+
         options:
         -h, --help            show this help message and exit
         --delete, -d          Delete all branches that have been merged
@@ -218,11 +226,11 @@ List or delete branches that have already been merged and delete tracking branch
 Equivalent to `git checkout` but with enhanced branch matching as described above. The command does not support the full range of options supported by the `git checkout` comamnd which should still be used where additional functionality is required.
 
         git-co [-h] [--branch] [--update] [--rebase] [--force] [--exact] [--debug] branchname
-    
+
         positional arguments:
-    
+
         branchname    The branch name (or a partial name that matches uniquely against a local branch, remote branch, commit ID or tag)
-    
+
         options:
         -h, --help    show this help message and exit
         --branch, -b  Create the specified branch
@@ -237,12 +245,12 @@ Equivalent to `git checkout` but with enhanced branch matching as described abov
 Attempt to determine the parent branch for the specified branch (defaulting to the current one).
 
         git-parent [-h] [--all] [--verbose] [branch]
-    
+
         Attempt to determine the parent branch for the specified branch (defaulting to the current one)
-    
+
         positional arguments:
           branch         Branch, commit or commit (defaults to current branch; main)
-    
+
         options:
           -h, --help     show this help message and exit
           --all, -a      Include feature branches as possible parents
@@ -324,7 +332,6 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
       --separator SEPARATOR
                             Override the default path separator
 
-
 ## docker-purge
 
 Stop or kill docker instances and/or remove docker images.

{skilleter_thingy-0.1.24 → skilleter_thingy-0.1.26}/README.md

@@ -67,7 +67,11 @@ The command takes a number of options that can be used to select the list of wor
 
 `--tag TAG` / `-t TAG` Run only in working trees that are tagged with the specified tag
 
-`--subdir` / `-s` Run only in working trees that are in the current directory tree.
+`--sub` / `-s` Run only in working trees that are in the current directory tree.
+
+`--continue` / `-o` Continue if a git command returns an error (by default, executation terminates when a command fails)
+
+`--path PATH` / `-C PATH` Run as if the command was started in PATH instead of the current working directory
 
 These options are AND-ed together, so specifying `--modified --branched --tag WOMBAT` will select only working trees that are modified AND branched AND tagged with `WOMBAT`, but the parameters to the `--repos` and `--tag` options are OR-ed together, so specifying `--tag WOMBAT --tag EMU` will select repos that are tagged as `WOMBAT` *OR* `EMU`.
 
@@ -83,12 +87,16 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+dir NAME` - Given the name of a working tree, output relative path(s) to one or more matching working trees. If `NAME` does NOT contains wildcard characters (`*` or `?`) then matching takes place as if `*` were prefixed and appended to it, otherwise, the wildcards are used as specified. If `NAME` is not specified then the location of the directory where the multigit configuration file resides is output.
 
+`+list` - Return a list of the top level directories of each of the Git repos
+
 `+config` - Print the name and location of the multigit configuration file.
 
 `+tag TAG` - If no tag specified list tags applied to the specified working trees. If a tag *is* specified, then *apply* the tag to the specified working trees.
 
 `+untag TAG` - Remove the tag from the specified working trees (do nothing if the tag is not applied in the first place).
 
+`+run COMMAND` - Run the specified command in each of the specified working trees
+
 Any command *not* prefixed with `+` is run in each of the working trees (filtered by the various multigit options) as a git command.
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.
@@ -156,10 +164,10 @@ Note that the concept of the default branch `DEFAULT` mentioned above *only* app
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
 
         usage: git-ca [-h] [--added] [--all] [--everything] [--ignored] [--patch] [--verbose] [--dry-run] [files ...]
-    
+
         positional arguments:
           files             List of files to add to the commit
-    
+
         options:
           -h, --help        show this help message and exit
           --added, -A       Update files in the current commit, including files added with `git add`
@@ -175,11 +183,11 @@ Improved version of 'git commit --amend'. Updates files that are already in the
 List or delete branches that have already been merged and delete tracking branches that are no longer on the remote.
 
         git-cleanup [-h] [--delete] [--master MASTER] [--force] [--unmerged] [--yes] [--debug] [branches ...]
-    
+
         positional arguments:
-    
+
         branches              List of branches to check (default is all branches)
-    
+
         options:
         -h, --help            show this help message and exit
         --delete, -d          Delete all branches that have been merged
@@ -195,11 +203,11 @@ List or delete branches that have already been merged and delete tracking branch
 Equivalent to `git checkout` but with enhanced branch matching as described above. The command does not support the full range of options supported by the `git checkout` comamnd which should still be used where additional functionality is required.
 
         git-co [-h] [--branch] [--update] [--rebase] [--force] [--exact] [--debug] branchname
-    
+
         positional arguments:
-    
+
         branchname    The branch name (or a partial name that matches uniquely against a local branch, remote branch, commit ID or tag)
-    
+
         options:
         -h, --help    show this help message and exit
         --branch, -b  Create the specified branch
@@ -214,12 +222,12 @@ Equivalent to `git checkout` but with enhanced branch matching as described abov
 Attempt to determine the parent branch for the specified branch (defaulting to the current one).
 
         git-parent [-h] [--all] [--verbose] [branch]
-    
+
         Attempt to determine the parent branch for the specified branch (defaulting to the current one)
-    
+
         positional arguments:
           branch         Branch, commit or commit (defaults to current branch; main)
-    
+
         options:
           -h, --help     show this help message and exit
           --all, -a      Include feature branches as possible parents
@@ -301,7 +309,6 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
       --separator SEPARATOR
                             Override the default path separator
 
-
 ## docker-purge
 
 Stop or kill docker instances and/or remove docker images.

{skilleter_thingy-0.1.24 → skilleter_thingy-0.1.26}/pyproject.toml

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

{skilleter_thingy-0.1.24 → skilleter_thingy-0.1.26}/skilleter_thingy/multigit.py

@@ -6,6 +6,7 @@ import os
 import sys
 import fnmatch
 import configparser
+import subprocess
 
 from dataclasses import dataclass, field
 
@@ -13,7 +14,8 @@ import thingy.git2 as git
 import thingy.colour as colour
 
 ################################################################################
-
+# TODO List:
+#
 # DONE: ***MUST use relative paths in config file, or we can't store in git and clone and use somewhere else!***
 # DONE: / Output name of each working tree as it is processed as command sits there seeming to do nothing otherwise.
 # DONE: Better error-handling - e.g. continue/abort option after failure in one working tree
@@ -25,11 +27,17 @@ import thingy.colour as colour
 # DONE: When specifying list of working trees, if name doesn't contain '/' prefix it with '*'?
 # DONE: command to categorise working trees then command line filter to only act on working trees in category (in addition to other filtering options) - +tag <TAG> command tags all selected working trees and updates the configuration, +untag <TAG> command to remove tags in the same way
 # DONE: init function
+# DONE Consistent colours in output
+#
 # NOPE: Clone to have option to update - as discussed, should be part of init
 # NOPE: Dry-run option - just pass the option to the Git command
 # NOPE: Is it going to be a problem if the same repo is checked out twice or more in the same workspace - user problem
-# NOPE: Pull/fetch - only output after running command and only if something updated
+# NOPE: Pull/fetch - only output after running command and only if something updated - nope, git commands should run as-is without interference
 # NOPE: Switch to tomlkit
+# NOPE: Use PathLib - Don't really see the need
+# NOPE: 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 - Use fzf
+# NOPE: Use pygit2 directly - don't see the need
+#
 # TODO: 2 .init option '--update' to update the configuration file with new working trees and remove ones that are no longer there
 # TODO: 2. +run command to do things other than git commands
 # TODO: 2. 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)
@@ -39,13 +47,12 @@ import thingy.colour as colour
 # TODO: 3. Command that takes partial working tree name and either returns full path or pops up window to autocomplete until single match found
 # TODO: 3. Verbose option
 # TODO: 3. When filtering by tag or by repo name, if name starts with '!' only match if tag isn't present or repo name doesn't match (and don't allow '!' at start of tag otherwise)
+# TODO: 3. (alternative to above) A '--not' option that inverts all the matching criteria, so '--not --branched --modified' selects all unmodified repos which aren't branched
+# TODO: 3. (alternative to both above) Additional options; --!modified --!branched --!tag which act as the inverse of each option, so --!branched selects all unbranched repos.
+# TODO: 3. (another alternative) - Use 'not-' instead of '!', so have --not-branched, --not-modified, --not-tag (single-letter options -B, -M, -T).
 # TODO: 4. Option to +dir to return all matches so that caller can select one they want
 # TODO: 4. Shell autocomplete for +dir
 # TODO: 5. -j option to run in parallel - yes, but it will only work with non-interactive Git commands
-# TODO: 5. Consistent colours in output
-# TODO: 6. Use PathLib
-# TODO: 6. 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: 7. Use pygit2 directly
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
@@ -59,8 +66,8 @@ DEFAULT_BRANCH = 'DEFAULT'
 # Command line help - we aren't using argparse since it isn't flexible enough to handle arbtirary git
 # commands are parameters so we have to manually create the help and parse the command line
 
-HELP_INFO = """usage: multigit [-h] [--verbose] [--quiet] [--config CONFIG] [--repos REPOS] [--modified] [--branched] [--sub] [--tag TAGS]
-                {+clone, +init, +config, +dir, GIT_COMMAND} ...
+HELP_INFO = """usage: multigit [--help|-h] [--verbose|-v] [--quiet|-q] [--config|-c CONFIG] [--repos|-r REPOS] [--modified|-m] [--branched|-b] [--sub|-s] [--tag|-t TAGS] [--continue|-o] [--path|-C PATH]
+                {+clone, +init, +config, +dir, +list, +run, 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
 
@@ -76,16 +83,19 @@ 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)
   --sub, -s             Select only the repos in the current directory and subdirectories
-  --continue, -C        Continue if a git command returns an error (by default, executation terminates when a command fails)
+  --continue, -o        Continue if a git command returns an error (by default, executation terminates when a command fails)
+  --path, -C PATH       Run as if the command was started in PATH instead of the current working directory
 
 Sub-commands:
-  {+clone, +init,+dir,+config, GIT_COMMAND}
+  {+clone, +init, +dir, +config, +list, +run, GIT_COMMAND}
     +clone REPO {BRANCH} Clone a repo containing a multigit configuration file, then clone all the child repos and check out the default branch in each
     +init                Build or update the configuration file using the current branch in each repo as the default branch
     +config              Return the name and location of the configuration file
     +dir                 Return the location of a working tree, given the repo name, or if no parameter specified, the root directory of the multigit tree
+    +list                Return a list of the top level directories of each of the Git repos
     +tag TAG             Apply a configuration tag to repos filtered by the command line options (list configuration tags if no parameter specified)
     +untag TAG           Remove a configuration tag to repos filtered by the command line options
+    +run COMMAND         Run the specified command in repos filtered by the command line options
     GIT_COMMAND          Any git command, including options and parameters - this is then run in all specified working trees
 
 """
@@ -310,10 +320,10 @@ def mg_clone(args, config, console):
     # Sanity checks
 
     if not args.parameters:
-        colour.error('The "clone" subcommand takes 1 or 2 parameters - the repo to clone and, optionally, the branch to check out', prefix=True)
+        colour.error('The "[BOLD:clone]" subcommand takes 1 or 2 parameters - the repo to clone and, optionally, the branch to check out', prefix=True)
 
     if args.branched or args.modified:
-        colour.error('The "modified" and "branched" options cannot be used with the "clone" subcommand', prefix=True)
+        colour.error('The "[BOLD:modified]" and "[BOLD:branched]" options cannot be used with the "[BOLD:clone]" subcommand', prefix=True)
 
     # Destination directory is the last portion of the repo URL with the extension removed
 
@@ -345,7 +355,7 @@ def mg_clone(args, config, console):
         args.configuration_file = args.default_configuration_file
 
     if not os.path.isfile(args.configuration_file):
-        colour.error(f'Cannot find the configuration file: [BOLD:{args.default_configuration_file}]', prefix=True)
+        colour.error(f'Cannot find the configuration file: [BLUE:{args.default_configuration_file}]', prefix=True)
 
     config.read(args.configuration_file)
 
@@ -360,7 +370,7 @@ def mg_clone(args, config, console):
                 os.makedirs(directory, exist_ok=True)
 
             if not args.quiet:
-                colour.write(f'Cloning [BOLD:{repo["origin"]}] into [BLUE:{directory}]')
+                colour.write(f'Cloning [BLUE:{repo["origin"]}] into [BLUE:{directory}]')
 
             git.clone(repo['origin'], path=repo.name)
 
@@ -379,7 +389,7 @@ def mg_init(args, config, console):
     # Sanity checks
 
     if args.modified or args.branched or args.tag or args.subdirectories:
-        colour.error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "init" subcommand', prefix=True)
+        colour.error('The "[BOLD:--tag]", "[BOLD:--modified]" "[BOLD:--sub]", and "[BOLD:--branched]" options cannot be used with the "[BOLD:init]" subcommand', prefix=True)
 
     # Search for .git directories and add any that aren't already in the configuration
 
@@ -413,7 +423,8 @@ def mg_init(args, config, console):
             else:
                 config[repo]['repo name'] = os.path.basename(repo)
 
-            colour.write(f'Added [BOLD:{repo}] with default branch [BLUE:{default_branch}]')
+            if not args.quiet:
+                colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
 
     if not args.quiet:
         colour.write(cleareol=True)
@@ -428,7 +439,7 @@ def mg_init(args, config, console):
 
     for entry in removals:
         del config[entry]
-        colour.write(f'Removed [BOLD:{repo}] as it no longer exists')
+        colour.write(f'Removed [BLUE:{repo}] as it no longer exists')
 
     # The configuration file needs to be updated
 
@@ -447,12 +458,12 @@ def mg_dir(args, config, console):
     verbose(args, f'dir: Parameters: {", ".join(args.parameters)}')
 
     if len(args.parameters) > 1:
-        colour.error('The +dir command takes no more than one parameter - the name of the working tree to search for', prefix=True)
+        colour.error('The "[BOLD:+dir]" command takes no more than one parameter - the name of the working tree to search for', prefix=True)
 
     # TODO: mg_dir _should_ use these options
 
     if args.modified or args.branched or args.tag or args.subdirectories:
-        colour.error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "dir" subcommand', prefix=True)
+        colour.error('The "[BOLD:--tag]", "[BOLD:--modified]" "[BOLD:--sub]", and "[BOLD:--branched]" options cannot be used with the "[BOLD:+dir]" subcommand', prefix=True)
 
     # If a parameter is specified, look for matches, otherwise just return the location of the
     # configuration file
@@ -501,7 +512,7 @@ def mg_tag(args, config, console):
     _ = console
 
     if len(args.parameters) > 1:
-        colour.error('The +tag command takes no more than one parameter', prefix=True)
+        colour.error('The "[BOLD:+tag]" command takes no more than one parameter', prefix=True)
 
     for repo in select_git_repos(args, config):
         try:
@@ -515,7 +526,7 @@ def mg_tag(args, config, console):
                 repo['tags'] = ','.join(tags)
                 args.config_modified = True
         elif tags:
-            colour.write(f'[BOLD:{repo["repo name"]}] - {", ".join(tags)}')
+            colour.write(f'[BLUE:{repo["repo name"]}] - {", ".join(tags)}')
 
 ################################################################################
 
@@ -525,7 +536,7 @@ def mg_untag(args, config, console):
     _ = console
 
     if len(args.parameters) > 1:
-        colour.error('The +tag command takes no more than one parameter', prefix=True)
+        colour.error('The "[BOLD:+tag]" command takes no more than one parameter', prefix=True)
 
     for repo in select_git_repos(args, config):
         try:
@@ -547,18 +558,59 @@ def mg_config(args, config, console):
     _ = console
 
     if len(args.parameters):
-        colour.error('The +config command does not take parameters', prefix=True)
+        colour.error('The "[BOLD:+config]" command does not take parameters', prefix=True)
 
     colour.write(os.path.relpath(args.configuration_file))
 
 ################################################################################
 
-def run_git_command(args, config, console):
+def mg_list(args, config, console):
+    """List the top-level directories of the Git repos in the configuration"""
+
+    _ = console
+
+    for repo in select_git_repos(args, config):
+        print(repo.name)
+
+################################################################################
+
+def mg_run(args, config, console):
     """Run a command in each of the working trees, optionally continuing if
        there's an error"""
 
     _ = console
 
+    if not args.parameters:
+        colour.error('[BOLD:+run] command - missing parameter(s)')
+
+    # Run the command in each of the working trees
+
+    for repo in select_git_repos(args, config):
+        if not args.quiet:
+            colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
+
+        repo_path = absolute_repo_path(args, repo.name)
+
+        try:
+            status = subprocess.run(args.parameters, cwd=repo_path)
+        except FileNotFoundError:
+            err_msg = f'"[BLUE:{args.parameters[0]}]" - Command not found'
+            if args.error_continue:                
+                colour.write(f'[RED:WARNING]: {err_msg}')
+            else:
+                colour.error(f'[RED:ERROR]: {err_msg}')
+        else:
+            if status.returncode and not args.error_continue:
+                sys.exit(status)
+
+################################################################################
+
+def run_git_command(args, config, console):
+    """Run a Git command in each of the working trees, optionally continuing if
+       there's an error"""
+
+    _ = console
+
     for repo in select_git_repos(args, config):
         repo_command = [args.command]
 
@@ -567,9 +619,10 @@ 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:{os.path.relpath(repo.name)}]\n')
+        if not args.quiet:
+            colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
 
-        # Run the command in the workng tree
+        # Run the command in the working tree
 
         repo_path = absolute_repo_path(args, repo.name)
 
@@ -590,67 +643,91 @@ def parse_command_line():
 
     arg_list = sys.argv[1:]
 
+    # Iterate through each lump of options (e.g. '-xyz' is a lump of 3 options and
+    # '--config' is a lump containing a single option, as is just '-x')
+
     while arg_list and arg_list[0].startswith('-'):
         # Split a parameter into a list, so --x becomes [x] but -xyz becomes [x, y, z]
+        # Note that this means that an option with a parameter must always have a space
+        # between the option and the parameter (e.g. '-C path' not '-Cpath'
+        # Also note that we don't support '--option=VALUE' - it must be '--option VALUE'
 
         arg_entry = arg_list.pop(0)
         if arg_entry.startswith('--'):
-            params = [arg_entry[2:]]
+            option_list = [arg_entry[2:]]
         else:
-            params = list(arg_entry[1:])
+            option_list = list(arg_entry[1:])
+
+        # Process each option in the current option lump.
+        # For short options that take a parameter (e.g. '-C PATH') we check that the option list
+        # is empty as '-Cx PATH' expands to '-C', '-x PATH', not '-C PATH', '-x'
 
-        while params:
-            param = params.pop(0)
+        while option_list:
+            option = option_list.pop(0)
 
-            if param in ('verbose', 'v'):
+            if option in ('verbose', 'v'):
                 args.verbose = True
 
-            elif param in ('quiet', 'q'):
+            elif option in ('quiet', 'q'):
                 args.quiet = True
 
-            elif param in ('config', 'c'):
-                if params:
-                    colour.error('--config - missing configuration file parameter', prefix=True)
-                else:
-                    try:
-                        args.default_configuration_file = arg_list.pop(0)
-                    except IndexError:
-                        colour.error('--config - missing configuration file parameter', prefix=True)
-
-            elif param in ('repos', 'r'):
-                if params:
-                    colour.error('--repos - missing repo parameter', prefix=True)
+            elif option in ('config', 'c'):
+                if option_list:
+                    colour.error('The "[BLUE:--config]" option takes a configuration file parameter', prefix=True)
+
+                try:
+                    args.default_configuration_file = arg_list.pop(0)
+                except IndexError:
+                    colour.error('"The [BLUE:--config]" option takes a configuration file parameter', prefix=True)
+
+            elif option in ('repos', 'r'):
+                if option_list:
+                    colour.error('The "[BLUE:--repos]" option takes a repo parameter', prefix=True)
+
                 try:
                     args.repos.append(arg_list.pop(0))
                 except IndexError:
-                    colour.error('--repos - missing repo parameter', prefix=True)
+                    colour.error('The "[BLUE:--repos]" option takes a repo parameter', prefix=True)
+
+            elif option in ('tag', 't'):
+                if option_list:
+                    colour.error('The "[BLUE:--tag]" option takes a tag parameter', prefix=True)
 
-            elif param in ('tag', 't'):
-                if params:
-                    colour.error('--tag - missing tag parameter', prefix=True)
                 try:
                     args.tag.append(arg_list.pop(0))
                 except IndexError:
-                    colour.error('--tag - missing tag parameter', prefix=True)
+                    colour.error('The "[BLUE:--tag]" option takes a tag parameter', prefix=True)
 
-            elif param in ('modified', 'm'):
+            elif option in ('modified', 'm'):
                 args.modified = True
 
-            elif param in ('branched', 'b'):
+            elif option in ('branched', 'b'):
                 args.branched = True
 
-            elif param in ('sub', 's'):
+            elif option in ('sub', 's'):
                 args.subdirectories = True
 
-            elif param in ('continue', 'C'):
+            elif option in ('continue', 'o'):
                 args.error_continue = True
 
-            elif param in ('help', 'h'):
+            elif option in ('path', 'C'):
+                if option_list:
+                    colour.error('The "[BOLD:--path]" option takes a path parameter')
+
+                try:
+                    workingdir = arg_list.pop(0)
+                    os.chdir(workingdir)
+                except IndexError:
+                    colour.error('The "[BOLD:-C]" option takes a path parameter', prefix=True)
+                except FileNotFoundError:
+                    colour.error(f'"[BOLD:--path]" - path "[BLUE:{workingdir}]" not found', prefix=True)
+
+            elif option in ('help', 'h'):
                 colour.write(HELP_INFO)
                 sys.exit(0)
 
             else:
-                colour.error(f'Invalid option: "{param}"', prefix=True)
+                colour.error(f'Invalid option: "[BOLD:{option}]"', prefix=True)
 
     # After the options, we either have a multigit command (prefixed with '+') or a git command
     # followed by parameter
@@ -687,6 +764,8 @@ COMMANDS = {
     'config': mg_config,
     'tag': mg_tag,
     'untag': mg_untag,
+    'list': mg_list,
+    'run': mg_run,
 }
 
 def main():

{skilleter_thingy-0.1.24 → skilleter_thingy-0.1.26}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.24
+Version: 0.1.26
 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
@@ -90,7 +90,11 @@ The command takes a number of options that can be used to select the list of wor
 
 `--tag TAG` / `-t TAG` Run only in working trees that are tagged with the specified tag
 
-`--subdir` / `-s` Run only in working trees that are in the current directory tree.
+`--sub` / `-s` Run only in working trees that are in the current directory tree.
+
+`--continue` / `-o` Continue if a git command returns an error (by default, executation terminates when a command fails)
+
+`--path PATH` / `-C PATH` Run as if the command was started in PATH instead of the current working directory
 
 These options are AND-ed together, so specifying `--modified --branched --tag WOMBAT` will select only working trees that are modified AND branched AND tagged with `WOMBAT`, but the parameters to the `--repos` and `--tag` options are OR-ed together, so specifying `--tag WOMBAT --tag EMU` will select repos that are tagged as `WOMBAT` *OR* `EMU`.
 
@@ -106,12 +110,16 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+dir NAME` - Given the name of a working tree, output relative path(s) to one or more matching working trees. If `NAME` does NOT contains wildcard characters (`*` or `?`) then matching takes place as if `*` were prefixed and appended to it, otherwise, the wildcards are used as specified. If `NAME` is not specified then the location of the directory where the multigit configuration file resides is output.
 
+`+list` - Return a list of the top level directories of each of the Git repos
+
 `+config` - Print the name and location of the multigit configuration file.
 
 `+tag TAG` - If no tag specified list tags applied to the specified working trees. If a tag *is* specified, then *apply* the tag to the specified working trees.
 
 `+untag TAG` - Remove the tag from the specified working trees (do nothing if the tag is not applied in the first place).
 
+`+run COMMAND` - Run the specified command in each of the specified working trees
+
 Any command *not* prefixed with `+` is run in each of the working trees (filtered by the various multigit options) as a git command.
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.
@@ -179,10 +187,10 @@ Note that the concept of the default branch `DEFAULT` mentioned above *only* app
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
 
         usage: git-ca [-h] [--added] [--all] [--everything] [--ignored] [--patch] [--verbose] [--dry-run] [files ...]
-    
+
         positional arguments:
           files             List of files to add to the commit
-    
+
         options:
           -h, --help        show this help message and exit
           --added, -A       Update files in the current commit, including files added with `git add`
@@ -198,11 +206,11 @@ Improved version of 'git commit --amend'. Updates files that are already in the
 List or delete branches that have already been merged and delete tracking branches that are no longer on the remote.
 
         git-cleanup [-h] [--delete] [--master MASTER] [--force] [--unmerged] [--yes] [--debug] [branches ...]
-    
+
         positional arguments:
-    
+
         branches              List of branches to check (default is all branches)
-    
+
         options:
         -h, --help            show this help message and exit
         --delete, -d          Delete all branches that have been merged
@@ -218,11 +226,11 @@ List or delete branches that have already been merged and delete tracking branch
 Equivalent to `git checkout` but with enhanced branch matching as described above. The command does not support the full range of options supported by the `git checkout` comamnd which should still be used where additional functionality is required.
 
         git-co [-h] [--branch] [--update] [--rebase] [--force] [--exact] [--debug] branchname
-    
+
         positional arguments:
-    
+
         branchname    The branch name (or a partial name that matches uniquely against a local branch, remote branch, commit ID or tag)
-    
+
         options:
         -h, --help    show this help message and exit
         --branch, -b  Create the specified branch
@@ -237,12 +245,12 @@ Equivalent to `git checkout` but with enhanced branch matching as described abov
 Attempt to determine the parent branch for the specified branch (defaulting to the current one).
 
         git-parent [-h] [--all] [--verbose] [branch]
-    
+
         Attempt to determine the parent branch for the specified branch (defaulting to the current one)
-    
+
         positional arguments:
           branch         Branch, commit or commit (defaults to current branch; main)
-    
+
         options:
           -h, --help     show this help message and exit
           --all, -a      Include feature branches as possible parents
@@ -324,7 +332,6 @@ Add or remove entries from a path list (e.g. as used by the PATH environment var
       --separator SEPARATOR
                             Override the default path separator
 
-
 ## docker-purge
 
 Stop or kill docker instances and/or remove docker images.