skilleter-thingy 0.0.92__tar.gz → 0.0.93__tar.gz

{skilleter_thingy-0.0.92/skilleter_thingy.egg-info → skilleter_thingy-0.0.93}/PKG-INFO

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

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

{skilleter_thingy-0.0.92 → skilleter_thingy-0.0.93}/skilleter_thingy/git_update.py

@@ -93,6 +93,11 @@ def branch_rebase(args, results, branch):
 
                 logging.debug('No non-feature-branch parents found for %s. Feature branch parents could be: %s', branch, parents)
 
+        if not parents:
+            colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (no obvious candidates))', indent=4)
+            results['failed'].add(branch)
+            return
+
         # Cheat - if we have multiple possible parents and one is 'develop', 'main' or 'master'
         # choose it.
 
@@ -104,19 +109,14 @@ def branch_rebase(args, results, branch):
             elif 'develop' in parents:
                 parent = 'develop'
             else:
-                colour.write('[RED:WARNING]: Unable to rebase [BLUE:%s] branch as unable to determine its parent (could be any of %s)'
-                             % (branch, ', '.join(parents)), indent=4)
+                colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (could be any of {", ".join(parents)})',
+                             indent=4)
                 results['failed'].add(branch)
                 return
 
         elif len(parents) == 1:
             parent = parents[0]
 
-        else:
-            colour.write(f'[RED:WARNING]: Unable to rebase [BLUE:{branch}] branch as unable to determine its parent (no obvious candidates))', indent=4)
-            results['failed'].add(branch)
-            return
-
     if args.dry_run:
         colour.write(f'[BOLD:Checking if] [BLUE:{branch}] [BOLD:needs to be rebased onto] [BLUE:{parent}]', indent=4)
 
@@ -296,7 +296,7 @@ def main():
 
     branches = git.branches() if args.all or args.everything else [current_branch]
 
-    logging.info('Updating %s' % ', '.join(branches))
+    logging.info('Updating %s', ', '.join(branches))
 
     # Filter out branches that the user wants to ignore
 

{skilleter_thingy-0.0.92 → skilleter_thingy-0.0.93}/skilleter_thingy/multigit.py

@@ -224,6 +224,13 @@ def mg_init(args, config, console):
        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. """
 
+    # Sanity checks
+
+    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.configuration_file}"')
+
     # TODO: Update should remove or warn about repos that are no longer present
 
     # Search for .git directories
@@ -442,12 +449,6 @@ def main():
     # Run an internal or external command-specific validation
 
     if args.internal_command:
-        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.configuration_file}"')
-
         # Run the subcommand
 
         commands[args.command](args, config, console)
@@ -459,6 +460,8 @@ def main():
                 config.write(configfile)
 
     else:
+        # Run the external command, no need to update the config as it can't change here
+
         run_git_command(args, config, console)
 
 ################################################################################

{skilleter_thingy-0.0.92 → skilleter_thingy-0.0.93/skilleter_thingy.egg-info}/PKG-INFO

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