skilleter-thingy 0.0.50__tar.gz → 0.0.51__tar.gz

{skilleter_thingy-0.0.50/skilleter_thingy.egg-info → skilleter_thingy-0.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.50
+Version: 0.0.51
 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.0.50 → skilleter_thingy-0.0.51}/pyproject.toml

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

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.51}/skilleter_thingy/thingy/git.py

@@ -515,6 +515,13 @@ def difftool(commit_1=None, commit_2=None, files=None, tool=None):
 
 ################################################################################
 
+# Match 'git diff --numstat' output - first re splits into lines added, removed
+# and name. Second one is used if a file has been renamed, to get the old and
+# new name components.
+
+_DIFF_OUTPUT_RE = re.compile(r'(-|\d+)\s+(-|\d+)\s+(.*)')
+_DIFF_OUTPUT_RENAME_RE = re.compile('(.*)\{(.*) => (.*)\}(.*)')
+
 def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
     """ Return details of changes either in single commit (defaulting to the most
         recent one) or between two commits, optionally restricted a path or paths
@@ -523,22 +530,30 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
     """
 
     def parse_diff_output(result):
-        """Extract current filename and lines added/deleted from output from git diff --numstat"""
+        """Extract previous and current filename (which may be the same) and lines added/deleted
+           from output from git diff --numstat"""
+
+        p = _DIFF_OUTPUT_RE.fullmatch(result)
 
-        p = re.fullmatch(r'(-|\d+)\s+(-|\d+)\s+(.*)', result)
+        # Extract number of lines added/removed
 
         lines_ins = 0 if p.group(1) == '-' else int(p.group(1))
         lines_del = 0 if p.group(2) == '-' else int(p.group(2))
 
+        # Check for rename and get both old and new names
+
         if ' => ' in p.group(3):
-            filepath = p.group(3).split('{')[0]
-            filename = p.group(3).split(' => ')[1]
-            filename = filename.replace('}', '')
-            filename = os.path.join(filepath, filename)
+            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)
+            else:
+                old_filename, new_filename = p.group(3).split(' => ')
         else:
-            filename = p.group(3)
+            old_filename = new_filename = p.group(3)
 
-        return filename, lines_ins, lines_del
+        return old_filename, new_filename, lines_ins, lines_del
 
     # Either get changes between the two commits, or changes in the specified commit
 
@@ -588,22 +603,23 @@ def commit_info(commit_1=None, commit_2=None, paths=None, diff_stats=False):
         results = git(['diff', '--numstat'] + params)
 
         for result in results:
-            filename, lines_ins, lines_del = parse_diff_output(result)
+            old_filename, new_filename, lines_ins, lines_del = parse_diff_output(result)
 
-            info[filename]['deleted'] = lines_del
-            info[filename]['added'] = lines_ins
+            info[new_filename]['deleted'] = lines_del
+            info[new_filename]['added'] = lines_ins
 
         # Run git diff to get stats ignoring whitespace changes and add them
 
         results = git(['diff', '--numstat', '--ignore-all-space', '--ignore-blank-lines'] + params)
 
         for result in results:
-            filename, lines_ins, lines_del = parse_diff_output(result)
+            old_filename, new_filename, lines_ins, lines_del = parse_diff_output(result)
 
-            info[filename]['non-ws deleted'] = lines_del
-            info[filename]['non-ws added'] = lines_ins
+            info[new_filename]['non-ws deleted'] = lines_del
+            info[new_filename]['non-ws added'] = lines_ins
 
         # Fill in the blanks - files
+
         for filename in info:
             if 'deleted' not in info[filename]:
                 info[filename]['deleted'] = info[filename]['added'] = 0

{skilleter_thingy-0.0.50 → skilleter_thingy-0.0.51/skilleter_thingy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: skilleter_thingy
-Version: 0.0.50
+Version: 0.0.51
 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