Do the SHA normalisation in a central place

Author: frou

src/base.py

@@ -61,7 +61,7 @@ def parse_line(cls, line):
             """
         # re's module-level functions like match(...) internally cache the compiled form of pattern strings.
         m = re.match(pattern, line)
-        return m.groupdict() if m else {}
+        return cls.postprocess_parse_result(m)
 
     # @todo Add a test for the `parse_line_with_relative_date` function in test_parsing.py
     @classmethod
@@ -83,7 +83,19 @@ def parse_line_with_relative_date(cls, line):
             """
         # re's module-level functions like match(...) internally cache the compiled form of pattern strings.
         m = re.match(pattern, line)
-        return m.groupdict() if m else {}
+        return cls.postprocess_parse_result(m)
+
+    @classmethod
+    def postprocess_parse_result(cls, match):
+        if match:
+            d = match.groupdict()
+            # The SHA output by `git blame` may have a leading caret to indicate that it
+            # is a "boundary commit". That needs to be stripped before passing the SHA
+            # back to git CLI commands for other purposes.
+            d["sha_normalised"] = d["sha"].strip("^")
+            return d
+        else:
+            return {}
 
     def handle_phantom_button(self, href):
         url = urlparse(href)

src/blame.py

@@ -68,15 +68,11 @@ def run(self, edit, prevving=False, fixed_row_num=None, sha_skip_list=[]):
                 )
                 return
             sha = blame["sha"]
+            sha_normalised = blame["sha_normalised"]
             author = blame["author"]
             date = blame["date"]
             time = blame["time"]
 
-            # The SHA output by `git blame` may have a leading caret to indicate that it
-            # is a "boundary commit". That needs to be stripped before passing the SHA
-            # back to git CLI commands for other purposes.
-            sha_normalised = sha.strip("^")
-
             if sha_skip_list:
                 recently_skipped_sha = sha_skip_list[-1]
                 if sha_normalised == recently_skipped_sha:

tests/test_parsing.py

@@ -6,13 +6,13 @@
 # This strange form of import is required because our ST package name has a space in it.
 base = importlib.import_module("Git blame.src.base")
 
-# NOTE: The sample git-blame CLI outputs were taken from the https://github.com/sublimelsp/LSP
-# repo because they exhibit different numbers of components in author names.
-
 
 class TestParsing(unittest.TestCase):
     def test_git_blame_cli_output_parsing(self):
         samples = [
+            # NOTE: This section of sample git-blame CLI outputs were taken from the
+            # https://github.com/sublimelsp/LSP repo because they exhibit different
+            # numbers of components in author names:
             (
                 r"""4a3eb02f plugin/diagnostics.py (Tom van Ommeren  2019-11-27 21:42:13 +0100   1) import html""",
                 {
@@ -21,6 +21,7 @@ def test_git_blame_cli_output_parsing(self):
                     "file": "plugin/diagnostics.py",
                     "line_number": "1",
                     "sha": "4a3eb02f",
+                    "sha_normalised": "4a3eb02f",
                     "time": "21:42:13",
                     "timezone": "+0100",
                 },
@@ -33,6 +34,7 @@ def test_git_blame_cli_output_parsing(self):
                     "file": "plugin/diagnostics.py",
                     "line_number": "114",
                     "sha": "c937eff9",
+                    "sha_normalised": "c937eff9",
                     "time": "14:29:47",
                     "timezone": "+0100",
                 },
@@ -45,10 +47,27 @@ def test_git_blame_cli_output_parsing(self):
                     "file": "plugin/diagnostics.py",
                     "line_number": "272",
                     "sha": "16a30de1",
+                    "sha_normalised": "16a30de1",
                     "time": "08:34:46",
                     "timezone": "+0200",
                 },
             ),
+            #
+            # A "boundary commit" SHA:
+            #
+            (
+                r"""^ad61094 main.go (Duncan Holm 2016-01-18 21:22:16 +0000 1) package main""",
+                {
+                    "author": "Duncan Holm",
+                    "date": "2016-01-18",
+                    "file": "main.go",
+                    "line_number": "1",
+                    "sha": "^ad61094",
+                    "sha_normalised": "ad61094",
+                    "time": "21:22:16",
+                    "timezone": "+0000",
+                },
+            ),
         ]
         for cli_output_line, expected_result in samples:
             self.assertEqual(