skilleter-thingy 0.1.0__tar.gz → 0.1.2__tar.gz

{skilleter_thingy-0.1.0 → skilleter_thingy-0.1.2}/PKG-INFO

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

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

{skilleter_thingy-0.1.0 → skilleter_thingy-0.1.2}/skilleter_thingy/git_update.py

@@ -17,6 +17,7 @@
          fixed branches first then rebase everything in no particular order.
 
    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
 """
 ################################################################################
 
@@ -108,6 +109,8 @@ def branch_rebase(args, results, branch):
                 parent = 'main'
             elif 'develop' in parents:
                 parent = 'develop'
+            elif 'scv-poc' in parents:
+                parent = 'scv-poc'
             else:
                 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)

{skilleter_thingy-0.1.0 → skilleter_thingy-0.1.2}/skilleter_thingy/multigit.py

@@ -41,9 +41,9 @@ import thingy.colour as colour
 # TODO: If run in a subdirectory, only process working trees in that tree (or have an option to do so, or an option _not_ to do so; --all)
 # TODO: Ability to read default configuration options from ~/.config/thingy/multigit.rc - these are insert before argv[1] before argparse called
 # TODO: When we have something with multiple matches display a menu for user to select the one that they one - make it a library routine so can be used, for instance, for branch selection
-# TODO: Use pygit
-# TOTO: Use PathLib
-
+# TODO: Use pygit2
+# TODO: Use PathLib
+# TODO: Shell autocomplete for +dir
 ################################################################################
 
 DEFAULT_CONFIG_FILE = 'multigit.toml'
@@ -374,8 +374,8 @@ def mg_dir(args, config, console):
             error(f'No matches with [BLUE:{search_name}]')
 
         if len(destination) > 1:
-            dest_list = "\n\t".join(destination)
-            error(f'Multiple matches with [BLUE:{search_name}]: {dest_list}')
+            dest_list = "\n\t".join([os.path.relpath(d) for d in destination])
+            error(f'Multiple matches with [BLUE:{search_name}]: \n\t{dest_list}')
 
         colour.write(os.path.join(os.path.dirname(args.configuration_file), destination[0]))
     else:

{skilleter_thingy-0.1.0 → skilleter_thingy-0.1.2}/skilleter_thingy.egg-info/PKG-INFO

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