skilleter-thingy 0.2.13__tar.gz → 0.2.15__tar.gz

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/PKG-INFO

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

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

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/ffind.py

@@ -26,11 +26,10 @@ import pwd
 import datetime
 import re
 import shlex
-import copy
 import logging
+import subprocess
 
 from thingy import git
-from thingy import run
 from thingy import dircolors
 from thingy import colour
 
@@ -39,7 +38,7 @@ from thingy import colour
 def error(msg, status=1):
     """ Report an error message and exit """
 
-    sys.stderr.write('%s\n' % msg)
+    sys.stderr.write(f'{msg}\n')
     sys.exit(status)
 
 ################################################################################
@@ -48,7 +47,7 @@ def report_exception(exc):
     """ Handle an exception triggered inside os.walk - currently just reports
         the exception - typically a permission error. """
 
-    sys.stderr.write('%s\n' % exc)
+    sys.stderr.write(f'{exc}\n')
 
 ################################################################################
 
@@ -68,17 +67,18 @@ def report_file(args, filepath, filestat, dircolour):
     if args.exec:
         # Copy the exec string and insert the file
 
-        cmd = copy.copy(args.exec)
-        cmd[cmd.index('^')] = filepath
+        cmd = []
+        for i in args.exec:
+            cmd.append(i.replace('^', filepath))
 
         logging.debug('Running "%s"', ' '.join(cmd))
 
         # Attempt to run the command
 
         try:
-            run.run(cmd, stdout=sys.stdout, stderr=sys.stderr)
-        except run.RunError as exc:
-            error(exc.msg)
+            subprocess.run(cmd, check=True)
+        except subprocess.CalledProcessError as exc:
+            error('%s failed with status=%d' % (' '.join(cmd), exc.returncode))
         except FileNotFoundError:
             error('File not found attempting to run "%s"' % ' '.join(cmd))
         except PermissionError:
@@ -86,7 +86,7 @@ def report_file(args, filepath, filestat, dircolour):
 
     if args.verbose or not args.exec:
         if args.zero:
-            sys.stdout.write('%s\0' % filepath)
+            sys.stdout.write(f'{filepath}\0')
         else:
             # Colourise output if required
 
@@ -96,7 +96,7 @@ def report_file(args, filepath, filestat, dircolour):
             # Quote the file if necessary
 
             if not args.unquoted and ' ' in filepath:
-                filepath = '"%s"' % filepath
+                filepath = f'"{filepath}"'
 
             # Output full details or just the filename
 
@@ -186,7 +186,7 @@ def grep_match(regex, filename):
 
     recomp = re.compile(regex)
 
-    with open(filename, 'r', errors='ignore') as infile:
+    with open(filename, 'r', errors='ignore', encoding='utf8') as infile:
         for text in infile:
             if recomp.search(text):
                 break
@@ -299,7 +299,7 @@ def validate_arguments(args):
     if args.type:
         for t in args.type:
             if t not in ['b', 'c', 'd', 'p', 'f', 'l', 's']:
-                error('Invalid type "%s"' % t)
+                error(f'Invalid type "{t}"')
 
     # Precompile regexes if using them
 
@@ -392,14 +392,15 @@ def validate_arguments(args):
     # marker if it isn't there.
 
     if args.exec:
-        if args.exec.count('^') > 1:
+        replacements = args.exec.count('^')
+
+        if replacements > 1:
             error('Too many "^" characters in the exec string')
+        elif not replacements:
+            args.exec = f'{args.exec} ^'
 
         args.exec = shlex.split(args.exec)
 
-        if '^' not in args.exec:
-            args.exec.append('^')
-
     # If the path option has been used, try to switch to the specified directory
 
     if args.path:
@@ -501,9 +502,11 @@ def main():
                     diff_cmd.append(file)
 
             try:
-                run.run(diff_cmd)
-            except Exception as exc:
-                error(exc)
+                subprocess.run(diff_cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+            except subprocess.CalledProcessError as exc:
+                error(f'Diff failed with status={exc.returncode}')
+            except FileNotFoundError:
+                error('Unable to run %s' % ' '.join(diff_cmd))
 
     # Report the number of objects found
 

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/git_cleanup.py

@@ -105,7 +105,7 @@ def main():
     # Get the list of all local branches
 
     try:
-        all_branches = [branch for branch in git.branches()]
+        all_branches = git.branches()
     except git.GitError as exc:
         colour.error(exc.msg, status=exc.status)
 

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/git_review.py

@@ -47,7 +47,6 @@ import sys
 import argparse
 import curses
 import curses.panel
-import curses.textpad
 import pickle
 import fnmatch
 import subprocess
@@ -200,7 +199,7 @@ class PopUp():
                 else:
                     break
 
-    def __exit__(self, exc_type, exc_value, exc_traceback):
+    def __exit__(self, _exc_type, _exc_value, _exc_traceback):
         """ Remove the popup """
 
         if self.panel:

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/git_update.py

@@ -18,6 +18,9 @@
 
    TODO: Avoid lots of pulls - should be able to fetch then updated each local branch.
    TODO: Add option to specify name of master branch or additional names to add to the list
+   TODO: Config entry for regularly-ignored branches
+   TODO: Config entry for branches that shouldn't be rebased (main, master, release/*)
+   TODO: Command line option when using -a to skip working trees that are modified
 """
 ################################################################################
 

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/gitcmp_helper.py

@@ -43,9 +43,9 @@ import argparse
 import filecmp
 import re
 import logging
+import subprocess
 
 from thingy import colour
-from thingy import run
 from thingy import files
 from thingy import git
 from thingy import dircolors
@@ -81,7 +81,7 @@ def report_permissions(perm):
         permtext.append(mask_char if permissions & mask else '-')
         mask >>= 1
 
-    return '%s' % ''.join(permtext)
+    return ''.join(permtext)
 
 ################################################################################
 
@@ -146,7 +146,7 @@ def main():
     # Check and handle for the simple case of an unmerged file
 
     if args.old_file is None:
-        colour.write('[CYAN:%s] is not merged' % args.file_path)
+        colour.write(f'[CYAN:{args.file_path}] is not merged')
         sys.exit(0)
 
     # Make sure that we have all the expected parameters
@@ -158,11 +158,11 @@ def main():
     # Make sure we can access the temporary files supplied
 
     if not os.access(args.old_file, os.R_OK):
-        sys.stderr.write('Unable to read temporary old file: %s\n' % args.old_file)
+        sys.stderr.write(f'Unable to read temporary old file: {args.old_file}\n')
         sys.exit(2)
 
     if not os.access(args.new_file, os.R_OK):
-        sys.stderr.write('Unable to read temporary new file: %s\n' % args.new_file)
+        sys.stderr.write(f'Unable to read temporary new file: {args.new_file}\n')
         sys.exit(2)
 
     dc = dircolors.Dircolors()
@@ -195,12 +195,12 @@ def main():
     # If processing more than one file, append he index and total number of files
 
     if path_total > 0:
-        heading.append('(%d/%d)' % (path_count, path_total))
+        heading.append(f'({path_count}/{path_total})')
 
     # Check for newly created/deleted files (other version will be '/dev/null')
 
-    created_file = (args.old_file == '/dev/null')
-    deleted_file = (args.new_file == '/dev/null')
+    created_file = args.old_file == '/dev/null'
+    deleted_file = args.new_file == '/dev/null'
 
     if created_file:
         heading.append('(new file)')
@@ -232,11 +232,11 @@ def main():
     formatted_new_size = files.format_size(new_size, always_suffix=True)
 
     if created_file:
-        colour.write('    New size:             [CYAN:%s]' % formatted_new_size)
+        colour.write(f'    New size:             [CYAN:{formatted_new_size}]')
     elif deleted_file:
-        colour.write('    Original size:        [CYAN:%s]' % formatted_old_size)
+        colour.write(f'    Original size:        [CYAN:{formatted_old_size}]')
     elif new_size == old_size:
-        colour.write('    Size:                 [CYAN]%s[NORMAL] (no change)' % formatted_new_size)
+        colour.write(f'    Size:                 [CYAN]{formatted_new_size}[NORMAL] (no change)')
     else:
         formatted_delta_size = files.format_size(abs(new_size - old_size), always_suffix=True)
 
@@ -297,9 +297,12 @@ def main():
 
             if not deleted_file or not skip_deleted:
                 try:
-                    run.run([difftool, args.old_file, args.new_file])
-                except run.RunError as exc:
-                    print('Diff failed: %s' % exc.msg)
+                    subprocess.run([difftool, args.old_file, args.new_file], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+                except subprocess.CalledProcessError as exc:
+                    print(f'WARNING: Diff failed - status = {exc.returncode}')
+                except FileNotFoundError:
+                    print(f'ERROR: Unable to locate diff tool {difftool}')
+                    sys.exit(1)
 
     # Separate reports with a blank line
 

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/rpylint.py

@@ -10,8 +10,11 @@ import os
 import sys
 import argparse
 import glob
+import subprocess
 
-import thingy.process as process
+################################################################################
+
+PYLINT = 'pylint'
 
 ################################################################################
 
@@ -32,26 +35,30 @@ def main():
 
     sourcefiles = []
 
-    # Use rgrep to find source files that have a Python 3 #!
+    # Use rgrep to find source files that have a Python 3 hashbang
 
     for entry in args.paths:
         if os.path.isdir(entry):
-            try:
-                sourcefiles += process.run(['rgrep', '-E', '--exclude-dir=.git', '-l', '#![[:space:]]*/usr/bin/(env[[:space:]])?python3'] + args.paths)
-            except process.RunError as exc:
-                if exc.status == 1:
-                    sys.stderr.write('No Python3 source files found\n')
-                    sys.exit(2)
-                else:
-                    sys.stderr.write('%d: %s\n' % (exc.status, exc.msg))
-                    sys.exit(1)
+            result = subprocess.run(['rgrep', '-E', '--exclude-dir=.git', '-l', '#![[:space:]]*/usr/bin/(env[[:space:]])?python3'] + args.paths,
+                                    capture_output=True, check=False, text=True)
+
+            if result.returncode == 1:
+                sys.stderr.write('No Python3 source files found\n')
+                sys.exit(2)
+
+            if result.returncode:
+                sys.stderr.write(f'ERROR #{result.returncode}: {result.stderr}')
+                sys.exit(1)
+
+            sourcefiles += result.stdout.split('\n')
+
         elif os.path.isfile(entry):
             sourcefiles.append(entry)
         else:
             files = glob.glob(entry)
 
             if not files:
-                sys.stderr.write('No files found matching "%s"' % entry)
+                sys.stderr.write(f'No files found matching "{entry}"')
                 sys.exit(2)
 
             sourcefiles += files
@@ -59,18 +66,19 @@ def main():
     # Run pylint on all the files
 
     try:
-        process.run(['pylint3', '--output-format', 'parseable'] + sourcefiles, foreground=True)
-    except process.RunError as exc:
-        status = exc.status
-    else:
-        status = 0
+        result = subprocess.run([PYLINT, '--output-format', 'parseable'] + sourcefiles, capture_output=False, check=False, text=True)
+
+    except FileNotFoundError:
+        sys.stderr.write(f'Unable to locate {PYLINT}\n')
+        sys.exit(1)
 
-    if status >= 64:
-        sys.stderr.write('Unexpected error: %d\n' % status)
+    if result.returncode >= 64:
+        sys.stderr.write(f'Unexpected error: {result.returncode}\n')
+        sys.exit(3)
 
     # Function return code is the status return from pylint
 
-    return status
+    return result.returncode
 
 ################################################################################
 

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/tfm.py

@@ -82,8 +82,6 @@ import os
 import sys
 import argparse
 import curses
-import curses.panel
-import curses.textpad
 import subprocess
 import shutil
 from collections import defaultdict

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/thingy/docker.py

@@ -12,7 +12,7 @@
 """
 ################################################################################
 
-import thingy.process as process
+import thingy.run as run
 
 ################################################################################
 
@@ -33,9 +33,9 @@ def instances(all=False):
 
     instances_list = []
     try:
-        for result in process.run(cmd):
+        for result in run.run(cmd):
             instances_list.append(result)
-    except process.RunError as exc:
+    except run.RunError as exc:
         raise DockerError(exc)
 
     return instances_list
@@ -48,8 +48,8 @@ def stop(instance, force=False):
     # TODO: force option not implemented
 
     try:
-        process.run(['docker', 'stop', instance], foreground=True)
-    except process.RunError as exc:
+        run.run(['docker', 'stop', instance], output=True)
+    except run.RunError as exc:
         raise DockerError(exc)
 
 ################################################################################
@@ -65,8 +65,8 @@ def rm(instance, force=False):
     cmd.append(instance)
 
     try:
-        process.run(cmd, foreground=True)
-    except process.RunError as exc:
+        run.run(cmd, output=True)
+    except run.RunError as exc:
         raise DockerError(exc)
 
 ################################################################################
@@ -75,9 +75,9 @@ def images():
     """ Return a list of all current Docker images """
 
     try:
-        for result in process.run(['docker', 'images', '-q']):
+        for result in run.run(['docker', 'images', '-q']):
             yield result
-    except process.RunError as exc:
+    except run.RunError as exc:
         raise DockerError(exc)
 
 ################################################################################
@@ -92,6 +92,6 @@ def rmi(image, force=False):
     cmd.append(image)
 
     try:
-        process.run(cmd, foreground=True)
-    except process.RunError as exc:
+        run.run(cmd, foreground=True)
+    except run.RunError as exc:
         raise DockerError(exc)

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/thingy/files.py

@@ -11,8 +11,7 @@
 
 import os
 import shutil
-
-import thingy.process as process
+import subprocess
 
 ################################################################################
 
@@ -31,7 +30,7 @@ def file_type(filename, mime=False):
     # is not a file, so we have to do that.
 
     if not os.path.isfile(filename) or not os.access(filename, os.R_OK):
-        raise IOError('Unable to access %s' % filename)
+        raise FileNotFoundError('Unable to access %s' % filename)
 
     cmd = ['file', '--brief']
 
@@ -40,8 +39,9 @@ def file_type(filename, mime=False):
 
     cmd.append(filename)
 
-    result = process.run(cmd)
-    return result[0] if result else ""
+    result = subprocess.run(cmd, capture_output=True, check=False, text=True)
+
+    return result.stdout.split('\n')[0] if result.returncode==0 else None
 
 ################################################################################
 
@@ -148,7 +148,7 @@ if __name__ == "__main__":
     for mimeflag in (False, True):
         print('/bin/sh is:             %s' % file_type('/bin/sh', mimeflag))
         print('/bin/dash is:           %s' % file_type('/bin/dash', mimeflag))
-        print('git-ca is:              %s' % file_type('git-ca', mimeflag))
+        print('multigit.py is:         %s' % file_type('multigit.py', mimeflag))
         print('')
 
     for sizevalue in (0, 1, 999, 1024, 1025, 1.3 * 1024, 2**32 - 1, 2**64 + 2**49):

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/thingy/git.py

@@ -948,18 +948,21 @@ def ref(fields=('objectname'), sort=None, remotes=False, path=None):
 
 ################################################################################
 
-def branches(all=False, path=None):
+def branches(all=False, path=None, remote=False):
     """ Return a list of all the branches in the current repo """
 
-    cmd = ['branch']
+    cmd = ['branch', '--format=%(refname:short)','--list']
 
     if all:
         cmd.append('--all')
 
+    if remote:
+        cmd.append('--remote')
+
     results = []
     for output in git(cmd, path=path):
         if ' -> ' not in output and '(HEAD detached at ' not in output:
-            results.append(output[2:])
+            results.append(output)
 
     return results
 
@@ -1250,7 +1253,10 @@ def matching_branch(branchname, case=False, path=None):
         otherwise, it just checks for a branches containing the branchname
         as a substring. """
 
-    all_branches = branches(all=True, path=path)
+    local_branches = branches(path=path)
+    remote_branches = branches(path=path, remote=True)
+
+    all_branches = local_branches + remote_branches
 
     # Always return exact matches
 
@@ -1284,8 +1290,8 @@ def matching_branch(branchname, case=False, path=None):
                 # If the match is a remote branch, ignore it if we already have the equivalent
                 # local branch, otherwise add the name of the local branch that would be created.
 
-                if branch.startswith('remotes/'):
-                    localbranch = '/'.join(branch.split('/')[2:])
+                if branch in remote_branches:
+                    localbranch = '/'.join(branch.split('/')[1:])
                     if localbranch not in matching:
                         matching_remote.append(localbranch)
                 else:

{skilleter_thingy-0.2.13 → skilleter_thingy-0.2.15}/skilleter_thingy/thingy/popup.py

@@ -14,6 +14,7 @@ the popup again.
 
 import time
 import curses
+import curses.panel
 
 ################################################################################
 
@@ -71,7 +72,7 @@ class PopUp():
                 curses.panel.update_panels()
                 self.screen.refresh()
 
-    def __exit__(self, exc_type, exc_value, exc_traceback):
+    def __exit__(self, _exc_type, _exc_value, _exc_traceback):
         """ Remove the popup """
 
         if self.panel: