skilleter-thingy 0.2.4__tar.gz → 0.2.6__tar.gz

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.4
+Version: 0.2.6
 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.2.4 → skilleter_thingy-0.2.6}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.2.4"
+version = "0.2.6"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/git_co.py

@@ -105,11 +105,11 @@ def checkout_matching_branch(args, branchname):
     if args.exact:
         commits = [branchname] if git.iscommit(branchname, remote=True) else []
 
-        logging.info(f'Exact match required: {commits}')
+        logging.info('Exact match required: %s', commits)
     elif git.iscommit(branchname, remote=True):
         commits = [branchname]
 
-        logging.info(f'Exact match found for {branchname}')
+        logging.info('Exact match found for %s', branchname)
     else:
         commits = git.matching_branch(branchname)
 
@@ -164,7 +164,7 @@ def checkout_matching_branch(args, branchname):
                             colour.write(f'ERROR: Most recent commit on {commit} is {author} - Use the --force option to force-update your own branch!')
                             sys.exit(1)
 
-                    colour.write('Removing existing [BLUE:%s] branch' % commit)
+                    colour.write('Removing existing [BLUE:{commit}] branch')
                     git.delete_branch(commit, force=True)
             else:
                 colour.write(f'No corresponding remote branch [BLUE:{remote_branch}] exists')
@@ -186,7 +186,7 @@ def checkout_matching_branch(args, branchname):
                 print(text)
 
     elif not commits:
-        colour.write('[BOLD]No branches or commits matching [NORMAL][BLUE]%s[NORMAL]' % branchname)
+        colour.write(f'[BOLD]No branches or commits matching [NORMAL][BLUE]{branchname}[NORMAL]')
     else:
         colour.write('[BOLD]Multiple matches for [NORMAL][BLUE]%s[NORMAL]: %s' % (branchname, ', '.join(commits)))
 
@@ -198,11 +198,10 @@ def main():
 
     args = parse_arguments()
 
-    try:
-        if args.branch:
-            git.checkout(args.branchname[0], create=True)
-        else:
-            checkout_matching_branch(args, args.branchname[0])
+    if args.branch:
+        git.checkout(args.branchname[0], create=True)
+    else:
+        checkout_matching_branch(args, args.branchname[0])
 
 ################################################################################
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/git_hold.py

@@ -61,7 +61,7 @@ def archive_branches(branches):
     for branch in branches:
         tag_name = archive_tag_name(branch)
 
-        git.set_tag(tag_name, branch)
+        git.tag_apply(tag_name, branch)
         git.delete_branch(branch, force=True)
 
     for remote in git.remotes():
@@ -107,7 +107,7 @@ def restore_archive_branches(branches):
         archive_tag_names.append(archive_tag)
 
         git.checkout(branch, commit=archive_tag)
-        git.delete_tag(archive_tag)
+        git.tag_delete(archive_tag)
 
     for remote in git.remotes():
         git.push(repository=remote, delete=True, refspec=archive_tag_names)

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/git_retag.py

@@ -14,6 +14,7 @@ import sys
 import argparse
 
 import thingy.git2 as git
+import thingy.colour as colour
 
 ################################################################################
 
@@ -44,7 +45,7 @@ def main():
 
     # Apply the tag
 
-    git.tag_apply(tag, push=args.push)
+    git.tag_apply(tag, 'HEAD', push=args.push)
 
 ################################################################################
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/git_wt.py

@@ -15,6 +15,7 @@ import argparse
 import os
 
 import thingy.git2 as git
+import thingy.colour as colour
 
 ################################################################################
 

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/thingy/git.py

@@ -169,14 +169,14 @@ def tags():
 
 ################################################################################
 
-def set_tag(tag, commit):
+def tag_apply(tag, commit):
     """ Apply a tag to a commit """
 
     return git(['tag', tag, commit])
 
 ################################################################################
 
-def delete_tag(tag):
+def tag_delete(tag):
     """ Delete a tag """
 
     return git(['tag', '--delete', tag])

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/thingy/git2.py

@@ -229,10 +229,15 @@ def tag_delete(tag, push=False, path=None):
 
 ################################################################################
 
-def tag_apply(tag, push=False, path=None):
+def tag_apply(tag, commit=None, push=False, path=None):
     """Apply a tag, optionally pushing it"""
 
-    git(['tag', tag], path=path)
+    cmd = ['tag', tag]
+
+    if commit:
+        cmd.append(commit)
+
+    git(cmd, path=path)
 
     if push:
         git(['push', 'origin', tag], path=path)
@@ -268,7 +273,7 @@ def pull(repo=None, all=False, path=None):
 
 ################################################################################
 
-def checkout(branch, create=False, path=None):
+def checkout(branch, create=False, commit=None, path=None):
     """ Checkout a branch (optionally creating it) """
 
     cmd = ['checkout']
@@ -278,6 +283,9 @@ def checkout(branch, create=False, path=None):
 
     cmd.append(branch)
 
+    if commit:
+        cmd.append(commit)
+
     return git(cmd, path=path)
 
 ################################################################################

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy/thingy/run.py

@@ -23,7 +23,6 @@ import subprocess
 import threading
 import shlex
 
-import thingy.colour as colour
 import thingy.tidy as tidy
 
 ################################################################################

{skilleter_thingy-0.2.4 → skilleter_thingy-0.2.6}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.4
+Version: 0.2.6
 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