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

skilleter_thingy/multigit.py

@@ -25,6 +25,7 @@ import thingy.colour as colour
     default branch = name
 """
 
+# 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: [/] Use the configuration file
@@ -37,6 +38,7 @@ import thingy.colour as colour
 # 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 '*'?
 
 ################################################################################
 
@@ -69,8 +71,13 @@ def show_progress(width, msg):
 def find_git_repos(directory, wildcard):
     """Locate and return a list of '.git' directory parent directories in the
        specified path.
+
        If wildcard is not None then it is treated as a list of wildcards and
-       only repos matching at least one of the wildcards are returned."""
+       only repos matching at least one of the wildcards are returned.
+
+       If the same repo matches multiple times it will only be returned once. """
+
+    repos = set()
 
     for root, dirs, _ in os.walk(directory):
         if '.git' in dirs:
@@ -80,10 +87,14 @@ def find_git_repos(directory, wildcard):
             if wildcard:
                 for card in wildcard:
                     if fnmatch.fnmatch(root, card):
-                        yield root
+                        if root not in repos:
+                            yield root
+                            repos.add(root)
                         break
             else:
-                yield root
+                if root not in repos:
+                    yield root
+                    repos.add(root)
 
 ################################################################################
 
@@ -233,8 +244,8 @@ def mg_push(args, config, console):
        and where the most recent commit was the current user and was on the branch
     """
 
-    # TODO: Add option for force-push?
-    # TODO: Add option for manual confirmation?
+    # TODO: [/] Add option for force-push?
+    # TODO: [ ] Add option for manual confirmation?
 
     for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
@@ -245,11 +256,10 @@ def mg_push(args, config, console):
         if branch != config[repo]['default branch']:
             colour.write(f'Pushing changes to [BLUE:{branch}] in [BOLD:{repo}]')
 
-            result = git.push(path=repo)
+            result = git.push(path=repo, force_with_lease=args.force)
 
             if result:
-                for line in result:
-                    colour.write(f'    {line}')
+	        colour.write(result, indent=4)
 
             colour.write()
 
@@ -261,7 +271,10 @@ def mg_checkout(args, config, console):
        if the branch exists in the repo.
        If the 'create' option is specified then branch is created"""
 
-    # TODO: Add --create handling
+    # TODO: [ ] Add --create handling
+    # TODO: [ ] Checkout remote branches
+    # TODO: [ ] only try checkout if branch exists
+    # TODO: [ ] option to fetch before checking out
 
     for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
@@ -270,9 +283,9 @@ def mg_checkout(args, config, console):
         branch = args.branch or config[repo]['default branch']
 
         if git.branch(path=repo) != branch:
-            console.write(f'Checking out [BLUE:{branch}] in [BLUE:{repo}]')
+            colour.write(f'Checking out [BLUE:{branch}] in [BOLD:{repo}]')
 
-            git.checkout(branch, path=repo)
+            git.checkout(branch, create=args.create, path=repo)
 
 ################################################################################
 
@@ -281,7 +294,8 @@ def mg_commit(args, config, console):
        commit those changes onto the branch"""
 
     # TODO [ ] Option to amend the commit if it is not the first one on the current branch
-    # TODO [ ] Prevent commits if current branch is the default branch
+    # TODO [/] Prevent commits if current branch is the default branch
+    # TODO [ ] Option to specify wildcard for files to commit (default is all files)
 
     for repo in find_git_repos(args.directory, args.repos):
         if not args.quiet:
@@ -323,7 +337,37 @@ def mg_update(args, config, console):
         if branch != default_branch:
             git.checkout(branch, path=repo)
             result = git.rebase(default_branch, path=repo)
-            colour.write(f'    {result[0].strip()}')
+            colour.write(result[0], indent=4)
+
+################################################################################
+
+def mg_clean(args, config, console):
+    """Clean the repos"""
+
+    for repo in find_git_repos(args.directory, args.repos):
+        if not args.quiet:
+            show_progress(console.columns, repo)
+
+        result = git.clean(recurse=args.recurse, force=args.force, dry_run=args.dry_run,
+                           quiet=args.quiet, exclude=args.exclude, ignore_rules=args.x,
+                           remove_only_ignored=args.X, path=repo)
+
+        first_skip = True
+
+        if result:
+            colour.write(f'[BOLD:{repo}]')
+
+            for item in result:
+                skipping = item.startswith('Skipping repository ')
+
+                if skipping and not args.verbose:
+                    if first_skip:
+                        colour.write(f'    Skipping sub-repositories')
+                        first_skip = False
+                else:
+                    colour.write(f'    {item.strip()}')
+
+            colour.write()
 
 ################################################################################
 
@@ -339,6 +383,7 @@ def main():
        'checkout':  mg_checkout,
        'commit': mg_commit,
        'update': mg_update,
+       'clean': mg_clean,
     }
 
     # Parse args in the form COMMAND OPTIONS SUBCOMMAND SUBCOMMAND_OPTIONS PARAMETERS
@@ -351,7 +396,7 @@ def main():
     parser.add_argument('--quiet', '-q', action='store_true', help='Minimal console output')
     parser.add_argument('--config', '-c', action='store', default=DEFAULT_CONFIG_FILE, help=f'The configuration file (defaults to {DEFAULT_CONFIG_FILE})')
     parser.add_argument('--directory', '--dir', action='store', default='.', help='The top-level directory of the multigit tree (defaults to the current directory)')
-    parser.add_argument('--repos', '-r', action='append', default=None, help='The list of repo names to work on (defaults to all repos and can contain shell wildcards)')
+    parser.add_argument('--repos', '-r', action='append', default=None, help='The repo names to work on (defaults to all repos and can contain shell wildcards and can be issued multiple times on the command line)')
 
     subparsers = parser.add_subparsers(dest='command')
 
@@ -362,10 +407,12 @@ def main():
     parser_status = subparsers.add_parser('status', help='Report git status in every repo that has something to report')
     parser_fetch = subparsers.add_parser('fetch', help='Run git fetch in every repo')
     parser_pull = subparsers.add_parser('pull', help='Run git pull in every repo')
+
     parser_push = subparsers.add_parser('push', help='Run git push in every repo where the current branch isn\'t the default and the most recent commit was by the current user')
+    parser_push.add_argument('--force', '-f', action='store_true', help='Use --force-push-with-least to update a remote branch if the local branch has been rebased')
 
     parser_checkout = subparsers.add_parser('checkout', help='Checkout the specified branch')
-    parser_checkout.add_argument('--create', action='store_true', help='Create the specified branch and check it out')
+    parser_checkout.add_argument('--create', '-b', action='store_true', help='Create the specified branch and check it out')
     parser_checkout.add_argument('branch', nargs='?', default=None, action='store', help='The branch name to check out (defaults to the default branch)')
 
     parser_commit = subparsers.add_parser('commit', help='Commit changes')
@@ -373,6 +420,17 @@ def main():
 
     parser_update = subparsers.add_parser('update', help='Pull the default branch and if the current branch isn\'t the default branch, rebase it onto the default branch')
 
+    parser_clean = subparsers.add_parser('clean', help='Remove untracked files from the working tree')
+
+    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.')
+    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.')
+    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.')
+
     # Parse the command line
 
     args = parser.parse_args()
@@ -382,8 +440,6 @@ def main():
     if not args.command:
         error('No command specified')
 
-    # 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
-
     # If the configuration file exists, read it
 
     config = configparser.ConfigParser()
@@ -418,9 +474,14 @@ def multigit():
         main()
     except KeyboardInterrupt:
         sys.exit(1)
+
     except BrokenPipeError:
         sys.exit(2)
 
+    except git.GitError as exc:
+        print(exc)
+        sys.exit(3)
+
 ################################################################################
 
 if __name__ == '__main__':

skilleter_thingy/thingy/colour.py

@@ -144,7 +144,7 @@ def format(txt):
 
 ################################################################################
 
-def write(txt=None, newline=True, stream=sys.stdout, indent=0):
+def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False):
     """ Write to the specified stream (defaulting to stdout), converting colour codes to ANSI
         txt can be None, a string or a list of strings."""
 
@@ -155,6 +155,9 @@ def write(txt=None, newline=True, stream=sys.stdout, indent=0):
         for n, line in enumerate(txt):
             line = format(line)
 
+            if strip:
+                line = line.strip()
+
             if indent:
                 stream.write(' ' * indent)
 

skilleter_thingy/thingy/git2.py

@@ -1239,6 +1239,38 @@ def log(branch1, branch2=None):
 
     return git(cmd)
 
+################################################################################
+
+def clean(recurse=False, force=False, dry_run=False, quiet=False,
+          exclude=None, ignore_rules=False, remove_only_ignored=False, path=None):
+
+    """ Run git clean """
+
+    cmd = ['clean']
+
+    if recurse:
+        cmd.append('-d')
+
+    if force:
+        cmd.append('--force')
+
+    if dry_run:
+        cmd.append('--dry-run')
+
+    if quiet:
+        cmd.append('--quiet')
+
+    if exclude:
+        cmd += ['--exclude', exclude]
+
+    if ignore_rules:
+        cmd.append('-x')
+
+    if remove_only_ignored:
+        cmd.append('-X')
+
+    return git(cmd, path=path)
+
 ################################################################################
 # Entry point
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.75
+Version: 0.0.77
 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,16 +33,62 @@ 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
+
+## ggit
+
+Run a git command in all repos under the current directory
+
+## ggrep
+
+Run 'git grep' in all repos under the current directory
+
+## gitprompt
+
+Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+
+## git ca
+
+Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
+
+## git cleanup
+
+List or delete branches that have already been merged and delete tracking branches that are no longer on ther 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
+
+## git parent
+
+Attempt to determine the parent branch for the specified branch (defaulting to the current one)
+
+## git update
+
+Update the repo from the remote, rebase branches against their parents, optionally run git cleanup
+
+## git wt
+
+Output the top level directory of the git working tree or return an error if we are not in a git working tree.
+
+## git review
+
+Console-based git change review tool.
+
+## multigit
+
+Manage a collection of related git repoitories.
+
 # General Commands
 
 ## addpath
 
 Update a $PATH-type variable by adding or removing entries.
 
-## borger
-
-Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
-
 ## console-colours
 
 Display all available colours in the console.
@@ -63,33 +109,10 @@ 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.
 
-## gl
-
-### gphotosync
-
-Utility for syncing photos from Google Photos to local storage
-
 ## linecount
 
 Count lines of code in a directory tree organised by file type.
 
-## moviemover
-
-Search for files matching a wildcard in a directory tree and move them to an equivalent location in a different tree
-
-## phototidier
-
-Perform various tidying operations on a directory full of photos:
-
-* Remove leading '$' and '_' from filenames
-* Move files in hidden directories up 1 level
-* If the EXIF data in a photo indicates that it was taken on date that doesn't match the name of the directory it is stored in (in YYYY-MM-DD format) then it is moved to the correct directory, creating it if necessary.
-
-All move/rename operations are carried out safely with the file being moved having
-a numeric suffix added to the name if it conflicts with an existing file.
-
-## photodupe
-
 ## py-audit
 
 Query api.osv.dev to determine whether a specified version of a particular Python package is subject to known security vulnerabilities
@@ -114,16 +137,10 @@ Run pylint on all the Python source files in the current tree
 
 Synchronise files from S3 to local storage.
 
-## splitpics
-
-Copy a directory full of pictures to a destination, creating subdiretories with a fixed number of pictures in each in the destination directory for use with FAT filesystems and digital photo frames.
-
 ## strreplace
 
 Simple search and replace utility for those times when trying to escape characters in a regexp to use sed is more hassle than it is worth.
 
-## sysmon
-
 ## tfm
 
 Console-based file-manager, similar to Midnight Commander but better.
@@ -138,7 +155,9 @@ no way of doing this directly from Terraform
 
 Intelligently trim a path to fit a given width (used by gitprompt)
 
-## window-rename
+## venv-create
+
+Create a script to create/update a virtual environment and run a python script in it.
 
 ## xchmod
 
@@ -150,44 +169,49 @@ Currently implements a *very* restricted set of functionality.
 
 YAML validator - checks that a file is valid YAML (use yamllint to verify that it is nicely-formatted YAML).
 
-# Git Utilities
+# Obsolescent Utilities
 
-## ggit
+These will be moved to the skilleter-extras package in due course.
 
-Run a git command in all repos under the current directory
+## borger
 
-## ggrep
+Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 
-Run 'git grep' in all repos under the current directory
+## gl
 
-## gitprompt
+Command line for GitLab
 
-Output a string containing colour-coded shell nesting level, current directory and git working tree status (used in the shell prompt).
+## gphotosync
 
-## git ca
+Utility for syncing photos from Google Photos to local storage
 
-Improved version of 'git commit --amend'. Updates files that are already in the commit and, optionally, adds and commits additional files.
+## moviemover
 
-## git cleanup
+Search for files matching a wildcard in a directory tree and move them to an equivalent location in a different tree
 
-List or delete branches that have already been merged and delete tracking branches that are no longer on ther remote.
+## phototidier
 
-## git co
+Perform various tidying operations on a directory full of photos:
 
-## git mr
+* Remove leading '$' and '_' from filenames
+* Move files in hidden directories up 1 level
+* If the EXIF data in a photo indicates that it was taken on date that doesn't match the name of the directory it is stored in (in YYYY-MM-DD format) then it is moved to the correct directory, creating it if necessary.
 
-## git parent
+All move/rename operations are carried out safely with the file being moved having
+a numeric suffix added to the name if it conflicts with an existing file.
 
-## git update
+## photodupe
 
-Update the repo from the remote, rebase branches against their parents, optionally run git cleanup
+Search for duplicate images in a directory tree
 
-## git wt
+## splitpics
 
-Output the top level directory of the git working tree or return an error if we are not in a git working tree.
+Copy a directory full of pictures to a destination, creating subdiretories with a fixed number of pictures in each in the destination directory for use with FAT filesystems and digital photo frames.
 
-## git review
+## sysmon
 
-## venv-create
+Simple console system monitor
 
-Create a script to create/update a virtual environment and run a python script in it.
+## window-rename
+
+Monitor window titles and rename them to fit an alphabetical grouping in 'Appname - Document' format.

{skilleter_thingy-0.0.75.dist-info → skilleter_thingy-0.0.77.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=QKn2DLf5Fr6WJr99PEM1YV5mmTlfoX7Qt5SbaXA4S8w,15695
+skilleter_thingy/multigit.py,sha256=DES_T2XpyR82jR30e26KvrXMgmSepUhSiSffjTru1AU,19026
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=5gSjlINUxf3ZQl3NG0o7CsWwODvTbokIMIafLFvn8Hc,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -44,7 +44,7 @@ skilleter_thingy/window_rename.py,sha256=dCBgZqih_3YKHt35hsOAhARFp3QxOi8w8huC63s
 skilleter_thingy/xchmod.py,sha256=F9_lxKuLqVlHHr3oBI3dkMoFOuwRzYDlpQMTmDcjpBI,4590
 skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
 skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
-skilleter_thingy/thingy/colour.py,sha256=D-RTYsND6Xm6m3xl0mOe9QSrTNYsyY0K_a8x3id2gvg,7031
+skilleter_thingy/thingy/colour.py,sha256=-I5HOfWZNVxN85DjNPpzYLIUlzGrzMr3oLRwim7O6us,7103
 skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
 skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
 skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,1783
@@ -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=ylEuwO-URTLxFQI--y5ed0Dg0v88reupCRBQnnkohf0,35971
+skilleter_thingy/thingy/git2.py,sha256=UEXeSyT5PlYGtdUAQDEZC7Sc7JmYdAlP6osa1tVmpO8,36620
 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.75.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.0.75.dist-info/METADATA,sha256=QbQfpZry6Uc_yjViSwKltz6mj4IE8hiT5ED0sBJqBIc,5313
-skilleter_thingy-0.0.75.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-skilleter_thingy-0.0.75.dist-info/entry_points.txt,sha256=uW11ofmIbfPP_5B-pxb8YDkHbeZ_xeCoO6358R9wGVI,2146
-skilleter_thingy-0.0.75.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.0.75.dist-info/RECORD,,
+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,,