skilleter-thingy 0.2.11__tar.gz → 0.2.13__tar.gz

{skilleter_thingy-0.2.11 → skilleter_thingy-0.2.13}/PKG-INFO

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

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

{skilleter_thingy-0.2.11 → skilleter_thingy-0.2.13}/skilleter_thingy/gitprompt.py

@@ -100,6 +100,9 @@ def colour_prompt(gitstate: dict):
     else:
         output.append('[REVERSE][GREEN]')
 
+    if output:
+        output.append(' ')
+
     return output
 
 ################################################################################
@@ -191,8 +194,6 @@ def git_status(colour_output: str, prompt_output: str):
     """ Catalogue the current state of the working tree then call the function
         to either output a suitable colour or the prompt text or both """
 
-    output = []
-
     # Get the working tree, just return if there's an error
 
     try:
@@ -241,12 +242,17 @@ def git_status(colour_output: str, prompt_output: str):
 
     # Set the output colour or output the prompt prefix
 
+    output = []
+
     if colour_output:
         output += colour_prompt(gitstate)
 
     if prompt_output or not colour_output:
         output.append(prompt_prefix(gitstate))
 
+    if output:
+        output.append(' ')
+
     return ''.join(output)
 
 ################################################################################
@@ -263,7 +269,7 @@ def main():
     output = git_status(args.colour, args.prompt)
 
     if output:
-        colour.write(f' {output} ', newline=False)
+        colour.write(output, newline=False)
 
 ################################################################################
 

{skilleter_thingy-0.2.11 → skilleter_thingy-0.2.13}/skilleter_thingy/thingy/git.py

@@ -595,13 +595,16 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False, path
         lines_del = 0 if p.group(2) == '-' else int(p.group(2))
 
         # Check for rename and get both old and new names
+        # The replace of '//' with '/' is to cope with the case where a file is moved
+        # to a parent or subdirectory where the git output will be 'PARENT/{SUBDIR => }/NAME'
+        # and the new name would otherwise be 'PARENT//NAME'
 
         if ' => ' in p.group(3):
             q = _DIFF_OUTPUT_RENAME_RE.fullmatch(p.group(3))
 
             if q:
-                old_filename = q.group(1) + q.group(2) + q.group(4)
-                new_filename = q.group(1) + q.group(3) + q.group(4)
+                old_filename = (q.group(1) + q.group(2) + q.group(4)).replace('//', '/')
+                new_filename = (q.group(1) + q.group(3) + q.group(4)).replace('//', '/')
             else:
                 old_filename, new_filename = p.group(3).split(' => ')
         else:

{skilleter_thingy-0.2.11 → skilleter_thingy-0.2.13}/skilleter_thingy.egg-info/PKG-INFO

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