skilleter-thingy 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

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/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.dist-info → skilleter_thingy-0.1.2.dist-info}/METADATA

@@ -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.dist-info → skilleter_thingy-0.1.2.dist-info}/RECORD

@@ -16,7 +16,7 @@ skilleter_thingy/git_hold.py,sha256=Zk6YUhr08znUOdpVJkJAt0rOtrCXnKE0NHoZzoaEEGo,
 skilleter_thingy/git_mr.py,sha256=g33FaRtJTbIQI0tfXv_a042YpGwtbg5fKw072aqjAdw,3086
 skilleter_thingy/git_parent.py,sha256=DLy38mo06R0YDyJWQjrP8pQS-qc7tvLYcn8unKqzEiQ,2774
 skilleter_thingy/git_review.py,sha256=e0yvDD9fIVhscnEP7hY26Od8VUbPEb7iMVMbY63Xjbc,52462
-skilleter_thingy/git_update.py,sha256=jJt66M_rVD-CJzozMgvFPp5DFjmt4yu2cU9fzlI5wFc,14184
+skilleter_thingy/git_update.py,sha256=nw-bnDFrMi7yNf7P6gGF8gzmJUjXU5PhWhOYPgApcX4,14350
 skilleter_thingy/git_wt.py,sha256=Xm4VBBXMI4GxNtH3QvF-QL9rtvo4RrlWSbNQDFpGZu8,2954
 skilleter_thingy/gitcmp_helper.py,sha256=wutDHpBPOX8ZsXbsC5ApHxMY5tOKgD3P0eyFVs_mSAI,11214
 skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
@@ -24,7 +24,7 @@ skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
 skilleter_thingy/gphotosync.py,sha256=M0yzt5IxCHezkCOQwz3Chn8oudY_M7PRffboIUFLedk,22477
 skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
 skilleter_thingy/moviemover.py,sha256=QzUAWQzQ1AWWREIhl-VMaLo2h8MMhOekBnao5jGWV1s,4470
-skilleter_thingy/multigit.py,sha256=LDQzk59FOTAhkNU2PCsT0sdK2uMdLfhzcKBgczcPfWA,22975
+skilleter_thingy/multigit.py,sha256=cmMpeF6Zok9M4Cs2kpq6g68rt-CRS2hWzL-bIPE-2No,23045
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=BOu-cKHMivDlBqlRqv7sL3J6Ix1K2dxWWNcderldyZo,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -60,9 +60,9 @@ skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1U
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
 skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.1.0.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.0.dist-info/METADATA,sha256=QIA4xk7dmYA1dp4kGmmR5ICpV9D6LPKQJS9ouS4jsp8,29433
-skilleter_thingy-0.1.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-skilleter_thingy-0.1.0.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.1.0.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.0.dist-info/RECORD,,
+skilleter_thingy-0.1.2.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.2.dist-info/METADATA,sha256=zUFUpTX9EpfB6kcP84OawVF5kaVibq9FfKJftpDBJSE,29433
+skilleter_thingy-0.1.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+skilleter_thingy-0.1.2.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.1.2.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.2.dist-info/RECORD,,