skilleter-thingy 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

skilleter_thingy/git_review.py

@@ -102,7 +102,7 @@ class GitReviewError(BaseException):
 def error(msg, status=1):
     """ Report an error """
 
-    sys.stderr.write('%s\n' % msg)
+    sys.stderr.write(f'{msg}\n')
     sys.exit(status)
 
 ################################################################################
@@ -254,7 +254,7 @@ class GitReview():
         self.__update_changed_files()
 
         if not self.changed_files:
-            msg = ['There are no changes between %s and ' % args.commits[0]]
+            msg = [f'There are no changes between {args.commits[0]} and ']
 
             if args.commits[1]:
                 msg.append(args.commits[1])
@@ -262,7 +262,7 @@ class GitReview():
                 msg.append('local files')
 
             if args.paths:
-                msg.append(' in the %s directory' % args.paths[0])
+                msg.append(f' in the {args.paths[0]} directory')
 
             raise GitReviewError(''.join(msg))
 
@@ -1389,7 +1389,7 @@ def parse_command_line():
             else:
                 colour.error(f'[RED:ERROR]: Multiple commits match {entry}')
         else:
-            colour.error(f'[RED:ERROR] {entry} is not a valid commit ID' % entry)
+            colour.error(f'[RED:ERROR] {entry} is not a valid commit ID')
 
     # Things work easier if we always have two commits to compare
 

skilleter_thingy/multigit.py

@@ -733,7 +733,10 @@ def main():
     # Run an internal or external command-specific validation
 
     if args.internal_command:
-        # Run the subcommand
+        # Everything except '+init' and '+clone' requires the configuration file
+
+        if args.command not in ('init', 'clone') and args.configuration_file is None:
+            error('Configuration file not found')
 
         COMMANDS[args.command](args, config, console)
 

{skilleter_thingy-0.1.8.dist-info → skilleter_thingy-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.8
+Version: 0.1.10
 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.8.dist-info → skilleter_thingy-0.1.10.dist-info}/RECORD

@@ -15,7 +15,7 @@ skilleter_thingy/git_common.py,sha256=ZjNkvIBRDGNLFYwOu9FjeqdDKJdm0sndX5QATtmq29
 skilleter_thingy/git_hold.py,sha256=Zk6YUhr08znUOdpVJkJAt0rOtrCXnKE0NHoZzoaEEGo,4616
 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_review.py,sha256=Vmepd1qHPM9eHYE19KNO0UWJIYhGhlwPlVBjbgFZ2PM,52448
 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
@@ -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=zrn8kIa9gP5WJztWJURz7HNu90XAsecdAWTc2upU-jc,28519
+skilleter_thingy/multigit.py,sha256=TMfu6PCx0alxmv-qNwNnbG4rl4_eW3OrBZtvtGnuCWE,28708
 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=UWpBWuIMCE1UonLJErb41yW3RtpXrK_bt4Z4cZR-eDU,5910
 skilleter_thingy/thingy/venv_template.py,sha256=SsVNvSwojd8NnFeQaZPCRQYTNdwJRplpZpygbUEXRnY,1015
-skilleter_thingy-0.1.8.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.8.dist-info/METADATA,sha256=ZaR46wxZx4NRjkdP62PgZ_dFd9wPoBdBhBD5l8XT_v0,29873
-skilleter_thingy-0.1.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-skilleter_thingy-0.1.8.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
-skilleter_thingy-0.1.8.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.8.dist-info/RECORD,,
+skilleter_thingy-0.1.10.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.10.dist-info/METADATA,sha256=fEGixW3RcifB9BsfvxxQmL2y5LsWpRdD_jBeKSKTefM,29874
+skilleter_thingy-0.1.10.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+skilleter_thingy-0.1.10.dist-info/entry_points.txt,sha256=u5ymS-KPljIGTnprV5yJsAjz7qgeT2BZ-Qo_Con_PFM,2145
+skilleter_thingy-0.1.10.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.10.dist-info/RECORD,,

{skilleter_thingy-0.1.8.dist-info → skilleter_thingy-0.1.10.dist-info}/WHEEL

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