skilleter-thingy 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

skilleter_thingy/git_ca.py

@@ -78,7 +78,7 @@ def main():
 
     # Get the list of files modified in the most recent commit
 
-    current_commit = git.commit_info('HEAD', 'HEAD^')
+    current_commit = git.commit_changes()
 
     # Get the list of locally-modified and untracked files, including
     # files matching .gitignore, if necessary

skilleter_thingy/git_retag.py

@@ -0,0 +1,54 @@
+#! /usr/bin/env python3
+
+################################################################################
+""" Apply or update a tag, optionally updating it on the remote as well.
+
+    Copyright (C) 2025 John Skilleter
+
+    Licence: GPL v3 or later
+"""
+################################################################################
+
+import sys
+import argparse
+
+import thingy.git2 as git
+
+################################################################################
+
+def main():
+    """ Main function """
+
+    # Command line parameters
+
+    parser = argparse.ArgumentParser(description='Apply or update a tag, optionally updating it on the remote as well.')
+    parser.add_argument('--push', '-p', action='store_true', help='Push the tag to the remote')
+    parser.add_argument('tag', nargs=1, help='The tag')
+
+    args = parser.parse_args()
+
+    # Delete the tag if it currently exists, optionally pushing the deletion
+
+    if args.tag in git.tags():
+        git.tag_delete(args.tag, push=args.push)
+
+    # Apply the tag
+
+    git.tag_apply(args.tag, push=args.push)
+
+################################################################################
+
+def git_retag():
+    """Entry point"""
+
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit(1)
+    except BrokenPipeError:
+        sys.exit(2)
+
+################################################################################
+
+if __name__ == '__main__':
+    git_retag()

skilleter_thingy/thingy/git.py

@@ -976,6 +976,13 @@ def author(commit):
 
 ################################################################################
 
+def commit_changes(commit='HEAD', path=None):
+    """Return a list of the files changed in a commit"""
+
+    return git(['show', '--name-only', '--pretty=format:', commit], path=path)
+
+################################################################################
+
 def files(dir=None):
     """ Return the output from 'git ls-files' """
 

skilleter_thingy/thingy/git2.py

@@ -189,7 +189,27 @@ def tag():
 def tags():
     """ Return the list of tags in the current repo """
 
-    return git(['tag'])
+    return git(['tag', '--list'])
+
+################################################################################
+
+def tag_delete(tag, push=False):
+    """Delete a tag, optionally pushing the deletion"""
+
+    git(['tag', '-d', tag])
+
+    if push:
+        git(['push', '--delete', tag])
+
+################################################################################
+
+def tag_apply(tag, push=False):
+    """Apply a tag, optionally pushing it"""
+
+    git(['tag', tag])
+
+    if push:
+        git(['push', tag])
 
 ################################################################################
 
@@ -917,6 +937,13 @@ def author(commit):
 
 ################################################################################
 
+def commit_changes(commit='HEAD', path=None):
+    """Return a list of the files changed in a commit"""
+
+    return git(['show', '--name-only', '--pretty=format:', commit], path=path)
+
+################################################################################
+
 def files(dir=None):
     """ Return the output from 'git ls-files' """
 

{skilleter_thingy-0.1.15.dist-info → skilleter_thingy-0.1.17.dist-info}/METADATA

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

@@ -8,13 +8,14 @@ skilleter_thingy/ffind.py,sha256=XJwH27rTLI0-zGD-7s8viyg7_SZjJaq5Q7VBbJPSYSI,192
 skilleter_thingy/ggit.py,sha256=_gJo3Pqangdwszga2YMRshJLNI3eGFZ7aP0Fu68yqzU,2465
 skilleter_thingy/ggrep.py,sha256=0zFyo9pxmYCuWrJgcH3Sj2hr7qOi02ijQuJ5teLbvCI,5863
 skilleter_thingy/git_br.py,sha256=-N6TcN_KwsIGxzNejLalO126HufU8OtQfexdQydiuO4,5799
-skilleter_thingy/git_ca.py,sha256=ewHCGLWpY8SdG_4OFdZ-YFg1GCmCesgQRXTWGMba1Ok,4944
+skilleter_thingy/git_ca.py,sha256=ajPpmVsOsvBfMnf2P_8irUAa5N4a3cFQgLjN-by5LSg,4932
 skilleter_thingy/git_cleanup.py,sha256=8PAxf3ZeKYYAuiBZNHQrKd_PlYYs9_-OwrIWFCC8_xg,10201
 skilleter_thingy/git_co.py,sha256=0i8bOHJIA4zhyy_KWVWh8HbbEuQCKUAxASGZOdr_SYY,8205
 skilleter_thingy/git_common.py,sha256=ZjNkvIBRDGNLFYwOu9FjeqdDKJdm0sndX5QATtmq290,1879
 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_retag.py,sha256=70rbybb1M2sCUblmD2-iLVG0xdFq-Bl5HG0U1LRnAvs,1442
 skilleter_thingy/git_review.py,sha256=Vmepd1qHPM9eHYE19KNO0UWJIYhGhlwPlVBjbgFZ2PM,52448
 skilleter_thingy/git_update.py,sha256=nw-bnDFrMi7yNf7P6gGF8gzmJUjXU5PhWhOYPgApcX4,14350
 skilleter_thingy/git_wt.py,sha256=ZeflIastpy-ej7_qGxKQB6nlKsEHTjgEGg6z0I45Cck,2219
@@ -51,8 +52,8 @@ skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUs
 skilleter_thingy/thingy/dircolors.py,sha256=5NbXMsGWdABLvvZfB70VPmN6N5HyyihfpgoQq1NRJbg,12264
 skilleter_thingy/thingy/docker.py,sha256=9EFatudoVPfB1UbDEtzdJDB3o6ToHiNHv8-oLsUeqiQ,2449
 skilleter_thingy/thingy/files.py,sha256=oW6E6WWwVFSUPdrZnKMx7P_w_hh3etjoN7RrqvYHCHc,4705
-skilleter_thingy/thingy/git.py,sha256=5EYzj6kxXZCK8E7AhiNPOyLYydCB86amnU6uyDEPfS4,38902
-skilleter_thingy/thingy/git2.py,sha256=5sBGIa01PyidcyViNSAqcj5C97zbK7qwMM2RHQKZhqM,37141
+skilleter_thingy/thingy/git.py,sha256=MVhAJ3HPjmmPiPRLeU9lzYLKC473ir4nkpRAo3OUsw0,39168
+skilleter_thingy/thingy/git2.py,sha256=ZzAq3DvJS91E4ahJA5eQDx0ejeXbFv7sk8xy_iB-ue8,37895
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=jW-nbpdeswqEMTli7OmBv1J8XQsvFoMI0J33O6dOeu8,2529
@@ -61,9 +62,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.15.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.1.15.dist-info/METADATA,sha256=7fRlyFMGQ7jSFD75jREKT91ASXTssscVCDa1GJvVpt4,29914
-skilleter_thingy-0.1.15.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-skilleter_thingy-0.1.15.dist-info/entry_points.txt,sha256=eGQNF-s-RGnOAyJqz_f9EPS0ExGsBmAmzwb3FlSmZzM,2209
-skilleter_thingy-0.1.15.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.1.15.dist-info/RECORD,,
+skilleter_thingy-0.1.17.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.1.17.dist-info/METADATA,sha256=MhhZEYgQsEet5MfTLG2exA_H6Ra8HVDc4wZiRBt-tjY,29914
+skilleter_thingy-0.1.17.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+skilleter_thingy-0.1.17.dist-info/entry_points.txt,sha256=mklrWFvNKw9Hyem9RG3x0PoVYjlx2fDnJ3xWMTMOmfs,2258
+skilleter_thingy-0.1.17.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.1.17.dist-info/RECORD,,

{skilleter_thingy-0.1.15.dist-info → skilleter_thingy-0.1.17.dist-info}/WHEEL

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

{skilleter_thingy-0.1.15.dist-info → skilleter_thingy-0.1.17.dist-info}/entry_points.txt

@@ -15,6 +15,7 @@ git-common = skilleter_thingy:git_common.git_common
 git-hold = skilleter_thingy:git_hold.git_hold
 git-mr = skilleter_thingy:git_mr.git_mr
 git-parent = skilleter_thingy:git_parent.git_parent
+git-retag = skilleter_thingy:git_retag.git_retag
 git-review = skilleter_thingy:git_review.git_review
 git-update = skilleter_thingy:git_update.git_update
 git-wt = skilleter_thingy:git_wt.git_wt