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

{skilleter_thingy-0.0.78/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.78
+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
@@ -37,11 +37,11 @@ This README just contains a summary of the functionality of each command.
 
 ## ggit
 
-Run a git command in all repos under the current directory
+Run a git command in all working trees under the current directory (note that this is not related to multigit (see below)).
 
 ## ggrep
 
-Run 'git grep' in all repos under the current directory
+Run 'git grep' in all repos under the current directory (note that this is not related to multigit (see below)).
 
 ## gitprompt
 
@@ -53,15 +53,11 @@ Improved version of 'git commit --amend'. Updates files that are already in the
 
 ## git cleanup
 
-List or delete branches that have already been merged and delete tracking branches that are no longer on ther remote.
+List or delete branches that have already been merged and delete tracking branches that are no longer on the remote.
 
 ## git co
 
-Equivalent to 'git checkout' but with intelligent branch matching
-
-## git mr
-
-Push a feature branch to GitLab and create a merge request
+Equivalent to 'git checkout' but with intelligent branch matching, so specifying a partial branch name will work if it uniquely matches an existing branch
 
 ## git parent
 
@@ -83,21 +79,21 @@ Console-based git change review tool.
 
 Manage a collection of related git repoitories.
 
-# General Commands
+## GitLab Commands
 
-## addpath
+### git mr
 
-Update a $PATH-type variable by adding or removing entries.
+Push a feature branch to GitLab and create a merge request
 
-## console-colours
+### gl
 
-Display all available colours in the console.
+Command line for GitLab
 
-## diskspacecheck
+# General Commands
 
-Check how much free space is available on all filesystems, ignoring read-only filesystems, /dev and tmpfs.
+## addpath
 
-Issue a warning if any are above 90% used.
+Update a $PATH-type variable by adding or removing entries.
 
 ## docker-purge
 
@@ -143,7 +139,7 @@ Simple search and replace utility for those times when trying to escape characte
 
 ## tfm
 
-Console-based file-manager, similar to Midnight Commander but better.
+Console-based file-manager, similar to Midnight Commander but aiming to be better.
 
 ## tfparse
 
@@ -161,9 +157,7 @@ Create a script to create/update a virtual environment and run a python script i
 
 ## 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.
+Command to run chmod only on files that need it (only modifies files that don't have the required permissions already).
 
 ## yamlcheck
 
@@ -177,9 +171,15 @@ These will be moved to the skilleter-extras package in due course.
 
 Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 
-## gl
+## consolecolours
 
-Command line for GitLab
+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.
 
 ## gphotosync
 

{skilleter_thingy-0.0.78 → skilleter_thingy-0.0.80}/README.md

@@ -16,11 +16,11 @@ This README just contains a summary of the functionality of each command.
 
 ## ggit
 
-Run a git command in all repos under the current directory
+Run a git command in all working trees under the current directory (note that this is not related to multigit (see below)).
 
 ## ggrep
 
-Run 'git grep' in all repos under the current directory
+Run 'git grep' in all repos under the current directory (note that this is not related to multigit (see below)).
 
 ## gitprompt
 
@@ -32,15 +32,11 @@ Improved version of 'git commit --amend'. Updates files that are already in the
 
 ## git cleanup
 
-List or delete branches that have already been merged and delete tracking branches that are no longer on ther remote.
+List or delete branches that have already been merged and delete tracking branches that are no longer on the remote.
 
 ## git co
 
-Equivalent to 'git checkout' but with intelligent branch matching
-
-## git mr
-
-Push a feature branch to GitLab and create a merge request
+Equivalent to 'git checkout' but with intelligent branch matching, so specifying a partial branch name will work if it uniquely matches an existing branch
 
 ## git parent
 
@@ -62,21 +58,21 @@ Console-based git change review tool.
 
 Manage a collection of related git repoitories.
 
-# General Commands
+## GitLab Commands
 
-## addpath
+### git mr
 
-Update a $PATH-type variable by adding or removing entries.
+Push a feature branch to GitLab and create a merge request
 
-## console-colours
+### gl
 
-Display all available colours in the console.
+Command line for GitLab
 
-## diskspacecheck
+# General Commands
 
-Check how much free space is available on all filesystems, ignoring read-only filesystems, /dev and tmpfs.
+## addpath
 
-Issue a warning if any are above 90% used.
+Update a $PATH-type variable by adding or removing entries.
 
 ## docker-purge
 
@@ -122,7 +118,7 @@ Simple search and replace utility for those times when trying to escape characte
 
 ## tfm
 
-Console-based file-manager, similar to Midnight Commander but better.
+Console-based file-manager, similar to Midnight Commander but aiming to be better.
 
 ## tfparse
 
@@ -140,9 +136,7 @@ Create a script to create/update a virtual environment and run a python script i
 
 ## 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.
+Command to run chmod only on files that need it (only modifies files that don't have the required permissions already).
 
 ## yamlcheck
 
@@ -156,9 +150,15 @@ These will be moved to the skilleter-extras package in due course.
 
 Wrapper for the borg backup utility to make it easier to use with a fixed set of options.
 
-## gl
+## consolecolours
 
-Command line for GitLab
+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.
 
 ## gphotosync
 

{skilleter_thingy-0.0.78 → 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.78"
+version = "0.0.80"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -43,7 +43,7 @@ Home = "https://skilleter.org.uk"
 [project.scripts]
 addpath         =  "skilleter_thingy:addpath.addpath"
 borger          =  "skilleter_thingy:borger.borger"
-console_colours =  "skilleter_thingy:console_colours.console_colours"
+consolecolours  =  "skilleter_thingy:console_colours.console_colours"
 diskspacecheck  =  "skilleter_thingy:diskspacecheck.diskspacecheck"
 docker-purge    =  "skilleter_thingy:docker_purge.docker_purge"
 ffind           =  "skilleter_thingy:ffind.ffind"

{skilleter_thingy-0.0.78 → 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)