skilleter-thingy 0.0.79__tar.gz → 0.0.80__tar.gz

{skilleter_thingy-0.0.79/skilleter_thingy.egg-info → skilleter_thingy-0.0.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.79
+Version: 0.0.80
 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.0.79 → skilleter_thingy-0.0.80}/pyproject.toml

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

{skilleter_thingy-0.0.79 → skilleter_thingy-0.0.80}/skilleter_thingy/git_review.py

@@ -6,6 +6,7 @@
     Copyright (C) 2020 John Skilleter
 
     TODO:
+        * Check for nothing to review before starting curses to avoid screen flicker when we start and immediately quit.
         * Use inotify to watch files in the review and prompt to reload if they have changed
         * Better status line
         * Mouse functionality?
@@ -17,14 +18,13 @@
         * add command
         * commit command
         * ability to embed colour changes in strings when writing with curses
-        * if no changes, screen should not flicker (it activates them immediately deactives curses)
         * Bottom line of the display should be menu that changes to a prompt if necc when running a command
         * Scroll, rather than jump, when moving down off the bottom of the screen - start scrolling when within 10% of top or bottom
         * Bottom line of display should show details of current file rather than help?
         * Mark/Unmark as reviewed by wildcard
         * Think that maintaining the list of files as a dictionary may be better than a list
         * Filter in/out new/deleted files
-        * Universal filter dialog replace individual optins and allow selection of:
+        * Universal filter dialog replace individual options and allow selection of:
             * Show:  all / deleted / updated files
             * Show:  all / wildcard match / wildcard non-match
             * Show:  all / reviewed / unreviewed files
@@ -194,11 +194,11 @@ class PopUp():
         if self.waitkey:
             while True:
                 keypress = self.screen.getch()
-                if keypress != curses.KEY_RESIZE:
-                    break
-                else:
+                if keypress == curses.KEY_RESIZE:
                     curses.panel.update_panels()
                     self.screen.refresh()
+                else:
+                    break
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
         """ Remove the popup """
@@ -293,6 +293,7 @@ class GitReview():
         self.show_none_whitespace_stats = False
 
         self.finished = False
+        self.status_code = 0
 
         # Use paths relative to the current directory
 
@@ -386,6 +387,7 @@ class GitReview():
                 ord('e'): {'help': 'Edit the current file', 'function': self.__key_edit_file},
                 ord('s'): {'help': 'Cycle sort order', 'function': self.__key_cycle_search},
                 ord('S'): {'help': 'Reverse sort order', 'function': self.__key_reverse_sort},
+                3: {'help': 'Exit', 'function': self.__key_error_review},
             }
 
     ################################################################################
@@ -920,6 +922,14 @@ class GitReview():
 
     ################################################################################
 
+    def __key_error_review(self):
+        """ Quit with an error"""
+
+        self.finished = True
+        self.status_code = 1
+
+    ################################################################################
+
     def __key_toggle_reviewed(self):
         """ Toggle mark file as reviewed and move down unless hide mode enabled
             and file is now hidden """
@@ -1406,6 +1416,8 @@ def main(screen, args):
 
     review.save_state()
 
+    return review.status_code
+
 ################################################################################
 
 def git_review():
@@ -1414,7 +1426,9 @@ def git_review():
     try:
         command_args = parse_command_line()
 
-        curses.wrapper(main, command_args)
+        statcode = curses.wrapper(main, command_args)
+
+        sys.exit(statcode)
 
     except KeyboardInterrupt:
         sys.exit(1)

{skilleter_thingy-0.0.79 → skilleter_thingy-0.0.80}/skilleter_thingy/multigit.py

@@ -8,6 +8,7 @@ import argparse
 import fnmatch
 import configparser
 import shlex
+import pathlib
 from collections import defaultdict
 
 import thingy.git2 as git
@@ -15,35 +16,32 @@ import thingy.colour as colour
 
 ################################################################################
 
-"""Configuration file format:
-
-    [default]
-    # Default settings
-
-    [repo_path]
-    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
-# TODO: [/] Don't use a fixed list of default branch names
-# TODO: [/] / Output name of each git repo as it is processed as command sits there seeming to do nothing otherwise.
-# TODO: [ ] ? Pull/fetch - only output after running command and only if something updated
-# TODO: [/] Don't save the configuration on exit if it hasn't changed
-# TODO: [ ] Consistent colours in output
-# TODO: [ ] Is it going to be a problem if the same repo is checked out twice or more in the same workspace
-# TODO: [ ] Better error-handling - e.g. continue/abort option after failure in one repo
-# TODO: [ ] Dry-run option
-# TODO: [ ] Verbose option
-# TODO: [ ] When specifying list of repos, if repo name doesn't contain '/' prefix it with '*'?
-# TODO: [ ] Switch to tomlkit
+# DONE: / Output name of each git repo as it is processed as command sits there seeming to do nothing otherwise.
+# DONE: Don't save the configuration on exit if it hasn't changed
+# DONE: Don't use a fixed list of default branch names
+# DONE: Use the configuration file
+# DONE: init function
+# TODO: -j option to run in parallel?
+# TODO: Pull/fetch - only output after running command and only if something updated
+# TODO: Better error-handling - e.g. continue/abort option after failure in one repo
+# TODO: Consistent colours in output
+# TODO: Dry-run option
+# DONE: 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: If run in a subdirectory, only process repos in that tree (or have an option to do so)
+# TODO: Is it going to be a problem if the same repo is checked out twice or more in the same workspace
+# TODO: Switch to tomlkit
+# TODO: Verbose option
+# TODO: When specifying list of repos, if repo name doesn't contain '/' prefix it with '*'?
 
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
 
+# If a branch name is specified as 'DEFAULT' then the default branch for the
+# repo is used instead.
+
+DEFAULT_BRANCH = 'DEFAULT'
+
 ################################################################################
 
 def error(msg, status=1):
@@ -68,7 +66,7 @@ def show_progress(width, msg):
 
 ################################################################################
 
-def find_git_repos(directory, wildcard):
+def find_git_repos(args):
     """Locate and return a list of '.git' directory parent directories in the
        specified path.
 
@@ -79,13 +77,13 @@ def find_git_repos(directory, wildcard):
 
     repos = set()
 
-    for root, dirs, _ in os.walk(directory):
+    for root, dirs, _ in os.walk(args.directory):
         if '.git' in dirs:
             if root.startswith('./'):
                 root = root[2:]
 
-            if wildcard:
-                for card in wildcard:
+            if args.repos:
+                for card in args.repos:
                     if fnmatch.fnmatch(root, card):
                         if root not in repos:
                             yield root
@@ -98,18 +96,74 @@ def find_git_repos(directory, wildcard):
 
 ################################################################################
 
+def select_git_repos(args, config):
+    """Return git repos from the configuration that match the criteria on the
+       multigit command line (the --repos, --modified and --branched options)
+       or, return them all if no relevant options specified"""
+
+    for repo in config.sections():
+        # If wildcards are specified, then only match wildcards
+
+        if args.repos:
+            for card in args.repos:
+                if fnmatch.fnmatch(repo, card):
+                    matching = True
+                    break
+            else:
+                matching = False
+        else:
+            matching = True
+
+        # If branched specified, only match if the repo is matched _and_ branched
+
+        if matching and args.branched:
+            if git.branch(path=repo) == config[repo]['default branch']:
+                matching = False
+
+        # If modified specified, only match if the repo is matched _and_ modified
+
+        if matching and args.modified:
+            if not git.status(path=repo):
+                matching = False
+
+        if matching:
+            yield config[repo]
+
+################################################################################
+
+def branch_name(name, default_branch):
+    """If name is None or DEFAULT_BRANCH return default_branch, otherwise return name"""
+
+    return default_branch if not name or name == DEFAULT_BRANCH else name
+
+################################################################################
+
+def run_git_status(cmd, path, cont=False, redirect=True):
+
+    output, status = git.git_run_status(cmd, path=path, redirect=redirect)
+
+    if output:
+        colour.write(f'[BOLD:{path}]')
+        colour.write()
+        colour.write(output, indent=4)
+
+    if status and not cont:
+        sys.exit(status)
+
+################################################################################
+
 def mg_init(args, config, console):
     """Create or update the configuration
        By default, it scans the tree for git directories and adds or updates them
        in the configuration, using the current branch as the default branch. """
 
-    # TODO: [ ] Update should remove or warn about repos that are no longer present
+    # TODO: Update should remove or warn about repos that are no longer present
 
     # Search for .git directories
 
-    for repo in find_git_repos(args.directory, args.repos):
+    for repo in find_git_repos(args):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
         if not repo in config:
             config[repo] = {
@@ -129,20 +183,20 @@ def mg_init(args, config, console):
 def mg_status(args, config, console):
     """Report Git status for any repo that has a non-empty status"""
 
-    # TODO: [ ] More user-friendly output
+    # TODO: More user-friendly output
 
-    for repo in find_git_repos(args.directory, args.repos):
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        status = git.status(path=repo)
-        branch = git.branch(path=repo)
+        status = git.status(path=repo.name)
+        branch = git.branch(path=repo.name)
 
-        if status or branch != config[repo]['default branch']:
-            if branch == config[repo]['default branch']:
-                colour.write(f'[BOLD:{repo}]')
+        if status or branch != repo['default branch']:
+            if branch == repo['default branch']:
+                colour.write(f'[BOLD:{repo.name}]')
             else:
-                colour.write(f'[BOLD:{repo}] - branch: [BLUE:{branch}]')
+                colour.write(f'[BOLD:{repo.name}] - branch: [BLUE:{branch}]')
 
             staged = defaultdict(list)
             unstaged = defaultdict(list)
@@ -206,16 +260,18 @@ def mg_status(args, config, console):
 def mg_fetch(args, config, console):
     """Run git fetch everywhere"""
 
-    for repo in find_git_repos(args.directory, args.repos):
+    _ = config
+
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        colour.write(f'Fetching updates for [BLUE:{repo}]')
+        colour.write(f'Fetching updates for [BLUE:{repo.name}]')
 
-        result = git.fetch(path=repo)
+        result = git.fetch(path=repo.name)
 
         if result:
-            colour.write(f'[BOLD:{repo}]')
+            colour.write(f'[BOLD:{repo.name}]')
             for item in result:
                 if item.startswith('From '):
                     colour.write(f'    [BLUE:{item}]')
@@ -229,19 +285,21 @@ def mg_fetch(args, config, console):
 def mg_pull(args, config, console):
     """Run git pull everywhere"""
 
-    for repo in find_git_repos(args.directory, args.repos):
+    _ = config
+
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        colour.write(f'Pulling updates for [BLUE:{repo}]')
+        colour.write(f'Pulling updates for [BLUE:{repo.name}]')
 
         try:
-            result = git.pull(path=repo)
+            result = git.pull(path=repo.name)
         except git.GitError as exc:
-            error(f'Error in {repo}: {exc}')
+            error(f'Error in {repo.name}: {exc}')
 
         if result and result[0] != 'Already up-to-date.':
-            colour.write(f'[BOLD:{repo}]')
+            colour.write(f'[BOLD:{repo.name}]')
             for item in result:
                 if item.startswith('Updating'):
                     colour.write(f'    [BLUE:{item}]')
@@ -257,19 +315,19 @@ 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?
+    # DONE: Add option for force-push?
+    # TODO: Add option for manual confirmation?
 
-    for repo in find_git_repos(args.directory, args.repos):
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        branch = git.branch(path=repo)
+        branch = git.branch(path=repo.name)
 
         if branch != config[repo]['default branch']:
-            colour.write(f'Pushing changes to [BLUE:{branch}] in [BOLD:{repo}]')
+            colour.write(f'Pushing changes to [BLUE:{branch}] in [BOLD:{repo.name}]')
 
-            result = git.push(path=repo, force_with_lease=args.force)
+            result = git.push(path=repo.name, force_with_lease=args.force)
 
             if result:
                 colour.write(result, indent=4)
@@ -284,21 +342,21 @@ 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: [ ] Checkout remote branches
-    # TODO: [ ] only try checkout if branch exists
-    # TODO: [ ] option to fetch before checking out
+    # 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):
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        branch = args.branch or config[repo]['default branch']
+        branch = branch_name(args.branch or repo.name['default branch'])
 
-        if git.branch(path=repo) != branch:
-            colour.write(f'Checking out [BLUE:{branch}] in [BOLD:{repo}]')
+        if git.branch(path=repo.name) != branch:
+            colour.write(f'Checking out [BLUE:{branch}] in [BOLD:{repo.name}]')
 
-            git.checkout(branch, create=args.create, path=repo)
+            git.checkout(branch, create=args.create, path=repo.name)
 
 ################################################################################
 
@@ -306,21 +364,21 @@ def mg_commit(args, config, console):
     """For every repo that has a branch checked out and changes present,
        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 [ ] Option to specify wildcard for files to commit (default is all files)
+    # DONE: Option to amend the commit if it is not the first one on the current branch
+    # DONE: Prevent commits if current branch is the default branch
+    # DONE: Option to specify wildcard for files to commit (default is all files)
 
-    for repo in find_git_repos(args.directory, args.repos):
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        branch = git.branch(path=repo)
-        modified = git.status(path=repo)
+        branch = git.branch(path=repo.name)
+        modified = git.status(path=repo.name)
 
-        if branch != config[repo]['default branch'] and modified:
-            colour.write(f'Committing [BOLD:{len(modified)}] changes onto [BLUE:{branch}] branch in [BOLD:{repo}]')
+        if branch != repo['default branch'] and modified:
+            colour.write(f'Committing [BOLD:{len(modified)}] changes onto [BLUE:{branch}] branch in [BOLD:{repo.name}]')
 
-            git.commit(all=True, message=args.message, path=repo)
+            git.commit(all=True, message=args.message, path=repo.name)
 
 ################################################################################
 
@@ -328,28 +386,37 @@ def mg_update(args, config, console):
     """For every repo, pull the default branch and if the current branch
        is not the default branch, rebase it onto the default branch"""
 
-    # TODO: [ ] Option to pull current branch
-    # TODO: [ ] Use git-update
-    # TODO: [ ] Option to delete current branch before pulling (to get updates without conflicts)
-    # TODO: [ ] Option to stash changes on current branch before updating and unstash afterwards
+    # TODO: Option to pull current branch
+    # TODO: Use git-update
+    # TODO: Option to delete current branch before pulling (to get updates without conflicts)
+    # TODO: Option to stash changes on current branch before updating and unstash afterwards
 
-    for repo in find_git_repos(args.directory, args.repos):
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        branch = git.branch(path=repo)
-        default_branch = config[repo]['default branch']
+        branch = git.branch(path=repo.name)
+        default_branch = repo['default branch']
 
-        colour.write(f'Updating branch [BLUE:{branch}] in [BOLD:{repo}]')
+        colour.write(f'Updating branch [BLUE:{branch}] in [BOLD:{repo.name}]')
 
         if branch != default_branch:
-            git.checkout(default_branch, path=repo)
+            if not args.quiet:
+                colour.write(f'Checking out [BLUE:{default_branch}]', indent=4)
 
-        git.pull(path=repo)
+            git.checkout(default_branch, path=repo.name)
+
+        if not args.quiet:
+            colour.write(f'Pulling updates from remote', indent=4)
+
+        git.pull(path=repo.name)
 
         if branch != default_branch:
-            git.checkout(branch, path=repo)
-            result = git.rebase(default_branch, path=repo)
+            if not args.quiet:
+                colour.write(f'Checking out [BLUE:{branch}] and rebasing against [BLUE:{default_branch}]', indent=4)
+
+            git.checkout(branch, path=repo.name)
+            result = git.rebase(default_branch, path=repo.name)
             colour.write(result[0], indent=4)
 
 ################################################################################
@@ -357,28 +424,30 @@ def mg_update(args, config, console):
 def mg_clean(args, config, console):
     """Clean the repos"""
 
-    for repo in find_git_repos(args.directory, args.repos):
+    _ = config
+
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
         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)
+                           remove_only_ignored=args.X, path=repo.name)
 
         first_skip = True
 
         if result:
-            colour.write(f'[BOLD:{repo}]')
+            colour.write(f'[BOLD:{repo.name}]')
 
             for item in result:
                 skipping = item.startswith('Skipping repository ')
 
                 if skipping and not args.verbose:
                     if first_skip:
-                        colour.write(f'    Skipping sub-repositories')
+                        colour.write('Skipping sub-repositories', indent=4)
                         first_skip = False
                 else:
-                    colour.write(f'    {item.strip()}')
+                    colour.write(item.strip(), indent=4)
 
             colour.write()
 
@@ -388,12 +457,15 @@ def mg_dir(args, config, console):
     """Return the location of a working tree, given the name. Returns an
        error unless there is a unique match"""
 
+    _ = console
+    _ = config
+
     location = []
     search_dir = args.dir[0]
 
-    for repo in find_git_repos(args.directory, args.repos):
-        if fnmatch.fnmatch(config[repo]['name'], search_dir):
-            location.append(repo)
+    for repo in select_git_repos(args, config):
+        if fnmatch.fnmatch(repo['name'], search_dir):
+            location.append(repo.name)
 
     if len(location) == 0:
         error(f'No matches with {dir}')
@@ -408,21 +480,59 @@ def mg_run(args, config, console):
     """Run a command in each of the working trees, optionally continuing if
        there's an error"""
 
+    _ = config
+
     cmd = shlex.split(args.cmd[0])
 
-    for repo in find_git_repos(args.directory, args.repos):
+    for repo in select_git_repos(args, config):
         if not args.quiet:
-            show_progress(console.columns, repo)
+            show_progress(console.columns, repo.name)
 
-        output, status = git.git_run_status(cmd, path=repo)
+        run_git_status(cmd, repo.name, args.cont)
 
-        if output:
-            colour.write(f'[BOLD:{repo}]')
-            colour.write()
-            colour.write(output, indent=4)
+################################################################################
+
+def mg_review(args, config, console):
+    """Run the git review command"""
+
+    # TODO: Better parsing to replace DEFAULT with default branch only where appropriate
+
+    for repo in select_git_repos(args, config):
+        if not args.quiet:
+            show_progress(console.columns, repo.name)
+
+        params = []
+        for p in args.parameters:
+            params += shlex.split(p.replace(DEFAULT_BRANCH, repo['default branch']))
 
-        if status and not args.cont:
-            sys.exit(status)
+        colour.write(f'Running review in [BOLD:{repo.name}]')
+        run_git_status(['review'] + params, repo.name, cont=True, redirect=False)
+
+################################################################################
+
+def read_configuration(args):
+    """If the configuration file name has path elements, try and read it, otherwise
+       search up the directory tree looking for the configuration file.
+       Returns the configuration data, or None if the configuration file
+       could not be found."""
+
+    if '/' in args.config:
+        config_file = args.config
+    else:
+        config_path = os.getcwd()
+        config_file = os.path.join(config_path, args.config)
+
+        while not os.path.isfile(config_file) and config_path != '/':
+            config_path = os.path.dirname(config_path)
+            config_file = os.path.join(config_path, args.config)
+
+    config = configparser.ConfigParser()
+
+    if os.path.isfile(config_file):
+        config.read(config_file)
+        return config
+
+    return None
 
 ################################################################################
 
@@ -441,6 +551,7 @@ def main():
        'clean': mg_clean,
        'dir': mg_dir,
        'run': mg_run,
+       'review': mg_review,
     }
 
     # Parse args in the form COMMAND OPTIONS SUBCOMMAND SUBCOMMAND_OPTIONS PARAMETERS
@@ -454,6 +565,8 @@ def main():
     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 repo names to work on (defaults to all repos and can contain shell wildcards and can be issued multiple times on the command line)')
+    parser.add_argument('--modified', '-m', action='store_true', help='Select repos that have local modifications')
+    parser.add_argument('--branched', '-b', action='store_true', help='Select repos that do not have the default branch checked out')
 
     subparsers = parser.add_subparsers(dest='command')
 
@@ -495,6 +608,9 @@ def main():
     parser_run.add_argument('--cont', '-c', action='store_true', help='Continue if the command returns an error in any of the working trees')
     parser_run.add_argument('cmd', nargs=1, action='store', help='The command to run (should be quoted)')
 
+    parser_review = subparsers.add_parser('review', help='Review the changes in a working tree')
+    parser_review.add_argument('parameters', nargs='*', action='store', help='Parameters passed to the "git review" command')
+
     # Parse the command line
 
     args = parser.parse_args()
@@ -504,12 +620,20 @@ def main():
     if not args.command:
         error('No command specified')
 
+    if args.command not in commands:
+        error(f'Unrecognized command "{args.command}"')
+
     # If the configuration file exists, read it
 
-    config = configparser.ConfigParser()
+    config = read_configuration(args)
+
+    # Command-specific validation
 
-    if os.path.isfile(args.config):
-        config.read(args.config)
+    if args.command == 'init':
+        if args.modified or args.branched:
+            error('The "--modified" and "--branched" options cannot be used with the "init" subcommand')
+    elif not config:
+        error(f'Unable to location configuration file "{args.config}"')
 
     # Get the console size
 
@@ -550,8 +674,8 @@ def multigit():
     # Catch-all failure for Git errors
 
     except git.GitError as exc:
-        sys.stderr.write(exc)
-        sys.exit(3)
+        sys.stderr.write(exc.msg)
+        sys.exit(exc.status)
 
 ################################################################################
 

{skilleter_thingy-0.0.79 → skilleter_thingy-0.0.80}/skilleter_thingy/thingy/git2.py

@@ -73,7 +73,7 @@ def git(cmd, stdout=None, stderr=None, path=None):
 
 ################################################################################
 
-def git_run_status(cmd, stdout=None, stderr=None, path=None):
+def git_run_status(cmd, stdout=None, stderr=None, path=None, redirect=True):
     """ Wrapper for run.run that returns the output and status, and
         does not raise an exception on error.
         Optionally redirect stdout and stderr as specified. """
@@ -85,12 +85,15 @@ def git_run_status(cmd, stdout=None, stderr=None, path=None):
     if path:
         git_cmd += ['-C', path]
 
-    result = subprocess.run(git_cmd + cmd,
-                            stdout=stdout or subprocess.PIPE,
-                            stderr=stderr or subprocess.PIPE,
-                            text=True, check=False,
-                            errors='ignore',
-                            universal_newlines=True)
+    if redirect:
+        result = subprocess.run(git_cmd + cmd,
+                                stdout=stdout or subprocess.PIPE,
+                                stderr=stderr or subprocess.PIPE,
+                                text=True, check=False,
+                                errors='ignore',
+                                universal_newlines=True)
+    else:
+        result = subprocess.run(git_cmd + cmd)
 
     return (result.stdout or result.stderr), result.returncode
 
@@ -443,6 +446,9 @@ def status(ignored=False, untracked=False, path=None):
         stats = []
         stats.append(result[0:2])
 
+        if not untracked and result[0] == '?':
+            continue
+
         name = result[3:]
         if ' -> ' in name:
             stats += name.split(' -> ', 1)

{skilleter_thingy-0.0.79 → skilleter_thingy-0.0.80/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.0.79
+Version: 0.0.80
 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