skilleter-thingy 0.2.3__py3-none-any.whl → 0.2.6__py3-none-any.whl

skilleter_thingy/ggit.py

@@ -7,6 +7,7 @@ import os
 import subprocess
 import argparse
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

skilleter_thingy/ggrep.py

@@ -14,6 +14,7 @@ import sys
 import argparse
 
 import thingy.colour as colour
+# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################

skilleter_thingy/git_br.py

@@ -13,6 +13,7 @@
 """
 ################################################################################
 
+import os
 import sys
 import argparse
 import fnmatch
@@ -21,6 +22,7 @@ import datetime
 from dateutil.parser import parse
 from dateutil.relativedelta import relativedelta
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 
@@ -34,10 +36,15 @@ def parse_command_line():
     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('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
     parser.add_argument('branches', nargs='*', help='Filter the list of branches according to one or more patterns')
 
     args = parser.parse_args()
 
+    if args.path:
+        os.chdir(args.path[0])
+
     if args.delete and not args.branches:
         colour.error('You must specify the branches to delete', prefix=True)
 

skilleter_thingy/git_ca.py

@@ -18,6 +18,7 @@ import sys
 import logging
 
 import thingy.colour as colour
+# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################
@@ -43,6 +44,8 @@ def main():
     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('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
 
     parser.add_argument('files', nargs='*', help='List of files to add to the commit')
 
@@ -54,6 +57,11 @@ def main():
         logging.basicConfig(level=logging.INFO)
         logging.info('Debug logging enabled')
 
+    # Change directory, if specified
+
+    if args.path:
+        os.chdir(args.path[0])
+
     # 'Add' implies 'all'
 
     if args.everything:

skilleter_thingy/git_cleanup.py

@@ -9,10 +9,12 @@
 """
 ################################################################################
 
+import os
 import sys
 import argparse
 import logging
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 
@@ -38,6 +40,8 @@ def parse_command_line():
     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('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
 
     parser.add_argument('branches', nargs='*', help='List of branches to check (default is all branches)')
 
@@ -94,6 +98,11 @@ def main():
     if args.debug:
         logging.basicConfig(level=logging.INFO)
 
+    # Change directory, if specified
+
+    if args.path:
+        os.chdir(args.path[0])
+
     # Get the list of all local branches
 
     try:
@@ -280,6 +289,8 @@ def git_cleanup():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_co.py

@@ -20,6 +20,7 @@
 """
 ################################################################################
 
+import os
 import logging
 import sys
 import argparse
@@ -68,6 +69,8 @@ def parse_arguments():
     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)')
+    parser.add_argument('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
 
     args = parser.parse_args()
 
@@ -76,6 +79,9 @@ def parse_arguments():
     if args.debug:
         logging.basicConfig(level=logging.INFO)
 
+    if args.path:
+        os.chdir(args.path[0])
+
     return args
 
 ################################################################################
@@ -99,11 +105,11 @@ def checkout_matching_branch(args, branchname):
     if args.exact:
         commits = [branchname] if git.iscommit(branchname, remote=True) else []
 
-        logging.info(f'Exact match required: {commits}')
+        logging.info('Exact match required: %s', commits)
     elif git.iscommit(branchname, remote=True):
         commits = [branchname]
 
-        logging.info(f'Exact match found for {branchname}')
+        logging.info('Exact match found for %s', branchname)
     else:
         commits = git.matching_branch(branchname)
 
@@ -158,7 +164,7 @@ def checkout_matching_branch(args, branchname):
                             colour.write(f'ERROR: Most recent commit on {commit} is {author} - Use the --force option to force-update your own branch!')
                             sys.exit(1)
 
-                    colour.write('Removing existing [BLUE:%s] branch' % commit)
+                    colour.write('Removing existing [BLUE:{commit}] branch')
                     git.delete_branch(commit, force=True)
             else:
                 colour.write(f'No corresponding remote branch [BLUE:{remote_branch}] exists')
@@ -180,7 +186,7 @@ def checkout_matching_branch(args, branchname):
                 print(text)
 
     elif not commits:
-        colour.write('[BOLD]No branches or commits matching [NORMAL][BLUE]%s[NORMAL]' % branchname)
+        colour.write(f'[BOLD]No branches or commits matching [NORMAL][BLUE]{branchname}[NORMAL]')
     else:
         colour.write('[BOLD]Multiple matches for [NORMAL][BLUE]%s[NORMAL]: %s' % (branchname, ', '.join(commits)))
 
@@ -192,14 +198,10 @@ def main():
 
     args = parse_arguments()
 
-    try:
-        if args.branch:
-            git.checkout(args.branchname[0], create=True)
-        else:
-            checkout_matching_branch(args, args.branchname[0])
-
-    except git.GitError as exc:
-        colour.error(exc.msg, exc.status)
+    if args.branch:
+        git.checkout(args.branchname[0], create=True)
+    else:
+        checkout_matching_branch(args, args.branchname[0])
 
 ################################################################################
 
@@ -213,6 +215,8 @@ def git_co():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_common.py

@@ -6,10 +6,12 @@ Report the oldest commit in common in the history of two commits
 
 ################################################################################
 
+import os
 import sys
 import argparse
 
 import thingy.colour as colour
+# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################
@@ -21,6 +23,8 @@ def main():
 
     parser.add_argument('--short', '-s', action='store_true', help='Just output the ancestor commit ID')
     parser.add_argument('--long', '-l', action='store_true', help='Output the log entry for the commit')
+    parser.add_argument('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
     parser.add_argument('commit1', nargs='?', default='HEAD', help='First commit (default=HEAD)')
     parser.add_argument('commit2', nargs='?', default='master', help='Second commit (default=master)')
 
@@ -29,10 +33,12 @@ def main():
     if args.long and args.short:
         colour.error('The [BLUE:--long] and [BLUE:--short] options cannot be used together', prefix=True)
 
-    try:
-        ancestor = git.find_common_ancestor(args.commit1, args.commit2)
-    except git.GitError as exc:
-        colour.error(exc, status=exc.status, prefix=True)
+    # Change directory, if specified
+
+    if args.path:
+        os.chdir(args.path[0])
+
+    ancestor = git.find_common_ancestor(args.commit1, args.commit2)
 
     if args.short:
         print(ancestor)
@@ -54,6 +60,8 @@ def git_common():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_hold.py

@@ -2,11 +2,13 @@
 """Archive one or more branches by tagging the branch then deleting it
    The branch tag is 'archive/BRANCH_NAME'"""
 
+import os
 import sys
 import argparse
 import fnmatch
 
 import thingy.colour as colour
+# TODO: Update to git2
 import thingy.git as git
 
 ################################################################################
@@ -59,7 +61,7 @@ def archive_branches(branches):
     for branch in branches:
         tag_name = archive_tag_name(branch)
 
-        git.set_tag(tag_name, branch)
+        git.tag_apply(tag_name, branch)
         git.delete_branch(branch, force=True)
 
     for remote in git.remotes():
@@ -105,7 +107,7 @@ def restore_archive_branches(branches):
         archive_tag_names.append(archive_tag)
 
         git.checkout(branch, commit=archive_tag)
-        git.delete_tag(archive_tag)
+        git.tag_delete(archive_tag)
 
     for remote in git.remotes():
         git.push(repository=remote, delete=True, refspec=archive_tag_names)
@@ -118,6 +120,8 @@ def main():
     parser = argparse.ArgumentParser(description='Archive, list or recover one or more Git branches')
     parser.add_argument('--list', '-l', action='store_true', help='List archived branches')
     parser.add_argument('--restore', '-r', action='store_true', help='Restore archived branches')
+    parser.add_argument('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
     parser.add_argument('branches', nargs='*', help='Branches')
 
     args = parser.parse_args()
@@ -128,6 +132,9 @@ def main():
     if not args.branches and not args.list:
         colour.error('No branches specified', prefix=True)
 
+    if args.path:
+        os.chdir(args.path[0])
+
     if args.list:
         list_archive_branches(args.branches)
     elif args.restore:
@@ -147,6 +154,8 @@ def git_hold():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_mr.py

@@ -4,10 +4,12 @@
 """ Push to Gitlab and create a merge request at the same time """
 ################################################################################
 
+import os
 import logging
 import sys
 import argparse
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 
@@ -27,6 +29,8 @@ def parse_arguments():
     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).')
+    parser.add_argument('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
 
     args = parser.parse_args()
 
@@ -35,6 +39,11 @@ def parse_arguments():
     if args.debug:
         logging.basicConfig(level=logging.INFO)
 
+    # Change directory, if specified
+
+    if args.path:
+        os.chdir(args.path[0])
+
     return args
 
 ################################################################################
@@ -86,6 +95,8 @@ def git_mr():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_parent.py

@@ -7,9 +7,11 @@ the same commit. Can optionally ignore feature branches and/or report
 the distance to the potential parent.
 """
 
+import os
 import argparse
 import sys
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 
@@ -23,33 +25,34 @@ def main():
     parser = argparse.ArgumentParser(description='Attempt to determine the parent branch for the specified branch (defaulting to the current one)')
     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('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
     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()
 
-    try:
-        if args.all:
-            any_parents, any_distance = git.parents(args.branch)
-        else:
-            any_parents = []
+    if args.path:
+        os.chdir(args.path[0])
 
-        parents, distance = git.parents(args.branch, ignore='feature/*')
+    if args.all:
+        any_parents, any_distance = git.parents(args.branch)
+    else:
+        any_parents = []
 
-        # If we have feature and non-feature branch candidates, decide which to report
-        # (one or both) based on distance.
+    parents, distance = git.parents(args.branch, ignore='feature/*')
 
-        if parents and any_parents:
-            if any_distance < distance:
-                parents = any_parents
-                distance = any_distance
-            elif any_distance == distance:
-                for more in any_parents:
-                    if more not in parents:
-                        parents.append(more)
+    # If we have feature and non-feature branch candidates, decide which to report
+    # (one or both) based on distance.
 
-    except git.GitError as exc:
-        colour.error(exc.msg, status=exc.status, prefix=True)
+    if parents and any_parents:
+        if any_distance < distance:
+            parents = any_parents
+            distance = any_distance
+        elif any_distance == distance:
+            for more in any_parents:
+                if more not in parents:
+                    parents.append(more)
 
     if parents:
         if args.verbose:
@@ -73,6 +76,8 @@ def git_parent():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_retag.py

@@ -9,10 +9,12 @@
 """
 ################################################################################
 
+import os
 import sys
 import argparse
 
 import thingy.git2 as git
+import thingy.colour as colour
 
 ################################################################################
 
@@ -23,10 +25,17 @@ def main():
 
     parser = argparse.ArgumentParser(description='Apply or update a tag, optionally updating it on the remote as well.')
     parser.add_argument('--push', '-p', action='store_true', help='Push the tag to the remote')
+    parser.add_argument('--path', '-C', nargs=1, type=str, default=None,
+                        help='Run the command in the specified directory')
     parser.add_argument('tag', nargs=1, help='The tag')
 
     args = parser.parse_args()
 
+    # Change directory, if specified
+
+    if args.path:
+        os.chdir(args.path[0])
+
     tag = args.tag[0]
 
     # Delete the tag if it currently exists, optionally pushing the deletion
@@ -36,7 +45,7 @@ def main():
 
     # Apply the tag
 
-    git.tag_apply(tag, push=args.push)
+    git.tag_apply(tag, 'HEAD', push=args.push)
 
 ################################################################################
 
@@ -49,6 +58,8 @@ def git_retag():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/git_review.py

@@ -54,6 +54,7 @@ import subprocess
 import time
 from enum import IntEnum
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.dc_curses as dc_curses
 import thingy.colour as colour

skilleter_thingy/git_update.py

@@ -27,6 +27,7 @@ import argparse
 import fnmatch
 import logging
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

skilleter_thingy/git_wt.py

@@ -15,6 +15,7 @@ import argparse
 import os
 
 import thingy.git2 as git
+import thingy.colour as colour
 
 ################################################################################
 
@@ -62,6 +63,8 @@ def git_wt():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
+    except git.GitError as exc:
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

skilleter_thingy/gitprompt.py

@@ -49,6 +49,7 @@ import os
 import sys
 import argparse
 
+# TODO: Update to git2
 import thingy.git as git
 import thingy.colour as colour
 

skilleter_thingy/thingy/git.py

@@ -34,7 +34,11 @@ import thingy.gitlab as gitlab
 ################################################################################
 # Configuration files to access
 
-(LOCAL, GLOBAL, SYSTEM) = list(range(3))
+(WORKTREE, LOCAL, GLOBAL, SYSTEM) = list(range(4))
+
+# Default default branches (can be overridden in .gitconfig via skilleter-thingy.defaultBranches
+
+DEFAULT_DEFAULT_BRANCHES = 'develop,main,master'
 
 ################################################################################
 
@@ -165,14 +169,14 @@ def tags():
 
 ################################################################################
 
-def set_tag(tag, commit):
+def tag_apply(tag, commit):
     """ Apply a tag to a commit """
 
     return git(['tag', tag, commit])
 
 ################################################################################
 
-def delete_tag(tag):
+def tag_delete(tag):
     """ Delete a tag """
 
     return git(['tag', '--delete', tag])
@@ -814,7 +818,7 @@ def reset(sha1):
 
 ################################################################################
 
-def config_get(section, key, source=LOCAL, defaultvalue=None):
+def config_get(section, key, source=None, defaultvalue=None):
     """ Return the specified configuration entry
         Returns a default value if no matching configuration entry exists """
 
@@ -824,6 +828,10 @@ def config_get(section, key, source=LOCAL, defaultvalue=None):
         cmd.append('--global')
     elif source == SYSTEM:
         cmd.append('--system')
+    elif source == LOCAL:
+        cmd.append('--local')
+    elif source == WORKTREE:
+        cmd.append('--worktree')
 
     cmd += ['--get', f'{section}.{key}']
 
@@ -834,7 +842,7 @@ def config_get(section, key, source=LOCAL, defaultvalue=None):
 
 ################################################################################
 
-def config_set(section, key, value, source=LOCAL):
+def config_set(section, key, value, source=None):
     """ Set a configuration entry """
 
     cmd = ['config']
@@ -843,6 +851,10 @@ def config_set(section, key, value, source=LOCAL):
         cmd.append('--global')
     elif source == SYSTEM:
         cmd.append('--system')
+    elif source == LOCAL:
+        cmd.append('--local')
+    elif source == WORKTREE:
+        cmd.append('--worktree')
 
     cmd += ['--replace-all', f'{section}.{key}', value]
 
@@ -1172,12 +1184,13 @@ def default_branch():
                     return None
 
     git_branches = branches()
+    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES).split(',')
 
-    for branch in ('develop', 'main', 'master'):
+    for branch in default_branches:
         if branch in git_branches:
             return branch
 
-    return None
+    raise GitError('Unable to determine default branch in the repo')
 
 ################################################################################
 

skilleter_thingy/thingy/git2.py

@@ -36,13 +36,17 @@ import thingy.gitlab as gitlab
 ################################################################################
 # Configuration files to access
 
-(LOCAL, GLOBAL, SYSTEM) = list(range(3))
+(WORKTREE, LOCAL, GLOBAL, SYSTEM) = list(range(4))
 
 # 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']
 
+# Default default branches (can be overridden in .gitconfig via skilleter-thingy.defaultBranches
+
+DEFAULT_DEFAULT_BRANCHES = 'develop,main,master'
+
 ################################################################################
 
 class GitError(run.RunError):
@@ -74,7 +78,7 @@ def git(cmd, stdout=None, stderr=None, path=None):
     try:
         return run.run(git_cmd, stdout=stdout, stderr=stderr)
     except run.RunError as exc:
-        raise GitError(exc.msg, exc.status)
+        raise GitError(exc.msg, exc.status) from exc
 
 ################################################################################
 
@@ -103,7 +107,7 @@ def git_run_status(cmd, stdout=None, stderr=None, path=None, redirect=True):
                                 errors='ignore',
                                 universal_newlines=True)
     else:
-        result = subprocess.run(git_cmd)
+        result = subprocess.run(git_cmd, check=False)
 
     return (result.stdout or result.stderr), result.returncode
 
@@ -225,10 +229,15 @@ def tag_delete(tag, push=False, path=None):
 
 ################################################################################
 
-def tag_apply(tag, push=False, path=None):
+def tag_apply(tag, commit=None, push=False, path=None):
     """Apply a tag, optionally pushing it"""
 
-    git(['tag', tag], path=path)
+    cmd = ['tag', tag]
+
+    if commit:
+        cmd.append(commit)
+
+    git(cmd, path=path)
 
     if push:
         git(['push', 'origin', tag], path=path)
@@ -264,7 +273,7 @@ def pull(repo=None, all=False, path=None):
 
 ################################################################################
 
-def checkout(branch, create=False, path=None):
+def checkout(branch, create=False, commit=None, path=None):
     """ Checkout a branch (optionally creating it) """
 
     cmd = ['checkout']
@@ -274,6 +283,9 @@ def checkout(branch, create=False, path=None):
 
     cmd.append(branch)
 
+    if commit:
+        cmd.append(commit)
+
     return git(cmd, path=path)
 
 ################################################################################
@@ -775,7 +787,7 @@ def reset(sha1, path=None):
 
 ################################################################################
 
-def config_get(section, key, source=LOCAL, defaultvalue=None, path=None):
+def config_get(section, key, source=None, defaultvalue=None, path=None):
     """ Return the specified configuration entry
         Returns a default value if no matching configuration entry exists """
 
@@ -785,6 +797,10 @@ def config_get(section, key, source=LOCAL, defaultvalue=None, path=None):
         cmd.append('--global')
     elif source == SYSTEM:
         cmd.append('--system')
+    elif source == LOCAL:
+        cmd.append('--local')
+    elif source == WORKTREE:
+        cmd.append('--worktree')
 
     cmd += ['--get', f'{section}.{key}']
 
@@ -795,7 +811,7 @@ def config_get(section, key, source=LOCAL, defaultvalue=None, path=None):
 
 ################################################################################
 
-def config_set(section, key, value, source=LOCAL, path=None):
+def config_set(section, key, value, source=None, path=None):
     """ Set a configuration entry """
 
     cmd = ['config']
@@ -804,6 +820,10 @@ def config_set(section, key, value, source=LOCAL, path=None):
         cmd.append('--global')
     elif source == SYSTEM:
         cmd.append('--system')
+    elif source == LOCAL:
+        cmd.append('--local')
+    elif source == WORKTREE:
+        cmd.append('--worktree')
 
     cmd += ['--replace-all', f'{section}.{key}', value]
 
@@ -1130,12 +1150,13 @@ def default_branch(path=None):
                     return None
 
     git_branches = branches(path=path)
+    default_branches = config_get('skilleter-thingy', 'defaultBranches', defaultvalue=DEFAULT_DEFAULT_BRANCHES).split(',')
 
-    for branch in ('develop', 'main', 'master'):
+    for branch in default_branches:
         if branch in git_branches:
             return branch
 
-    return None
+    raise GitError('Unable to determine default branch in the repo')
 
 ################################################################################
 

skilleter_thingy/thingy/run.py

@@ -23,7 +23,6 @@ import subprocess
 import threading
 import shlex
 
-import thingy.colour as colour
 import thingy.tidy as tidy
 
 ################################################################################

{skilleter_thingy-0.2.3.dist-info → skilleter_thingy-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.3
+Version: 0.2.6
 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

{skilleter_thingy-0.2.3.dist-info → skilleter_thingy-0.2.6.dist-info}/RECORD

@@ -3,23 +3,22 @@ skilleter_thingy/addpath.py,sha256=4Yhhgjjz1XDI98j0dAiQpNA2ejLefeWUTeSg3nIXQq0,3
 skilleter_thingy/console_colours.py,sha256=BOS9mo3jChx_FE8L1j488MDoVNgib11KjTRhrz_YRYE,1781
 skilleter_thingy/docker_purge.py,sha256=PRQ7EBXymjYIHuJL4pk4r6KNn09IF28OGZ0ln57xtNg,3314
 skilleter_thingy/ffind.py,sha256=rEgotUaMj9JxDCwz-7H5vdqxH_bXllaHqttwsOUGKj8,19235
-skilleter_thingy/ggit.py,sha256=BL-DhNcz4Nd3sA-3Kl6gZ-zFtbNqOpyufvas-0aD8nk,2465
-skilleter_thingy/ggrep.py,sha256=fnTzOI1Qbf7IY_TnStdx5uqeUhqSDkapxmhYgrONJHw,5887
-skilleter_thingy/git_br.py,sha256=ZEYACvgH8QgPmCzTWLwAkJ1JBNwIQmG1phv8g9FNnSc,5796
-skilleter_thingy/git_ca.py,sha256=ajPpmVsOsvBfMnf2P_8irUAa5N4a3cFQgLjN-by5LSg,4932
-skilleter_thingy/git_cleanup.py,sha256=8PAxf3ZeKYYAuiBZNHQrKd_PlYYs9_-OwrIWFCC8_xg,10201
-skilleter_thingy/git_co.py,sha256=0i8bOHJIA4zhyy_KWVWh8HbbEuQCKUAxASGZOdr_SYY,8205
-skilleter_thingy/git_common.py,sha256=KCM5HcPEvOonClKfkY9vRcBFbHicRh7L17ysrGrQ5CI,1874
-skilleter_thingy/git_hold.py,sha256=EkIHzubG7BsR-Vv-UCj8rl-9Hx7ft31t7IEf1nGW6WE,4616
-skilleter_thingy/git_mr.py,sha256=g33FaRtJTbIQI0tfXv_a042YpGwtbg5fKw072aqjAdw,3086
-skilleter_thingy/git_parent.py,sha256=s0HYTuVlEHLQCI9ZQ6EcR_9rSU9Ps3U2oSUABLX-YQI,2800
-skilleter_thingy/git_retag.py,sha256=_e-oODX4mMV5o3OXSBlSYeqCCx-S4EWHEmu6Az8ABgY,1450
-skilleter_thingy/git_retag.sync-conflict-20250928-192600-TVSLRWK.py,sha256=70rbybb1M2sCUblmD2-iLVG0xdFq-Bl5HG0U1LRnAvs,1442
-skilleter_thingy/git_review.py,sha256=Z_e0wyQJ2AzOSy5cPI3jmAWystpJbHH4ygENjFagepo,52576
-skilleter_thingy/git_update.py,sha256=Z3p3E33ZJ2DVa107UzaFR9V8LXADRuHjJL8TX3IhEa4,14348
-skilleter_thingy/git_wt.py,sha256=93mbh8AKej8_y3aL6mVxKjKLEqMczaDtHoYcWf70eU0,2231
+skilleter_thingy/ggit.py,sha256=rUa7rGxdw5ZcBN2u2tJw_beTI6tg0wBNsdPIyVajd6A,2488
+skilleter_thingy/ggrep.py,sha256=GMBWmRnAxqjFri3F_X6LqX04Q0VuwDB5nzO8D_tsrfw,5910
+skilleter_thingy/git_br.py,sha256=97wtkPx9sgBGR34Z62I2qYCg9iz_Fz-ndvOe3TqjC20,6027
+skilleter_thingy/git_ca.py,sha256=6nC5MxkBVC1fr2SHEc1XH0BO3vUWHaxV5gjCVBgPoWY,5191
+skilleter_thingy/git_cleanup.py,sha256=O8t6HiIjMmG4oz4LsvYdHaq1xsgCjICTWAcec-wBdTM,10564
+skilleter_thingy/git_co.py,sha256=Mc-6jEUpVWAJJ-2PTpQ4tjDw03_zJMJDX9SGIxCqzJQ,8404
+skilleter_thingy/git_common.py,sha256=W9vN03x3_0--8b5jUslpgglltQsLjzrEu7ik1x4LbFs,2134
+skilleter_thingy/git_hold.py,sha256=L9qY19NgDg-B6vaGtI4Z4d6WD6BZ3bcNW4NxcRs8P78,4943
+skilleter_thingy/git_mr.py,sha256=IpzKhhtrPGle7P8x55WBlz3AGfo6XikMORbt9HPh8UU,3449
+skilleter_thingy/git_parent.py,sha256=xnA634w_4bzdBkl3ltYfrJJ69DH46FU1F4INJdBNNVc,2961
+skilleter_thingy/git_retag.py,sha256=rGLtBwHdYRpHK-qAmSMCxB8nIeisPBwdxXnP-Zf8HI8,1829
+skilleter_thingy/git_review.py,sha256=F2R-DS3IpQX7wUQpS0G19mdy4gOX1lXa2A9-R-Yn1ck,52599
+skilleter_thingy/git_update.py,sha256=W4e5mqzgLPwcb0Hh5CT5oZYO6KiCTcaf8_tiqVezC_g,14371
+skilleter_thingy/git_wt.py,sha256=8SN-rnzKbbOQ-Rx3Cgr-EyIueR4k4YGDd47QjM0fL1M,2356
 skilleter_thingy/gitcmp_helper.py,sha256=NgQ0BZfa4TVA-XV6YKvrm5147boWUpGw-jDPUsktiMg,11346
-skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
+skilleter_thingy/gitprompt.py,sha256=UNmhmvB_O-WstrVUmdV_kB8afsG3nwqX-VTuup5ADpg,8935
 skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
 skilleter_thingy/multigit.py,sha256=rnQ0YGkEy6H54PRt8nCt-G02LGy-wiKRJVk8ovR_pTw,35179
@@ -43,20 +42,19 @@ skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUs
 skilleter_thingy/thingy/dircolors.py,sha256=aBcq9ci855GSOIjrZWm8kG0ksCodvUmc4FlIOEOyBcA,12292
 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=d7pVv9M6k_xay3DU8-F1UxMWrN2xs1PWc7UOVvCM7Ys,39146
-skilleter_thingy/thingy/git2.py,sha256=jIQqr0Ds2dz0zLCxBeasv_A6Ry1mGJYyEezJjAHWHXg,39028
+skilleter_thingy/thingy/git.py,sha256=yJRfPG08AyPtpcWiywp1--z5IXp22JAiu_LsR6wdtME,39703
+skilleter_thingy/thingy/git2.py,sha256=V6LUHrJXj70zUl4oYSv40Bs7A4eOgMoxdETT13vqeD0,39732
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=hNfA9yh4jCv2su8XK33udcTWwgf98noBdYRRkFX1mxc,2517
 skilleter_thingy/thingy/process.py,sha256=WJLg3js1zdgI7Nlkt7e5ICltkjXcA9P1f-LWPSZCdWs,3570
-skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1Uo,12611
+skilleter_thingy/thingy/run.py,sha256=2fmiAxb2xjx5__sLiVP81BJlR37ghO-2KxiKCWWzyZA,12580
 skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
 skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.2.3.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.3.dist-info/METADATA,sha256=nHx-ihEZhMQJLSWOSoWPzebuTnNWMe-euOyqJ3R5x6g,28913
-skilleter_thingy-0.2.3.dist-info/PKG-INFO 2,sha256=BryF-1KGwXobPiiN60EmDKuqAtIBSPadlgmJ72xZhMk,5313
-skilleter_thingy-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.3.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.3.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.3.dist-info/RECORD,,
+skilleter_thingy-0.2.6.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.2.6.dist-info/METADATA,sha256=o8kyfCtR801HU6Y9Rk02L7ArI5YRWN2iKIXprcnrDRA,28913
+skilleter_thingy-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.2.6.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
+skilleter_thingy-0.2.6.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.2.6.dist-info/RECORD,,

skilleter_thingy/git_retag.sync-conflict-20250928-192600-TVSLRWK.py

@@ -1,54 +0,0 @@
-#! /usr/bin/env python3
-
-################################################################################
-""" Apply or update a tag, optionally updating it on the remote as well.
-
-    Copyright (C) 2025 John Skilleter
-
-    Licence: GPL v3 or later
-"""
-################################################################################
-
-import sys
-import argparse
-
-import thingy.git2 as git
-
-################################################################################
-
-def main():
-    """ Main function """
-
-    # Command line parameters
-
-    parser = argparse.ArgumentParser(description='Apply or update a tag, optionally updating it on the remote as well.')
-    parser.add_argument('--push', '-p', action='store_true', help='Push the tag to the remote')
-    parser.add_argument('tag', nargs=1, help='The tag')
-
-    args = parser.parse_args()
-
-    # Delete the tag if it currently exists, optionally pushing the deletion
-
-    if args.tag in git.tags():
-        git.tag_delete(args.tag, push=args.push)
-
-    # Apply the tag
-
-    git.tag_apply(args.tag, push=args.push)
-
-################################################################################
-
-def git_retag():
-    """Entry point"""
-
-    try:
-        main()
-    except KeyboardInterrupt:
-        sys.exit(1)
-    except BrokenPipeError:
-        sys.exit(2)
-
-################################################################################
-
-if __name__ == '__main__':
-    git_retag()

skilleter_thingy-0.2.3.dist-info/PKG-INFO 2

@@ -1,193 +0,0 @@
-Metadata-Version: 2.1
-Name: skilleter_thingy
-Version: 0.0.49
-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
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: imagehash
-Requires-Dist: inotify
-Requires-Dist: pillow
-Requires-Dist: psutil
-Requires-Dist: pyaml
-Requires-Dist: pygit2
-Requires-Dist: python-dateutil
-Requires-Dist: requests
-
-# Thingy
-
-Licence: GPL v3
-
-Author: John Skilleter v0.99
-
-Collection of shell utilities and configuration stuff for Linux and MacOS. Untested on other operating systems.
-
-Permanently (for the forseeable future!) in a beta stage - usable, with a few rough edges, and probably with bugs when used in way I'm not expecting!
-
-The following commands are documented in detail in the help output that can be displayed by running the command with the '--help' option.
-
-This README just contains a summary of the functionality of each command.
-
-# 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.
-
-## 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.
-
-## docker-purge
-
-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.
-
-## 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
-
-## readable
-
-Pipe for converting colour combinations to make them readable on a light background
-
-## remdir
-
-Recursively delete empty directories
-
-## rmdupe
-
-Search for duplicate files
-
-## rpylint
-
-Run pylint on all the Python source files in the current tree
-
-## s3-sync
-
-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.
-
-## tfparse
-
-Read JSON Terraform output and convert back to human-readable text
-This allows multiple errors and warnings to be reported as there's
-no way of doing this directly from Terraform
-
-## trimpath
-
-Intelligently trim a path to fit a given width (used by gitprompt)
-
-## window-rename
-
-## 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.
-
-## yamlcheck
-
-YAML validator - checks that a file is valid YAML (use yamllint to verify that it is nicely-formatted YAML).
-
-# 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
-
-## git mr
-
-## git parent
-
-## 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
-
-## venv-create
-
-Create a script to create/update a virtual environment and run a python script in it.