skilleter-thingy 0.1.15__tar.gz → 0.1.17__tar.gz

{skilleter_thingy-0.1.15 → skilleter_thingy-0.1.17}/PKG-INFO

@@ -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 → skilleter_thingy-0.1.17}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.1.15"
+version = "0.1.17"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},
@@ -57,6 +57,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"

{skilleter_thingy-0.1.15 → skilleter_thingy-0.1.17}/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-0.1.17/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-0.1.15 → skilleter_thingy-0.1.17}/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-0.1.15 → skilleter_thingy-0.1.17}/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 → skilleter_thingy-0.1.17}/skilleter_thingy.egg-info/PKG-INFO

@@ -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 → skilleter_thingy-0.1.17}/skilleter_thingy.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ skilleter_thingy/git_common.py
 skilleter_thingy/git_hold.py
 skilleter_thingy/git_mr.py
 skilleter_thingy/git_parent.py
+skilleter_thingy/git_retag.py
 skilleter_thingy/git_review.py
 skilleter_thingy/git_update.py
 skilleter_thingy/git_wt.py

{skilleter_thingy-0.1.15 → skilleter_thingy-0.1.17}/skilleter_thingy.egg-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