skilleter-thingy 0.2.12__py3-none-any.whl → 0.2.13__py3-none-any.whl

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.12.dist-info → skilleter_thingy-0.2.13.dist-info}/METADATA

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

@@ -42,7 +42,7 @@ skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUs
 skilleter_thingy/thingy/dircolors.py,sha256=aBcq9ci855GSOIjrZWm8kG0ksCodvUmc4FlIOEOyBcA,12292
 skilleter_thingy/thingy/docker.py,sha256=zFgLLGAmqGsBdy9SWhl6BVkPyng9vZygPe7dJylkTEc,2533
 skilleter_thingy/thingy/files.py,sha256=jNnLpkhfmZ3W2uqdQvt-zI27FSwBLBERwAbsVeQ2TTs,4708
-skilleter_thingy/thingy/git.py,sha256=XvP3vfNCgFEpmomdNwzs0Eu7aVKz1umzXre5WJGx2qQ,42753
+skilleter_thingy/thingy/git.py,sha256=NTZv9um6-Yigqdt-O9WTNxA19LyNTXw9IunrdflEpoM,43036
 skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
 skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
 skilleter_thingy/thingy/popup.py,sha256=hNfA9yh4jCv2su8XK33udcTWwgf98noBdYRRkFX1mxc,2517
@@ -51,9 +51,9 @@ skilleter_thingy/thingy/run.py,sha256=mqafCzW9op_xKCt8OY3jJ6YltmoOJGh44vzl667mww
 skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
 skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
 skilleter_thingy/thingy/venv_template.py,sha256=ZfUvi8qFNGrk7J030Zy57xjwMtfIArJyqa-MqafyjVk,1016
-skilleter_thingy-0.2.12.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
-skilleter_thingy-0.2.12.dist-info/METADATA,sha256=vgy6l2zwfqwBXzrl93XYWSsh7VdaJcZigTlwz-lGYUo,28914
-skilleter_thingy-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-skilleter_thingy-0.2.12.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
-skilleter_thingy-0.2.12.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
-skilleter_thingy-0.2.12.dist-info/RECORD,,
+skilleter_thingy-0.2.13.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.2.13.dist-info/METADATA,sha256=p-NDmQvDF8A6oO5s1Lx1VIKmApg1e2f1VfyJsKqfTg8,28914
+skilleter_thingy-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.2.13.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
+skilleter_thingy-0.2.13.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.2.13.dist-info/RECORD,,