skilleter-thingy 0.0.77__py3-none-any.whl → 0.0.79__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -7,8 +7,7 @@ import sys
 import argparse
 import fnmatch
 import configparser
-
-# TODO: Switch to tomlkit
+import shlex
 from collections import defaultdict
 
 import thingy.git2 as git
@@ -27,18 +26,19 @@ import thingy.colour as colour
 
 # TODO: [ ] If the config file isn't in the current directory then search up the directory tree for it but run in the current directory
 # TODO: [ ] -j option to run in parallel?
-# TODO: [ ] init function
+# TODO: [/] init function
 # TODO: [/] Use the configuration file
 # TODO: [/] Don't use a fixed list of default branch names
 # TODO: [/] / Output name of each git repo as it is processed as command sits there seeming to do nothing otherwise.
 # TODO: [ ] ? Pull/fetch - only output after running command and only if something updated
-# TODO: [ ] Don't save the configuration on exit if it hasn't changed
+# TODO: [/] Don't save the configuration on exit if it hasn't changed
 # TODO: [ ] Consistent colours in output
 # TODO: [ ] Is it going to be a problem if the same repo is checked out twice or more in the same workspace
 # TODO: [ ] Better error-handling - e.g. continue/abort option after failure in one repo
 # TODO: [ ] Dry-run option
 # TODO: [ ] Verbose option
 # TODO: [ ] When specifying list of repos, if repo name doesn't contain '/' prefix it with '*'?
+# TODO: [ ] Switch to tomlkit
 
 ################################################################################
 
@@ -103,13 +103,26 @@ 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. """
 
+    # TODO: [ ] Update should remove or warn about repos that are no longer present
+
     # Search for .git directories
 
     for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
             show_progress(console.columns, repo)
 
-        config[repo] = {'default branch': git.branch(path=repo)}
+        if not repo in config:
+            config[repo] = {
+                'default branch': git.branch(path=repo)
+            }
+
+        remote = git.remotes(path=repo)
+
+        if 'origin' in remote:
+            config[repo]['origin'] = remote['origin']
+            config[repo]['name']= os.path.basename(remote['origin']).removesuffix('.git')
+        else:
+            config[repo]['name'] = os.path.basename(repo)
 
 ################################################################################
 
@@ -259,7 +272,7 @@ def mg_push(args, config, console):
             result = git.push(path=repo, force_with_lease=args.force)
 
             if result:
-	        colour.write(result, indent=4)
+                colour.write(result, indent=4)
 
             colour.write()
 
@@ -371,6 +384,48 @@ def mg_clean(args, config, console):
 
 ################################################################################
 
+def mg_dir(args, config, console):
+    """Return the location of a working tree, given the name. Returns an
+       error unless there is a unique match"""
+
+    location = []
+    search_dir = args.dir[0]
+
+    for repo in find_git_repos(args.directory, args.repos):
+        if fnmatch.fnmatch(config[repo]['name'], search_dir):
+            location.append(repo)
+
+    if len(location) == 0:
+        error(f'No matches with {dir}')
+    elif len(location) > 1:
+        error(f'Multiple matches with {dir}')
+
+    colour.write(location[0])
+
+################################################################################
+
+def mg_run(args, config, console):
+    """Run a command in each of the working trees, optionally continuing if
+       there's an error"""
+
+    cmd = shlex.split(args.cmd[0])
+
+    for repo in find_git_repos(args.directory, args.repos):
+        if not args.quiet:
+            show_progress(console.columns, repo)
+
+        output, status = git.git_run_status(cmd, path=repo)
+
+        if output:
+            colour.write(f'[BOLD:{repo}]')
+            colour.write()
+            colour.write(output, indent=4)
+
+        if status and not args.cont:
+            sys.exit(status)
+
+################################################################################
+
 def main():
     """Main function"""
 
@@ -384,6 +439,8 @@ def main():
        'commit': mg_commit,
        'update': mg_update,
        'clean': mg_clean,
+       'dir': mg_dir,
+       'run': mg_run,
     }
 
     # Parse args in the form COMMAND OPTIONS SUBCOMMAND SUBCOMMAND_OPTIONS PARAMETERS
@@ -431,6 +488,13 @@ def main():
     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.')
 
+    parser_dir = subparsers.add_parser('dir', help='Return the location of a working tree, given the repo name')
+    parser_dir.add_argument('dir', nargs=1, action='store', help='The name of the working tree')
+
+    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)')
+
     # Parse the command line
 
     args = parser.parse_args()
@@ -472,14 +536,21 @@ def multigit():
 
     try:
         main()
+
+    # Catch keyboard aborts
+
     except KeyboardInterrupt:
         sys.exit(1)
 
+    # Quietly fail if output was being piped and the pipe broke
+
     except BrokenPipeError:
         sys.exit(2)
 
+    # Catch-all failure for Git errors
+
     except git.GitError as exc:
-        print(exc)
+        sys.stderr.write(exc)
         sys.exit(3)
 
 ################################################################################

skilleter_thingy/thingy/git2.py

@@ -38,6 +38,11 @@ import thingy.gitlab as gitlab
 
 (LOCAL, GLOBAL, SYSTEM) = list(range(3))
 
+# Options always passed to Git (disable autocorrect to stop it running the wrong command
+# if an invalid command name has been specified).
+
+STANDARD_GIT_OPTIONS = ['-c', 'help.autoCorrect=never']
+
 ################################################################################
 
 class GitError(run.RunError):
@@ -54,7 +59,7 @@ def git(cmd, stdout=None, stderr=None, path=None):
         to get the exception.
         Optionally redirect stdout and stderr as specified. """
 
-    git_cmd = ['git']
+    git_cmd = ['git'] + STANDARD_GIT_OPTIONS
 
     if path:
         git_cmd += ['-C', path]
@@ -75,7 +80,7 @@ def git_run_status(cmd, stdout=None, stderr=None, path=None):
 
     logging.debug('Running git %s', ' '.join(cmd))
 
-    git_cmd = ['git']
+    git_cmd = ['git'] + STANDARD_GIT_OPTIONS
 
     if path:
         git_cmd += ['-C', path]
@@ -317,10 +322,10 @@ def merging():
 
 ################################################################################
 
-def remotes():
+def remotes(path=None):
     """ Return the list of git remotes """
 
-    repo = pygit2.Repository(os.getcwd())
+    repo = pygit2.Repository(path or os.getcwd())
 
     git_remotes = {}
 

skilleter_thingy/xchmod.py

@@ -10,11 +10,10 @@
     of 'a+rw' and applies them to all files and directories in the specified
     path and must be run with -R/--recursive.
 
-    TODO:
-        Support all file modes as per chmod
-        Support all command line options of chmod
-        Implement non-recursive mode
-        Options for files/directories only
+    TODO: [ ] Support all file modes as per chmod
+    TODO: [ ] Support all command line options of chmod
+    TODO: [ ] Implement non-recursive mode
+    TODO: [ ] Options for files/directories only
 
     Copyright (C) 2017 John Skilleter
 

{skilleter_thingy-0.0.77.dist-info → skilleter_thingy-0.0.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.77
+Version: 0.0.79
 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
@@ -37,11 +37,11 @@ This README just contains a summary of the functionality of each command.
 
 ## ggit
 
-Run a git command in all repos under the current directory
+Run a git command in all working trees under the current directory (note that this is not related to multigit (see below)).
 
 ## ggrep
 
-Run 'git grep' in all repos under the current directory
+Run 'git grep' in all repos under the current directory (note that this is not related to multigit (see below)).
 
 ## gitprompt
 
@@ -53,15 +53,11 @@ Improved version of 'git commit --amend'. Updates files that are already in the
 
 ## git cleanup
 
-List or delete branches that have already been merged and delete tracking branches that are no longer on ther remote.
+List or delete branches that have already been merged and delete tracking branches that are no longer on the remote.
 
 ## git co
 
-Equivalent to 'git checkout' but with intelligent branch matching
-
-## git mr
-
-Push a feature branch to GitLab and create a merge request
+Equivalent to 'git checkout' but with intelligent branch matching, so specifying a partial branch name will work if it uniquely matches an existing branch
 
 ## git parent
 
@@ -83,21 +79,21 @@ Console-based git change review tool.
 
 Manage a collection of related git repoitories.
 
-# General Commands
+## GitLab Commands
 
-## addpath
+### git mr
 
-Update a $PATH-type variable by adding or removing entries.
+Push a feature branch to GitLab and create a merge request
 
-## console-colours
+### gl
 
-Display all available colours in the console.
+Command line for GitLab
 
-## diskspacecheck
+# General Commands
 
-Check how much free space is available on all filesystems, ignoring read-only filesystems, /dev and tmpfs.
+## addpath
 
-Issue a warning if any are above 90% used.
+Update a $PATH-type variable by adding or removing entries.
 
 ## docker-purge
 
@@ -143,7 +139,7 @@ Simple search and replace utility for those times when trying to escape characte
 
 ## tfm
 
-Console-based file-manager, similar to Midnight Commander but better.
+Console-based file-manager, similar to Midnight Commander but aiming to be better.
 
 ## tfparse
 
@@ -161,9 +157,7 @@ Create a script to create/update a virtual environment and run a python script i
 
 ## xchmod
 
-WIP: Command to run chmod only on files that need it (only modifies files that don't have the required permissions already).
-
-Currently implements a *very* restricted set of functionality.
+Command to run chmod only on files that need it (only modifies files that don't have the required permissions already).
 
 ## yamlcheck
 
@@ -177,9 +171,15 @@ These will be moved to the skilleter-extras package in due course.
 
 Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 
-## gl
+## consolecolours
 
-Command line for GitLab
+Display all available colours in the console.
+
+## diskspacecheck
+
+Check how much free space is available on all filesystems, ignoring read-only filesystems, /dev and tmpfs.
+
+Issue a warning if any are above 90% used.
 
 ## gphotosync
 

{skilleter_thingy-0.0.77.dist-info → skilleter_thingy-0.0.79.dist-info}/RECORD

@@ -25,7 +25,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=Vb2zYTEFp26BYdkG810SRg9afyfDqvq4CLHTk-MFf60,22388
 skilleter_thingy/linecount.py,sha256=5voQtjJjDCVx4zjPwVRy620NpuLiwwFitzxjIsRGtxQ,4310
 skilleter_thingy/moviemover.py,sha256=j_Xb9_jFdgpFBAXcF4tEqbnKH_FonlnUU39LiCK980k,4470
-skilleter_thingy/multigit.py,sha256=DES_T2XpyR82jR30e26KvrXMgmSepUhSiSffjTru1AU,19026
+skilleter_thingy/multigit.py,sha256=c-EZqU0wFSwb6PxEZmxNIAxdD1vex626ph805RDRcfI,21512
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -41,7 +41,7 @@ skilleter_thingy/tfparse.py,sha256=u1IZH2J_WH1aORyMozKSI2JKok7_S1MMJhiobzmhlUI,2
 skilleter_thingy/trimpath.py,sha256=25On5OHTT1rXTzTuRWQeS3FWtTd0XZr5NFDDACR6AGM,2294
 skilleter_thingy/venv_create.py,sha256=lMcGvWNwP-ZlyPJ1eZU-PHNOnscZHjtjhoT6sLfhIU4,1153
 skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63sqJK8,3128
-skilleter_thingy/xchmod.py,sha256=F9_lxKuLqVlHHr3oBI3dkMoFOuwRzYDlpQMTmDcjpBI,4590
+skilleter_thingy/xchmod.py,sha256=NgSNpB7mU28n21xC-PbDF2Y0nKPmvVFOJhtm_r6OT_0,4604
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
 skilleter_thingy/thingy/colour.py,sha256=-I5HOfWZNVxN85DjNPpzYLIUlzGrzMr3oLRwim7O6us,7103
@@ -52,7 +52,7 @@ skilleter_thingy/thingy/dircolors.py,sha256=5NbXMsGWdABLvvZfB70VPmN6N5HyyihfpgoQ
 skilleter_thingy/thingy/docker.py,sha256=9EFatudoVPfB1UbDEtzdJDB3o6ToHiNHv8-oLsUeqiQ,2449
 skilleter_thingy/thingy/files.py,sha256=oW6E6WWwVFSUPdrZnKMx7P_w_hh3etjoN7RrqvYHCHc,4705
 skilleter_thingy/thingy/git.py,sha256=qXWIduF4jbP5pKFYt_hW9Ex5iL9mSBBrcNKBkULhRTg,38834
-skilleter_thingy/thingy/git2.py,sha256=UEXeSyT5PlYGtdUAQDEZC7Sc7JmYdAlP6osa1tVmpO8,36620
+skilleter_thingy/thingy/git2.py,sha256=_ASpj1uUzxKyIFo4NOblUz99ZAcih-uhGafXczX49jk,36880
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dOeu8,2529
@@ -61,9 +61,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.0.77.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.77.dist-info/METADATA,sha256=OuTAQKPCHRzc4K-j1oHaFnpO8piPz-pKO5uT-0uPs3s,5938
-skilleter_thingy-0.0.77.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.77.dist-info/entry_points.txt,sha256=uW11ofmIbfPP_5B-pxb8YDkHbeZ_xeCoO6358R9wGVI,2146
-skilleter_thingy-0.0.77.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.77.dist-info/RECORD,,
+skilleter_thingy-0.0.79.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.0.79.dist-info/METADATA,sha256=6aHbIawlb7OSELGU2QxtkxQiMLTqo-p-Z_WS6Qvwji4,6113
+skilleter_thingy-0.0.79.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+skilleter_thingy-0.0.79.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.0.79.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.0.79.dist-info/RECORD,,

{skilleter_thingy-0.0.77.dist-info → skilleter_thingy-0.0.79.dist-info}/entry_points.txt

@@ -1,7 +1,7 @@
 [console_scripts]
 addpath = skilleter_thingy:addpath.addpath
 borger = skilleter_thingy:borger.borger
-console_colours = skilleter_thingy:console_colours.console_colours
+consolecolours = skilleter_thingy:console_colours.console_colours
 diskspacecheck = skilleter_thingy:diskspacecheck.diskspacecheck
 docker-purge = skilleter_thingy:docker_purge.docker_purge
 ffind = skilleter_thingy:ffind.ffind