skilleter-thingy 0.1.29__tar.gz → 0.1.31__tar.gz

{skilleter_thingy-0.1.29 → skilleter_thingy-0.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.29
+Version: 0.1.31
 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.1.29 → skilleter_thingy-0.1.31}/pyproject.toml

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

{skilleter_thingy-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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
 
 ################################################################################
@@ -198,9 +204,6 @@ def main():
         else:
             checkout_matching_branch(args, args.branchname[0])
 
-    except git.GitError as exc:
-        colour.error(exc.msg, exc.status)
-
 ################################################################################
 
 def git_co():
@@ -213,6 +216,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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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
 
 ################################################################################
@@ -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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/skilleter_thingy/git_retag.py

@@ -9,6 +9,7 @@
 """
 ################################################################################
 
+import os
 import sys
 import argparse
 
@@ -23,10 +24,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
@@ -49,6 +57,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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/skilleter_thingy/git_wt.py

@@ -62,6 +62,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-0.1.29 → skilleter_thingy-0.1.31}/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-0.1.29 → skilleter_thingy-0.1.31}/skilleter_thingy/localphotosync.py

@@ -14,6 +14,7 @@ import sys
 import logging
 import argparse
 import re
+import datetime
 
 from enum import Enum
 
@@ -126,15 +127,24 @@ def media_sync(args):
             continue
 
         date_match = filetype_re.fullmatch(os.path.basename(sourcefile))
-        if not date_match:
-            logging.debug('Ignoring %s - unable to extract date from filename', sourcefile)
-            continue
+        if date_match:
+            year = date_match.group(2)
+            month = date_match.group(3)
+            day = date_match.group(4)
+            
+            default_dest_dir = f'{dest_dir}/{year}/{year}-{month}-{day}'
+        else:
+            logging.debug('Ignoring %s - unable to extract date from filename - using last-modified date', sourcefile)
+            
+            timestamp = os.path.getmtime(sourcefile)
+            last_modified_date = datetime.datetime.fromtimestamp(timestamp)
+            
+            year = last_modified_date.year
+            month = last_modified_date.month
+            day = last_modified_date.day
 
-        year = date_match.group(2)
-        month = date_match.group(3)
-        day = date_match.group(4)
+            default_dest_dir = f'{dest_dir}/{year:04}/{year:04}-{month:02}-{day:02}'
 
-        default_dest_dir = f'{dest_dir}/{year}/{year}-{month}-{day}'
         dest_dir_pattern = f'{default_dest_dir}*'
 
         dest_dirs = [path for path in glob.glob(dest_dir_pattern) if os.path.isdir(path)]

{skilleter_thingy-0.1.29 → skilleter_thingy-0.1.31}/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'
 
 ################################################################################
 
@@ -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-0.1.29 → skilleter_thingy-0.1.31}/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
 
@@ -775,7 +779,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 +789,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 +803,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 +812,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 +1142,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-0.1.29 → skilleter_thingy-0.1.31}/skilleter_thingy.egg-info/PKG-INFO

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