skilleter-thingy 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

skilleter_thingy/multigit.py

@@ -219,6 +219,8 @@ def select_git_repos(args, config):
         # If repos are specified, then only match according to exact name match,
         # exact path match or wildcard match
 
+        repo_abs_path = absolute_repo_path(args, repo_path)
+
         if args.repos:
             for entry in args.repos:
                 if config[repo_path]['repo name'] == entry:
@@ -242,13 +244,13 @@ def select_git_repos(args, config):
         # If branched specified, only match if the repo is matched _and_ branched
 
         if matching and args.branched:
-            if git.branch(path=repo_path) == config[repo_path]['default branch']:
+            if git.branch(path=repo_abs_path) == config[repo_path]['default branch']:
                 matching = False
 
         # If modified specified, only match if the repo is matched _and_ modified
 
         if matching and args.modified:
-            if not git.status(path=repo_path):
+            if not git.status(path=repo_abs_path):
                 matching = False
 
         # If tag filtering specified, only match if the repo is tagged with one of the specified tags
@@ -380,16 +382,18 @@ def mg_init(args, config, console):
             # Add a new configuration entry containing the default branch, remote origin
             # (if there is one) and name
 
+            abs_repo_path = absolute_repo_path(args, repo)
+
             config[repo] = { }
 
-            default_branch = git.branch(path=repo)
+            default_branch = git.branch(path=abs_repo_path)
 
             if not default_branch:
                 error(f'Unable to determine default branch in [BLUE:{repo}]')
 
             config[repo]['default branch'] = default_branch
 
-            remote = git.remotes(path=repo)
+            remote = git.remotes(path=abs_repo_path)
 
             if 'origin' in remote:
                 config[repo]['origin'] = remote['origin']

skilleter_thingy/thingy/tidy.py

@@ -29,7 +29,8 @@ import re
 
 ANSI_REGEXES = [
     re.compile(r'\x1b\[([0-9][0-9;]*)*m'),
-    re.compile(r'\x1b\[m')
+    re.compile(r'\x1b\[m'),
+    re.compile(r'\x1b\[[0-9][A-Z]'),
 ]
 
 # Match and ANSI colour control sequence and capture the colour bit
@@ -58,7 +59,7 @@ RE_TIME = [
 
     {'regex': re.compile(r'[0-9]([.][0-9]*)*\s*(second[s]?)'), 'replace': '{ELAPSED}'},
 
-    {'find': '\{DATE\} \{TIME\}', 'replace': '{DATE+TIME}'},
+    {'find': '{DATE} {TIME}', 'replace': '{DATE+TIME}'},
     {'regex': re.compile(r'[0-9]+m *[0-9]+s'), 'replace': '{ELAPSED}'},
 ]
 

{skilleter_thingy-0.1.5.dist-info → skilleter_thingy-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: skilleter_thingy
-Version: 0.1.5
+Version: 0.1.7
 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.5.dist-info → skilleter_thingy-0.1.7.dist-info}/RECORD

@@ -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=SW7Db9DaucTdTq7ozqzbRvIKObt8XhX4z4J5p-oiGO0,27667
+skilleter_thingy/multigit.py,sha256=o_gW9vlPJ_uUNRxRYm92kBUl1pQKpt76xoVIBg6XaLo,27814
 skilleter_thingy/photodupe.py,sha256=l0hbzSLb2Vk2ceteg-x9fHXCEE1uUuFo84hz5rsZUPA,4184
 skilleter_thingy/phototidier.py,sha256=BOu-cKHMivDlBqlRqv7sL3J6Ix1K2dxWWNcderldyZo,7818
 skilleter_thingy/py_audit.py,sha256=xJm5k5qyeA6ii8mODa4dOkmP8L1drv94UHuxR54RsIM,4384
@@ -58,11 +58,11 @@ skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dO
 skilleter_thingy/thingy/process.py,sha256=WJLg3js1zdgI7Nlkt7e5ICltkjXcA9P1f-LWPSZCdWs,3570
 skilleter_thingy/thingy/run.py,sha256=6SNKWF01fSxzB10GMU9ajraXYZqAL1w0PXkqjJdr1Uo,12611
 skilleter_thingy/thingy/tfm_pane.py,sha256=oqy5zBzKwfbjbGqetbbhpKi4x5He7sl4qkmhUeqtdZc,19789
-skilleter_thingy/thingy/tidy.py,sha256=71DCyj0VJrj52RmjQyj1eOiQJIfy5EIPHuThOrS6ZTA,5876
+skilleter_thingy/thingy/tidy.py,sha256=UWpBWuIMCE1UonLJErb41yW3RtpXrK_bt4Z4cZR-eDU,5910
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.1.5.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.5.dist-info/METADATA,sha256=5JrquqaBtg8bIaA3nafDa8cxTfA-Jeevr3ZWfE3NnuY,29686
-skilleter_thingy-0.1.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-skilleter_thingy-0.1.5.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.1.5.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.5.dist-info/RECORD,,
+skilleter_thingy-0.1.7.dist-info/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.7.dist-info/METADATA,sha256=Rq3d_ivZOANFFtlWwG-FQo72gVMunqY4QAhKCpZpnKQ,29686
+skilleter_thingy-0.1.7.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+skilleter_thingy-0.1.7.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.1.7.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.7.dist-info/RECORD,,

{skilleter_thingy-0.1.5.dist-info → skilleter_thingy-0.1.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any