skilleter-thingy 0.0.86__tar.gz → 0.0.88__tar.gz

{skilleter_thingy-0.0.86/skilleter_thingy.egg-info → skilleter_thingy-0.0.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.86
+Version: 0.0.88
 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
@@ -33,7 +33,56 @@ The following commands are documented in detail in the help output that can be d
 
 This README just contains a summary of the functionality of each command.
 
-# Git Utilities
+# Git Repo Management
+
+## multigit
+
+Manage a collection of related git working trees.
+
+This is intended for use in a situation where you have a collection of related git working trees organised in a directory hierarchy and not necessarily managed using git submodules or any other tool. It allows you to run git commands on multiple working trees at once, without navigating around the different working trees to do so.
+
+Start by running ensuring that the default branch (e.g. `main`) is checked out in each of the working trees and, in the top-level directory, run `multigit init` to create the configuration file which, by default is called `multigit.toml` - this is just a text file that sets the configuration for each working tree in terms of name, origin, default branch and location.
+
+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:
+
+*--repos / -r* Allows a list of working trees to be specfied, either as the full or relative path, the name or a wildcard.
+
+*--modified / -m* Run only in working trees containing locally modified files
+
+*--branched / -b* Run only working trees where the current branch that is checked out is NOT the default branch
+
+# TODO - Do we actually need any commands other than init, dir, config as everything else can be done via run?
+# TODO - Could just make the commands multigit +init/+dir/+config and then for anything else, just pass the whole of the command line to git once we've parsed the default branch?
+
+Multigit supports a (growing) list of subcommands:
+
+*init* - Create or update the configuration file
+
+*status* - Run `git status` in each of the working trees.
+
+*fetch* - Run `git fetch` in each of the working trees
+
+*pull* - Run `git pull` in each of the working trees
+
+*push* - Run `git push` in each of the working trees
+
+*co*
+
+*commit*
+
+*update*
+
+*clean*
+
+*dir*
+
+*config*
+
+*review*
+
+*run*
+
+# Miscellaneous Git Utilities
 
 ## ggit
 
@@ -47,6 +96,10 @@ Run 'git grep' in all repos under the current directory (note that this is not r
 
 Output a string containing colour-coded shell nesting level, current directory and git working tree status (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
+
 ## git ca
 
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
@@ -75,10 +128,6 @@ Output the top level directory of the git working tree or return an error if we
 
 Console-based git change review tool.
 
-## multigit
-
-Manage a collection of related git repoitories.
-
 ## GitLab Commands
 
 ### git mr

{skilleter_thingy-0.0.86 → skilleter_thingy-0.0.88}/README.md

@@ -12,7 +12,56 @@ The following commands are documented in detail in the help output that can be d
 
 This README just contains a summary of the functionality of each command.
 
-# Git Utilities
+# Git Repo Management
+
+## multigit
+
+Manage a collection of related git working trees.
+
+This is intended for use in a situation where you have a collection of related git working trees organised in a directory hierarchy and not necessarily managed using git submodules or any other tool. It allows you to run git commands on multiple working trees at once, without navigating around the different working trees to do so.
+
+Start by running ensuring that the default branch (e.g. `main`) is checked out in each of the working trees and, in the top-level directory, run `multigit init` to create the configuration file which, by default is called `multigit.toml` - this is just a text file that sets the configuration for each working tree in terms of name, origin, default branch and location.
+
+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:
+
+*--repos / -r* Allows a list of working trees to be specfied, either as the full or relative path, the name or a wildcard.
+
+*--modified / -m* Run only in working trees containing locally modified files
+
+*--branched / -b* Run only working trees where the current branch that is checked out is NOT the default branch
+
+# TODO - Do we actually need any commands other than init, dir, config as everything else can be done via run?
+# TODO - Could just make the commands multigit +init/+dir/+config and then for anything else, just pass the whole of the command line to git once we've parsed the default branch?
+
+Multigit supports a (growing) list of subcommands:
+
+*init* - Create or update the configuration file
+
+*status* - Run `git status` in each of the working trees.
+
+*fetch* - Run `git fetch` in each of the working trees
+
+*pull* - Run `git pull` in each of the working trees
+
+*push* - Run `git push` in each of the working trees
+
+*co*
+
+*commit*
+
+*update*
+
+*clean*
+
+*dir*
+
+*config*
+
+*review*
+
+*run*
+
+# Miscellaneous Git Utilities
 
 ## ggit
 
@@ -26,6 +75,10 @@ Run 'git grep' in all repos under the current directory (note that this is not r
 
 Output a string containing colour-coded shell nesting level, current directory and git working tree status (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
+
 ## git ca
 
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
@@ -54,10 +107,6 @@ Output the top level directory of the git working tree or return an error if we
 
 Console-based git change review tool.
 
-## multigit
-
-Manage a collection of related git repoitories.
-
 ## GitLab Commands
 
 ### git mr

{skilleter_thingy-0.0.86 → skilleter_thingy-0.0.88}/pyproject.toml

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

{skilleter_thingy-0.0.86 → skilleter_thingy-0.0.88}/skilleter_thingy/multigit.py

@@ -504,13 +504,23 @@ def mg_run(args, config, console):
 
     _ = config
 
-    cmd = shlex.split(args.cmd[0])
+    if len(args.cmd) == 0:
+        error('No command specified')
+    elif len(args.cmd) == 1:
+        command = shlex.split(args.cmd[0])
+    else:
+        command = args.cmd
+
 
     for repo in select_git_repos(args, config):
         if not args.quiet:
             show_progress(console.columns, repo.name)
 
-        run_git_status(cmd, repo.name, args.cont)
+        repo_command = []
+        for cmd in command:
+            repo_command.append(branch_name(cmd, repo['default branch']))
+
+        run_git_status(repo_command, repo.name, args.cont)
 
 ################################################################################
 
@@ -611,9 +621,9 @@ def main():
 
     parser_clean.add_argument('--recurse', '-d', action='store_true', help='Recurse into subdirectories')
     parser_clean.add_argument('--force', '-f', action='store_true', help='If the Git configuration variable clean.requireForce is not set to false, git clean will refuse to delete files or directories unless given -f or -i')
-    #parser_clean.add_argument('--interactive', '-i', action='store_true', help='Show what would be done and clean files interactively.')
+    # TODO: parser_clean.add_argument('--interactive', '-i', action='store_true', help='Show what would be done and clean files interactively.')
     parser_clean.add_argument('--dry-run', '-n', action='store_true', help='Don’t actually remove anything, just show what would be done.')
-    #parser_clean.add_argument('--quiet', '-q', , action='store_true', help='Be quiet, only report errors, but not the files that are successfully removed.')
+    # TODO: parser_clean.add_argument('--quiet', '-q', , action='store_true', help='Be quiet, only report errors, but not the files that are successfully removed.')
     parser_clean.add_argument('--exclude', '-e', action='store', help='Use the given exclude pattern in addition to the standard ignore rules.')
     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.')
@@ -625,7 +635,7 @@ def main():
 
     parser_run = subparsers.add_parser('run', help='Run any git command in each of the working trees')
     parser_run.add_argument('--cont', '-c', action='store_true', help='Continue if the command returns an error in any of the working trees')
-    parser_run.add_argument('cmd', nargs=1, action='store', help='The command to run (should be quoted)')
+    parser_run.add_argument('cmd', nargs='*', action='store', help='The command to run (the command may need to be quoted)')
 
     parser_review = subparsers.add_parser('review', help='Review the changes in a working tree')
     parser_review.add_argument('parameters', nargs='*', action='store', help='Parameters passed to the "git review" command')

{skilleter_thingy-0.0.86 → skilleter_thingy-0.0.88/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.86
+Version: 0.0.88
 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
@@ -33,7 +33,56 @@ The following commands are documented in detail in the help output that can be d
 
 This README just contains a summary of the functionality of each command.
 
-# Git Utilities
+# Git Repo Management
+
+## multigit
+
+Manage a collection of related git working trees.
+
+This is intended for use in a situation where you have a collection of related git working trees organised in a directory hierarchy and not necessarily managed using git submodules or any other tool. It allows you to run git commands on multiple working trees at once, without navigating around the different working trees to do so.
+
+Start by running ensuring that the default branch (e.g. `main`) is checked out in each of the working trees and, in the top-level directory, run `multigit init` to create the configuration file which, by default is called `multigit.toml` - this is just a text file that sets the configuration for each working tree in terms of name, origin, default branch and location.
+
+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:
+
+*--repos / -r* Allows a list of working trees to be specfied, either as the full or relative path, the name or a wildcard.
+
+*--modified / -m* Run only in working trees containing locally modified files
+
+*--branched / -b* Run only working trees where the current branch that is checked out is NOT the default branch
+
+# TODO - Do we actually need any commands other than init, dir, config as everything else can be done via run?
+# TODO - Could just make the commands multigit +init/+dir/+config and then for anything else, just pass the whole of the command line to git once we've parsed the default branch?
+
+Multigit supports a (growing) list of subcommands:
+
+*init* - Create or update the configuration file
+
+*status* - Run `git status` in each of the working trees.
+
+*fetch* - Run `git fetch` in each of the working trees
+
+*pull* - Run `git pull` in each of the working trees
+
+*push* - Run `git push` in each of the working trees
+
+*co*
+
+*commit*
+
+*update*
+
+*clean*
+
+*dir*
+
+*config*
+
+*review*
+
+*run*
+
+# Miscellaneous Git Utilities
 
 ## ggit
 
@@ -47,6 +96,10 @@ Run 'git grep' in all repos under the current directory (note that this is not r
 
 Output a string containing colour-coded shell nesting level, current directory and git working tree status (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
+
 ## git ca
 
 Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
@@ -75,10 +128,6 @@ Output the top level directory of the git working tree or return an error if we
 
 Console-based git change review tool.
 
-## multigit
-
-Manage a collection of related git repoitories.
-
 ## GitLab Commands
 
 ### git mr