skilleter-thingy 0.0.91__tar.gz → 0.0.93__tar.gz

{skilleter_thingy-0.0.91/skilleter_thingy.egg-info → skilleter_thingy-0.0.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.91
+Version: 0.0.93
 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
@@ -18,6 +18,7 @@ Requires-Dist: pyaml
 Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
+Requires-Dist: filetype
 
 # Thingy
 
@@ -49,7 +50,9 @@ The multigit command line format is:
 
 Where COMMAND is an internal multigit command if it starts with a '+' and is a git command otherwise.
 
-By default, when a multigit command, other than `init` is run, it runs a git command in each of the working trees. The command takes a number of options that can be used to select the list of working trees that each of the subcommands that it supports runs in:
+By default, when multigit is invoked with a git command, it runs a the command in each of the working trees selected by the command line options passed to multigit (if no options are specified then the command is run in all the working trees. 
+
+The command takes a number of options that can be used to select the list of working trees that each of the subcommands that it supports runs in:
 
 *--repos / -r* Allows a list of working trees to be specfied, either as the full or relative path, the name or a wildcard.
 
@@ -57,11 +60,11 @@ By default, when a multigit command, other than `init` is run, it runs a git com
 
 *--branched / -b* Run only working trees where the current branch that is checked out is NOT the default branch
 
-Multigit supports a small list of subcommands:
+Multigit supports a small list of subcommands, each of which are prefixed with a `+` to distinguish them from Git commands:
 
 *+init* - Create or update the configuration file
 
-*+dir* - Given the name of a working tree, prin the location within the multigit tree
+*+dir* - Given the name of a working tree, output the location within the multigit tree of that working tree if the name matches uniquely, or the name of the directory where the multigit configuration file resides if no parameter is specified.
 
 *+config* - Print the name and location of the multigit configuration file.
 
@@ -69,23 +72,17 @@ Any command not prefixed with '+' is run in each of the working trees (filtered
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.
 
-# Miscellaneous Git Utilities
-
-## ggit
-
-Run a git command in all working trees under the current directory (note that this is not related to multigit).
+The `+dir` command can be used with shell aliases (or their equivalent in the user's shell of choice) to create an alias to run, for example, `cd (multigit +dir "$@")` (Bash) or `cd (multigit +dir $argv)` (for the Fish shell) that would cd to the top level direcory.
 
-## ggrep
-
-Run 'git grep' in all repos under the current directory (note that this is not related to multigit).
+# Miscellaneous Git Utilities
 
 ## gitprompt
 
-Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+Output a string containing colour-coded shell nesting level, current directory and git working tree status (intended to be used in the shell prompt).
 
 # Git Extensions
 
-Due to the way that the git command works, these can be run as they were additional git subcommands
+Due to the way that the git command works, these can be run as they were additional git subcommands.
 
 ## git ca
 
@@ -115,16 +112,6 @@ Output the top level directory of the git working tree or return an error if we
 
 Console-based git change review tool.
 
-## GitLab Commands
-
-### git mr
-
-Push a feature branch to GitLab and create a merge request
-
-### gl
-
-Command line for GitLab
-
 # General Commands
 
 ## addpath
@@ -137,9 +124,7 @@ Stop or kill docker instances and/or remove docker images.
 
 ## ffind
 
-Simple file find utility
-
-Implements the functionality of the find command that is regularly used in a simpler fashion and ignores all the options that nobody ever uses.
+Simple file find utility - replaces the `find` command with something that is more human-friendly.
 
 ## linecount
 
@@ -251,3 +236,25 @@ Simple console system monitor
 ## window-rename
 
 Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.
+
+# Obsolescent Commands
+
+These commands will probably be retired in future versions of Thingy
+
+## ggit
+
+Run a git command in all working trees under the current directory (superceded by multigit).
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory (superceded by multigit).
+
+## GitLab Commands
+
+### git mr
+
+Push a feature branch to GitLab and create a merge request
+
+### gl
+
+Command line for GitLab

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/README.md

@@ -28,7 +28,9 @@ The multigit command line format is:
 
 Where COMMAND is an internal multigit command if it starts with a '+' and is a git command otherwise.
 
-By default, when a multigit command, other than `init` is run, it runs a git command in each of the working trees. The command takes a number of options that can be used to select the list of working trees that each of the subcommands that it supports runs in:
+By default, when multigit is invoked with a git command, it runs a the command in each of the working trees selected by the command line options passed to multigit (if no options are specified then the command is run in all the working trees. 
+
+The command takes a number of options that can be used to select the list of working trees that each of the subcommands that it supports runs in:
 
 *--repos / -r* Allows a list of working trees to be specfied, either as the full or relative path, the name or a wildcard.
 
@@ -36,11 +38,11 @@ By default, when a multigit command, other than `init` is run, it runs a git com
 
 *--branched / -b* Run only working trees where the current branch that is checked out is NOT the default branch
 
-Multigit supports a small list of subcommands:
+Multigit supports a small list of subcommands, each of which are prefixed with a `+` to distinguish them from Git commands:
 
 *+init* - Create or update the configuration file
 
-*+dir* - Given the name of a working tree, prin the location within the multigit tree
+*+dir* - Given the name of a working tree, output the location within the multigit tree of that working tree if the name matches uniquely, or the name of the directory where the multigit configuration file resides if no parameter is specified.
 
 *+config* - Print the name and location of the multigit configuration file.
 
@@ -48,23 +50,17 @@ Any command not prefixed with '+' is run in each of the working trees (filtered
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.
 
-# Miscellaneous Git Utilities
-
-## ggit
-
-Run a git command in all working trees under the current directory (note that this is not related to multigit).
+The `+dir` command can be used with shell aliases (or their equivalent in the user's shell of choice) to create an alias to run, for example, `cd (multigit +dir "$@")` (Bash) or `cd (multigit +dir $argv)` (for the Fish shell) that would cd to the top level direcory.
 
-## ggrep
-
-Run 'git grep' in all repos under the current directory (note that this is not related to multigit).
+# Miscellaneous Git Utilities
 
 ## gitprompt
 
-Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+Output a string containing colour-coded shell nesting level, current directory and git working tree status (intended to be used in the shell prompt).
 
 # Git Extensions
 
-Due to the way that the git command works, these can be run as they were additional git subcommands
+Due to the way that the git command works, these can be run as they were additional git subcommands.
 
 ## git ca
 
@@ -94,16 +90,6 @@ Output the top level directory of the git working tree or return an error if we
 
 Console-based git change review tool.
 
-## GitLab Commands
-
-### git mr
-
-Push a feature branch to GitLab and create a merge request
-
-### gl
-
-Command line for GitLab
-
 # General Commands
 
 ## addpath
@@ -116,9 +102,7 @@ Stop or kill docker instances and/or remove docker images.
 
 ## ffind
 
-Simple file find utility
-
-Implements the functionality of the find command that is regularly used in a simpler fashion and ignores all the options that nobody ever uses.
+Simple file find utility - replaces the `find` command with something that is more human-friendly.
 
 ## linecount
 
@@ -230,3 +214,25 @@ Simple console system monitor
 ## window-rename
 
 Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.
+
+# Obsolescent Commands
+
+These commands will probably be retired in future versions of Thingy
+
+## ggit
+
+Run a git command in all working trees under the current directory (superceded by multigit).
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory (superceded by multigit).
+
+## GitLab Commands
+
+### git mr
+
+Push a feature branch to GitLab and create a merge request
+
+### gl
+
+Command line for GitLab

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.0.91"
+version = "0.0.93"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -34,7 +34,7 @@ dependencies = [
     "pygit2",
     "python-dateutil",
     "requests",
-#    "tomlkit",
+    "filetype",
 ]
 
 [project.urls]

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/docker_purge.py

@@ -23,11 +23,11 @@ def initialise():
 
     parser = argparse.ArgumentParser(description='Purge docker instances and images')
 
-    parser.add_argument('-s', '--stop', action='store_true', help='Stop Docker instances')
-    parser.add_argument('-k', '--kill', action='store_true', help='Kill Docker instances')
-    parser.add_argument('-r', '--remove', action='store_true', help='Remove Docker images')
-    parser.add_argument('-l', '--list', action='store_true', help='List what would be done without doing it')
-    parser.add_argument('-f', '--force', action='store_true', help='Forcibly kill/remove instances')
+    parser.add_argument('--stop', '-s', action='store_true', help='Stop Docker instances')
+    parser.add_argument('--kill', '-k', action='store_true', help='Kill Docker instances')
+    parser.add_argument('--remove', '-r', action='store_true', help='Remove Docker images')
+    parser.add_argument('--list', '-l', action='store_true', help='List what would be done without doing it')
+    parser.add_argument('--force', '-f', action='store_true', help='Forcibly kill/remove instances')
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
     parser.add_argument('images', nargs='*', help='List of Docker containers (regular expression)')
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/ggit.py

@@ -38,7 +38,7 @@ def parse_command_line():
 
     parser = argparse.ArgumentParser(description='Run a git command recursively in subdirectories')
 
-    parser.add_argument('-q', '--quiet', action='store_true', help='Run quietly - only output errors or output from git')
+    parser.add_argument('--quiet', '-q', action='store_true', help='Run quietly - only output errors or output from git')
     parser.add_argument('path', nargs='?', action='store', default='.', help='Specify the path to run in')
 
     args = parser.parse_args()

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/ggrep.py

@@ -28,18 +28,18 @@ def parse_command_line():
     parser = argparse.ArgumentParser(
         description='Run a git grep in either the current working tree or all working git working trees under the current directory')
 
-    parser.add_argument('-f', '--follow', action='store_true', help='Follow symlinks')
-    parser.add_argument('-a', '--text', action='store_true', help='Process binary files as if they were text.')
-    parser.add_argument('-i', '--ignore-case', action='store_true', help='Ignore case differences between the patterns and the files.')
-    parser.add_argument('-w', '--word-regexp', action='store_true',
+    parser.add_argument('--follow', '-f', action='store_true', help='Follow symlinks')
+    parser.add_argument('--text', '-a', action='store_true', help='Process binary files as if they were text.')
+    parser.add_argument('--ignore-case', '-i', action='store_true', help='Ignore case differences between the patterns and the files.')
+    parser.add_argument('--word-regexp', '-w', action='store_true',
                         help='Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character).')
-    parser.add_argument('-v', '--invert-match', action='store_true', help='Select non-matching lines.')
-    parser.add_argument('-F', '--fixed-strings', action='store_true', help='Use fixed strings for patterns (don’t interpret pattern as a regex).')
-    parser.add_argument('-n', '--line-number', action='store_true', help='Prefix the line number to matching lines.')
-    parser.add_argument('-l', '--files-with-matches', action='store_true', help='Show only the names of files that contain matches')
-    parser.add_argument('-L', '--files-without-matches', action='store_true', help='Show only the names of files that do NOT contain matches')
-    parser.add_argument('-W', '--wildcard', action='append', help='Only search files matching the wildcard(s)')
-    parser.add_argument('-o', '--only-matching', action='store_true', help='Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line.')
+    parser.add_argument('--invert-match', '-v', action='store_true', help='Select non-matching lines.')
+    parser.add_argument('--fixed-strings', '-F', action='store_true', help='Use fixed strings for patterns (don’t interpret pattern as a regex).')
+    parser.add_argument('--line-number', '-n', action='store_true', help='Prefix the line number to matching lines.')
+    parser.add_argument('--files-with-matches', '-l', action='store_true', help='Show only the names of files that contain matches')
+    parser.add_argument('--files-without-matches', '-L', action='store_true', help='Show only the names of files that do NOT contain matches')
+    parser.add_argument('--wildcard', '-W', action='append', help='Only search files matching the wildcard(s)')
+    parser.add_argument('--only-matching', '-o', action='store_true', help='Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line.')
     parser.add_argument('--no-color', action='store_true', help='Turn off match highlighting')
     parser.add_argument('pattern', action='store', help='Regular expression to search for')
     parser.add_argument('paths', nargs='*', help='Optional list of one or more paths to search')

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_br.py

@@ -31,8 +31,8 @@ def parse_command_line():
 
     parser = argparse.ArgumentParser(description='List or delete branches that have been merged')
 
-    parser.add_argument('-a', '--all', action='store_true', help='List all branches, including remotes')
-    parser.add_argument('-d', '--delete', action='store_true',
+    parser.add_argument('--all', '-a', action='store_true', help='List all branches, including remotes')
+    parser.add_argument('--delete', '-d', action='store_true',
                         help='Delete the specified branch(es), even if it is the current one (list of branches to delete must be supplied as parameters)')
     parser.add_argument('branches', nargs='*', help='Filter the list of branches according to one or more patterns')
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_ca.py

@@ -36,13 +36,13 @@ def main():
     parser = argparse.ArgumentParser(
         description='Amend changes to the current commit. Updates files that are already in the commit and, optionally, adds additional files.')
 
-    parser.add_argument('-A', '--added', action='store_true', help='Update files in the current commit, including files added with "git add"')
-    parser.add_argument('-a', '--all', action='store_true', help='Append all locally-modified, tracked files to the current commit')
-    parser.add_argument('-e', '--everything', action='store_true', help='Append all modified and untracked files to the current commit (implies --all)')
-    parser.add_argument('-i', '--ignored', action='store_true', dest='ignored', help='Include files normally hidden by .gitignore')
-    parser.add_argument('-p', '--patch', action='store_true', help='Use the interactive patch selection interface to chose which changes to commit.')
-    parser.add_argument('-v', '--verbose', action='store_true', help='Verbose mode')
-    parser.add_argument('-D', '--dry-run', action='store_true', help='Dry-run')
+    parser.add_argument('--added', '-A', action='store_true', help='Update files in the current commit, including files added with "git add"')
+    parser.add_argument('--all', '-a', action='store_true', help='Append all locally-modified, tracked files to the current commit')
+    parser.add_argument('--everything', '-e', action='store_true', help='Append all modified and untracked files to the current commit (implies --all)')
+    parser.add_argument('--ignored', '-i', action='store_true', dest='ignored', help='Include files normally hidden by .gitignore')
+    parser.add_argument('--patch', '-p', action='store_true', help='Use the interactive patch selection interface to chose which changes to commit.')
+    parser.add_argument('--verbose', '-v', action='store_true', help='Verbose mode')
+    parser.add_argument('--dry-run', '-D', action='store_true', help='Dry-run')
 
     parser.add_argument('files', nargs='*', help='List of files to add to the commit')
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_cleanup.py

@@ -31,12 +31,12 @@ def parse_command_line():
     parser = argparse.ArgumentParser(
         description='List or delete branches that have been merged.\nWhen deleting branches, also delete tracking branches that are not longer on the remote.')
 
-    parser.add_argument('-d', '--delete', action='store_true', dest='delete', help='Delete all branches that have been merged')
-    parser.add_argument('-m', '--master', '--main', dest='master',
+    parser.add_argument('--delete', '-d', action='store_true', dest='delete', help='Delete all branches that have been merged')
+    parser.add_argument('--master', '-m', '--main', dest='master',
                         help='Specify the master branch (Attempts to read this from GitLab or defaults to "develop" if present or "master" or "main" otherwise')
-    parser.add_argument('-f', '--force', action='store_true', dest='force', help='Allow protected branches (e.g. master) to be removed')
-    parser.add_argument('-u', '--unmerged', action='store_true', dest='list_unmerged', help='List branches that have NOT been merged')
-    parser.add_argument('-y', '--yes', action='store_true', dest='force', help='Assume "yes" in response to any prompts (e.g. to delete branches)')
+    parser.add_argument('--force', '-f', action='store_true', dest='force', help='Allow protected branches (e.g. master) to be removed')
+    parser.add_argument('--unmerged', '-u', action='store_true', dest='list_unmerged', help='List branches that have NOT been merged')
+    parser.add_argument('--yes', '-y', action='store_true', dest='force', help='Assume "yes" in response to any prompts (e.g. to delete branches)')
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
 
     parser.add_argument('branches', nargs='*', help='List of branches to check (default is all branches)')

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_co.py

@@ -59,12 +59,12 @@ def parse_arguments():
     """ Parse and return command line arguments """
 
     parser = argparse.ArgumentParser(description=DESCRIPTION, formatter_class=argparse.RawTextHelpFormatter)
-    parser.add_argument('-b', '--branch', action='store_true', help='Create the specified branch')
-    parser.add_argument('-u', '--update', action='store_true', help='If a remote branch exists, delete any local branch and check out the remote version')
-    parser.add_argument('-r', '--rebase', action='store_true', help='Rebase the branch onto its parent after checking it out')
-    parser.add_argument('-f', '--force', action='store_true',
+    parser.add_argument('--branch', '-b', action='store_true', help='Create the specified branch')
+    parser.add_argument('--update', '-u', action='store_true', help='If a remote branch exists, delete any local branch and check out the remote version')
+    parser.add_argument('--rebase', '-r', action='store_true', help='Rebase the branch onto its parent after checking it out')
+    parser.add_argument('--force', '-f', action='store_true',
                         help='When using the update option, recreate the local branch even if it is owned by the current user (based on the author of the most recent commit)')
-    parser.add_argument('-e', '--exact', action='store_true', help='Do not use branch name matching - check out the branch as specified (if it exists)')
+    parser.add_argument('--exact', '-e', action='store_true', help='Do not use branch name matching - check out the branch as specified (if it exists)')
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
     parser.add_argument('branchname', nargs=1, type=str,
                         help='The branch name (or a partial name that matches uniquely against a local branch, remote branch, commit ID or tag)')

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_mr.py

@@ -23,7 +23,7 @@ def parse_arguments():
     parser = argparse.ArgumentParser(description=DESCRIPTION, formatter_class=argparse.RawTextHelpFormatter)
 
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
-    parser.add_argument('-f', '--force', action='store_true', help='Force-push the branch')
+    parser.add_argument('--force', '-f', action='store_true', help='Force-push the branch')
     parser.add_argument('--parent', '-p', action='store', help='Override the default parent and specify the branch to merge onto')
     parser.add_argument('--reviewer', '-r', action='store', help='Specify the name of the reviewer for the merge request')
     parser.add_argument('--keep', '-k', action='store_true', help='Keep the source branch after the merge (default is to delete it).')

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_parent.py

@@ -21,8 +21,8 @@ def main():
     current_branch = git.branch()
 
     parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
-    parser.add_argument('-a', '--all', action='store_true', help='Include feature branches as possible parents')
-    parser.add_argument('-v', '--verbose', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
+    parser.add_argument('--all', '-a', action='store_true', help='Include feature branches as possible parents')
+    parser.add_argument('--verbose', '-v', action='store_true', help='Report verbose results (includes number of commits between branch and parent)')
     parser.add_argument('branch', action='store', nargs='?', type=str, default=current_branch, help=f'Branch, commit or commit (defaults to current branch; {current_branch})')
 
     args = parser.parse_args()

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_review.py

@@ -1284,10 +1284,10 @@ def parse_command_line():
 
     parser = argparse.ArgumentParser(description='Menu-driven Git code review tool')
 
-    parser.add_argument('-c', '--commit', type=str, help='Compare the specified commit with its parent')
-    parser.add_argument('-b', '--branch', type=str, help='Compare the specified commit to branch point on specified branch')
-    parser.add_argument('-C', '--change', action='store_true', help='Compare the current commit with its parent')
-    parser.add_argument('-d', '--debug', action='store_true', help='Start a debug session over Telnet using pudb')
+    parser.add_argument('--commit', '-c', type=str, help='Compare the specified commit with its parent')
+    parser.add_argument('--branch', '-b', type=str, help='Compare the specified commit to branch point on specified branch')
+    parser.add_argument('--change', '-C', action='store_true', help='Compare the current commit with its parent')
+    parser.add_argument('--debug', '-d', action='store_true', help='Start a debug session over Telnet using pudb')
     parser.add_argument('--dir', action='store', help='Work in the specified directory')
     parser.add_argument('--difftool', type=str, default=None, help='Override the default git diff tool')
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/git_update.py

@@ -36,17 +36,17 @@ def parse_command_line():
 
     parser = argparse.ArgumentParser(description='Rebase branch(es) against their parent branch, updating both in the process')
 
-    parser.add_argument('-c', '--cleanup', action='store_true',
+    parser.add_argument('--cleanup', '-c', action='store_true',
                         help='After updating a branch, delete it if there are no differences between it and its parent branch')
-    parser.add_argument('-a', '--all', action='store_true', help='Update all local branches, not just the current one')
-    parser.add_argument('-A', '--everything', action='store_true',
+    parser.add_argument('--all', '-a', action='store_true', help='Update all local branches, not just the current one')
+    parser.add_argument('--everything', '-A', action='store_true',
                         help='Update all local branches, not just the current one and ignore the default ignore list specified in the Git configuration')
-    parser.add_argument('-d', '--default', action='store_true', help='Checkout the main or master branch on completion')
-    parser.add_argument('-p', '--parent', action='store', help='Specify the parent branch, rather than trying to work it out')
-    parser.add_argument('-P', '--all-parents', action='store_true',
+    parser.add_argument('--default', '-d', action='store_true', help='Checkout the main or master branch on completion')
+    parser.add_argument('--parent', '-p', action='store', help='Specify the parent branch, rather than trying to work it out')
+    parser.add_argument('--all-parents', '-P', action='store_true',
                         help='Feature branches are not considered as alternative parents unless this option is specified')
-    parser.add_argument('-s', '--stop', action='store_true', help='Stop if a rebase problem occurs, instead of skipping the branch')
-    parser.add_argument('-i', '--ignore', action='store', default=None,
+    parser.add_argument('--stop', '-s', action='store_true', help='Stop if a rebase problem occurs, instead of skipping the branch')
+    parser.add_argument('--ignore', '-i', action='store', default=None,
                         help='List of one or more wildcard branch names not to attempt to update (uses update.ignore from the Git configuration if not specified)')
     parser.add_argument('--verbose', action='store_true', help='Enable verbose output')
     parser.add_argument('--dry-run', action='store_true', help='Report what would be done without actually doing it')
@@ -93,6 +93,11 @@ def branch_rebase(args, results, branch):
 
                 logging.debug('No non-feature-branch parents found for %s. Feature branch parents could be: %s', branch, parents)
 
+        if not parents:
+            colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (no obvious candidates))', indent=4)
+            results['failed'].add(branch)
+            return
+
         # Cheat - if we have multiple possible parents and one is 'develop', 'main' or 'master'
         # choose it.
 
@@ -104,19 +109,14 @@ def branch_rebase(args, results, branch):
             elif 'develop' in parents:
                 parent = 'develop'
             else:
-                colour.write('[RED:WARNING]: Unable to rebase [BLUE:%s] branch as unable to determine its parent (could be any of %s)'
-                             % (branch, ', '.join(parents)), indent=4)
+                colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (could be any of {", ".join(parents)})',
+                             indent=4)
                 results['failed'].add(branch)
                 return
 
         elif len(parents) == 1:
             parent = parents[0]
 
-        else:
-            colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (no obvious candidates))', indent=4)
-            results['failed'].add(branch)
-            return
-
     if args.dry_run:
         colour.write(f'[BOLD:Checking if] [BLUE:{branch}] [BOLD:needs to be rebased onto] [BLUE:{parent}]', indent=4)
 
@@ -296,7 +296,7 @@ def main():
 
     branches = git.branches() if args.all or args.everything else [current_branch]
 
-    logging.info('Updating %s' % ', '.join(branches))
+    logging.info('Updating %s', ', '.join(branches))
 
     # Filter out branches that the user wants to ignore
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/linecount.py

@@ -75,7 +75,7 @@ def main():
     """ Report Summary of files by name or extension """
 
     parser = argparse.ArgumentParser(description='Summarise number of files, lines of text and total size of files in a directory tree')
-    parser.add_argument('-e-', '--ext', action='store_true', help='Identify file type using the file extension (faster but less accurrate)')
+    parser.add_argument('--ext', '-e', action='store_true', help='Identify file type using the file extension (faster but less accurrate)')
 
     args = parser.parse_args()
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/moviemover.py

@@ -27,9 +27,9 @@ def parse_command_line():
 
     parser = argparse.ArgumentParser(description='File relocation - move files by wildcard from one directory tree to another')
 
-    parser.add_argument('-s', '--source', type=str, required=True, help='Source directory')
-    parser.add_argument('-d', '--destination', type=str, required=True, help='Destination directory')
-    parser.add_argument('-D', '--dry-run', action='store_true', help='Report what files would be moved, without actually moving them')
+    parser.add_argument('--source', '-s', type=str, required=True, help='Source directory')
+    parser.add_argument('--destination', '-d', type=str, required=True, help='Destination directory')
+    parser.add_argument('--dry-run', '-D', action='store_true', help='Report what files would be moved, without actually moving them')
     parser.add_argument('files', nargs='*', help='List of wildcard matches')
 
     args = parser.parse_args()

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/multigit.py

@@ -224,6 +224,13 @@ 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. """
 
+    # Sanity checks
+
+    if args.modified or args.branched:
+        error('The "--modified" and "--branched" options cannot be used with the "init" subcommand')
+    elif not config:
+        error(f'Unable to location configuration file "{args.configuration_file}"')
+
     # TODO: Update should remove or warn about repos that are no longer present
 
     # Search for .git directories
@@ -442,12 +449,6 @@ def main():
     # Run an internal or external command-specific validation
 
     if args.internal_command:
-        if args.command == 'init':
-            if args.modified or args.branched:
-                error('The "--modified" and "--branched" options cannot be used with the "init" subcommand')
-        elif not config:
-            error(f'Unable to location configuration file "{args.configuration_file}"')
-
         # Run the subcommand
 
         commands[args.command](args, config, console)
@@ -459,6 +460,8 @@ def main():
                 config.write(configfile)
 
     else:
+        # Run the external command, no need to update the config as it can't change here
+
         run_git_command(args, config, console)
 
 ################################################################################

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/phototidier.py

@@ -52,7 +52,7 @@ def parse_command_line():
 
     parser = argparse.ArgumentParser(description='Re-organise photos into (hopefully) the correct folders.')
 
-    parser.add_argument('-D', '--dry-run', action='store_true', help='Report what files would be moved, without actually moving them')
+    parser.add_argument('--dry-run', '-D', action='store_true', help='Report what files would be moved, without actually moving them')
     parser.add_argument('path', nargs=1, help='Path to the picture storage directory')
 
     args = parser.parse_args()

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/readable.py

@@ -52,6 +52,7 @@ TF_MISC_REGEX = \
     { 'regex': re.compile(r'"(.*:.*)"( = ".*")'), 'replace': r'\1\2'},
     { 'regex': re.compile(r'"(.*:.*)"( = \[$)'), 'replace': r'\1\2'},
     { 'regex': re.compile(r'^last "terraform apply":$'), 'replace':r'last "terraform apply" which may have affected this plan:'},
+    { 'find': ' ~ ', 'replace': ' * '},
 ]
 
 TF_IGNORE_LIST = [

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/remdir.py

@@ -37,11 +37,11 @@ def main():
     # Parse the command line
 
     parser = argparse.ArgumentParser(description='Remove empty directories')
-    parser.add_argument('-D', '--dry-run', action='store_true', help='Dry-run - report what would be done without doing anything')
+    parser.add_argument('--dry-run', '-D', action='store_true', help='Dry-run - report what would be done without doing anything')
     parser.add_argument('--debug', action='store_true', help='Output debug information')
     parser.add_argument('--verbose', action='store_true', help='Output verbose information')
-    parser.add_argument('-I', '--ignore', action='append', help='Files to ignore when considering whether a directory is empty')
-    parser.add_argument('-K', '--keep', action='append', help='Directories that should be kept even if they are empty')
+    parser.add_argument('--ignore', '-I', action='append', help='Files to ignore when considering whether a directory is empty')
+    parser.add_argument('--keep', '-K', action='append', help='Directories that should be kept even if they are empty')
     parser.add_argument('dirs', nargs='+', help='Directories to prune')
     args = parser.parse_args()
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/strreplace.py

@@ -20,7 +20,7 @@ def main():
     """ Main function """
 
     parser = argparse.ArgumentParser(description='Textual search and replace')
-    parser.add_argument('-i', '--inplace', action='store_true', help='Do an in-place search and replace on the input file')
+    parser.add_argument('--inplace', '-i', action='store_true', help='Do an in-place search and replace on the input file')
     parser.add_argument('search', nargs=1, action='store', help='Search text')
     parser.add_argument('replace', nargs=1, action='store', help='Replacment text')
     parser.add_argument('infile', nargs='?', action='store', help='Input file')

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/trimpath.py

@@ -26,7 +26,7 @@ def main():
 
     parser = argparse.ArgumentParser(description='Trim a path for display to a specified with by replacing intermediate directory names with "..."')
 
-    parser.add_argument('-w', '--width', default=None, help='Specify the width to trim to the path to. Default is 25% of the current console width')
+    parser.add_argument('--width', '-w', default=None, help='Specify the width to trim to the path to. Default is 25% of the current console width')
     parser.add_argument('path', nargs='?', default=None, help='The path to trim. Default is the current directory')
     parser.add_argument('--debug', action='store_true', help='Enable debug output')
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy/xchmod.py

@@ -73,7 +73,7 @@ def make_public():
 
     parser.add_argument('--debug', action='store_true', help='Output the list of files (if any) that need to be made publically writeable')
     parser.add_argument('--verbose', action='store_true', help='List files as they are updated')
-    parser.add_argument('-R', '--recursive', action='store_true', help='Operate recursively')
+    parser.add_argument('--recursive', '-R', action='store_true', help='Operate recursively')
     parser.add_argument('mode', help='Mode to set')
     parser.add_argument('paths', nargs='+', help='List of directory paths to search')
 

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.91
+Version: 0.0.93
 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
@@ -18,6 +18,7 @@ Requires-Dist: pyaml
 Requires-Dist: pygit2
 Requires-Dist: python-dateutil
 Requires-Dist: requests
+Requires-Dist: filetype
 
 # Thingy
 
@@ -49,7 +50,9 @@ The multigit command line format is:
 
 Where COMMAND is an internal multigit command if it starts with a '+' and is a git command otherwise.
 
-By default, when a multigit command, other than `init` is run, it runs a git command in each of the working trees. The command takes a number of options that can be used to select the list of working trees that each of the subcommands that it supports runs in:
+By default, when multigit is invoked with a git command, it runs a the command in each of the working trees selected by the command line options passed to multigit (if no options are specified then the command is run in all the working trees. 
+
+The command takes a number of options that can be used to select the list of working trees that each of the subcommands that it supports runs in:
 
 *--repos / -r* Allows a list of working trees to be specfied, either as the full or relative path, the name or a wildcard.
 
@@ -57,11 +60,11 @@ By default, when a multigit command, other than `init` is run, it runs a git com
 
 *--branched / -b* Run only working trees where the current branch that is checked out is NOT the default branch
 
-Multigit supports a small list of subcommands:
+Multigit supports a small list of subcommands, each of which are prefixed with a `+` to distinguish them from Git commands:
 
 *+init* - Create or update the configuration file
 
-*+dir* - Given the name of a working tree, prin the location within the multigit tree
+*+dir* - Given the name of a working tree, output the location within the multigit tree of that working tree if the name matches uniquely, or the name of the directory where the multigit configuration file resides if no parameter is specified.
 
 *+config* - Print the name and location of the multigit configuration file.
 
@@ -69,23 +72,17 @@ Any command not prefixed with '+' is run in each of the working trees (filtered
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.
 
-# Miscellaneous Git Utilities
-
-## ggit
-
-Run a git command in all working trees under the current directory (note that this is not related to multigit).
+The `+dir` command can be used with shell aliases (or their equivalent in the user's shell of choice) to create an alias to run, for example, `cd (multigit +dir "$@")` (Bash) or `cd (multigit +dir $argv)` (for the Fish shell) that would cd to the top level direcory.
 
-## ggrep
-
-Run 'git grep' in all repos under the current directory (note that this is not related to multigit).
+# Miscellaneous Git Utilities
 
 ## gitprompt
 
-Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+Output a string containing colour-coded shell nesting level, current directory and git working tree status (intended to be used in the shell prompt).
 
 # Git Extensions
 
-Due to the way that the git command works, these can be run as they were additional git subcommands
+Due to the way that the git command works, these can be run as they were additional git subcommands.
 
 ## git ca
 
@@ -115,16 +112,6 @@ Output the top level directory of the git working tree or return an error if we
 
 Console-based git change review tool.
 
-## GitLab Commands
-
-### git mr
-
-Push a feature branch to GitLab and create a merge request
-
-### gl
-
-Command line for GitLab
-
 # General Commands
 
 ## addpath
@@ -137,9 +124,7 @@ Stop or kill docker instances and/or remove docker images.
 
 ## ffind
 
-Simple file find utility
-
-Implements the functionality of the find command that is regularly used in a simpler fashion and ignores all the options that nobody ever uses.
+Simple file find utility - replaces the `find` command with something that is more human-friendly.
 
 ## linecount
 
@@ -251,3 +236,25 @@ Simple console system monitor
 ## window-rename
 
 Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.
+
+# Obsolescent Commands
+
+These commands will probably be retired in future versions of Thingy
+
+## ggit
+
+Run a git command in all working trees under the current directory (superceded by multigit).
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory (superceded by multigit).
+
+## GitLab Commands
+
+### git mr
+
+Push a feature branch to GitLab and create a merge request
+
+### gl
+
+Command line for GitLab

{skilleter_thingy-0.0.91 → skilleter_thingy-0.0.93}/skilleter_thingy.egg-info/requires.txt

@@ -6,3 +6,4 @@ pyaml
 pygit2
 python-dateutil
 requests
+filetype