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

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

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

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

{skilleter_thingy-0.0.92 → skilleter_thingy-0.0.94}/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.94}/skilleter_thingy/multigit.py

@@ -15,22 +15,23 @@ import thingy.colour as colour
 ################################################################################
 
 # DONE: / Output name of each git repo as it is processed as command sits there seeming to do nothing otherwise.
+# DONE: Better error-handling - e.g. continue/abort option after failure in one repo
 # 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: If the config file isn't in the current directory then search up the directory tree for it but run in the current directory
 # DONE: Use the configuration file
 # DONE: init function
-# TODO: -j option to run in parallel?
+# NOPE: Dry-run option - just pass the option to the Git command
+# NOPE: Is it going to be a problem if the same repo is checked out twice or more in the same workspace - user problem
 # NOPE: Pull/fetch - only output after running command and only if something updated
-# DONE: Better error-handling - e.g. continue/abort option after failure in one repo
+# NOPE: Switch to tomlkit
+# TODO: -j option to run in parallel - yes, but it will only work with non-interactive Git commands
+# TODO: Command that takes partial repo name and either returns full path or pops up window to autocomplete until single match found
 # 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
-# NOPE: Switch to tomlkit
 # TODO: Verbose option
 # TODO: When specifying list of repos, if repo name doesn't contain '/' prefix it with '*'?
-
+# TODO: select_git_repos() and +dir should use consist way of selecting repos if possible
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
@@ -224,6 +225,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
@@ -241,9 +249,9 @@ def mg_init(args, config, console):
 
         if 'origin' in remote:
             config[repo]['origin'] = remote['origin']
-            config[repo]['name']= os.path.basename(remote['origin']).removesuffix('.git')
+            config[repo]['repo name']= os.path.basename(remote['origin']).removesuffix('.git')
         else:
-            config[repo]['name'] = os.path.basename(repo)
+            config[repo]['repo name'] = os.path.basename(repo)
 
 ################################################################################
 
@@ -261,18 +269,39 @@ def mg_dir(args, config, console):
         error('The +dir command takes no more than one parameter - the name of the working tree to search for')
     elif args.parameters:
         location = []
-        search_dir = args.parameters[0]
+        wild_prefix_location = []
+        wild_location = []
+
+        search_name = args.parameters[0]
+
+        # Search for exact matches, matches if prefixed by '*' or prefixed and suffixed with '*'
+        # unless it already contains '*'
 
         for repo in select_git_repos(args, config):
-            if fnmatch.fnmatch(repo['name'], search_dir):
+            if fnmatch.fnmatch(repo['repo name'], search_name):
                 location.append(repo.name)
 
-        if len(location) == 0:
-            error(f'No matches with [BLUE:{search_dir}]')
-        elif len(location) > 1:
-            error(f'Multiple matches with [BLUE:{search_dir}] - {" ".join(location)}')
+            elif '*' not in search_name:
+                if fnmatch.fnmatch(repo['repo name'], f'*{search_name}'):
+                    wild_prefix_location.append(repo.name)
+
+                elif fnmatch.fnmatch(repo['repo name'], f'*{search_name}*'):
+                    wild_location.append(repo.name)
+
+        for destinations in (location, wild_prefix_location, wild_location):
+            if len(destinations) == 1:
+                destination = destinations
+                break
+            elif len(destinations) > 1:
+                destination = destinations
 
-        colour.write(os.path.join(os.path.dirname(args.configuration_file), location[0]))
+        if not destination:
+            error(f'No matches with [BLUE:{search_name}]')
+
+        if len(destination) > 1:
+            error(f'Multiple matches with [BLUE:{search_name}] - {" ".join(destination)}')
+
+        colour.write(os.path.join(os.path.dirname(args.configuration_file), destination[0]))
     else:
         colour.write(os.path.dirname(args.configuration_file))
 
@@ -442,12 +471,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 +482,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.94/skilleter_thingy.egg-info}/PKG-INFO

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