Bugfix in regexp to work with git 1.8 output

The screen output of 'git branch -vv' changed between version 1.8 and 2.10.
Update the regexp parsing this output to be compatible with both versions. Add
new unit test for this output.

Testing:
    make test - pass, 1 skip - python2/3
    manual testing - escomp-cesm, clm-demo, cesm-demo, checkout, status - ok

Author: bandre-ucar

manic/repository_git.py

@@ -38,7 +38,8 @@ class GitRepository(Repository):
 
     # match XYZ of '* (HEAD detached at {XYZ}):
     # e.g. * (HEAD detached at origin/feature-2)
-    RE_DETACHED = re.compile(r'\* \([\w]+[\s]+detached at ([\w\-./]+)\)')
+    RE_DETACHED = re.compile(
+        r'\* \((?:[\w]+[\s]+)?detached (?:at|from) ([\w\-./]+)\)')
 
     # match tracking reference info, return XYZ from [XYZ]
     # e.g. [origin/master]

test/test_unit_repository_git.py

@@ -6,6 +6,7 @@
 already in the python path.
 
 """
+# pylint: disable=too-many-lines,protected-access
 
 from __future__ import absolute_import
 from __future__ import unicode_literals
@@ -22,7 +23,12 @@
 from manic.externals_description import ExternalsDescriptionDict
 from manic.global_constants import EMPTY_STR
 
-# pylint: disable=W0212
+# pylint: disable=C0103
+GIT_BRANCH_OUTPUT_DETACHED_BRANCH_v1_8 = '''
+* (detached from origin/feature2) 36418b4 Work on feature2
+  master                          9b75494 [origin/master] Initialize repository.
+'''
+# pylint: enable=C0103
 
 
 GIT_BRANCH_OUTPUT_DETACHED_BRANCH = '''
@@ -126,6 +132,16 @@ def test_ref_detached_branch(self):
             git_output)
         self.assertEqual(result, expected)
 
+    def test_ref_detached_branch_v1_8(self):
+        """Test that we can identify ref is detached from a remote branch
+
+        """
+        git_output = GIT_BRANCH_OUTPUT_DETACHED_BRANCH_v1_8
+        expected = 'origin/feature2'
+        result = self._repo._current_ref_from_branch_command(
+            git_output)
+        self.assertEqual(result, expected)
+
     def test_ref_tracking_branch(self):
         """Test that we correctly identify we are on a tracking branch
         """
@@ -604,9 +620,12 @@ class TestGitRegExp(unittest.TestCase):
     def setUp(self):
         """Common constans
         """
-        self._detached_tmpl = string.Template(
+        self._detached_git_v2_tmpl = string.Template(
             '* (HEAD detached at $ref) 36418b4 Work on feature-2')
 
+        self._detached_git_v1_tmpl = string.Template(
+            '* (detached from $ref) 36418b4 Work on feature-2')
+
         self._tracking_tmpl = string.Template(
             '* feature-2 36418b4 [$ref] Work on feature-2')
 
@@ -617,7 +636,11 @@ def test_re_detached_alphnum(self):
         """Test re correctly matches alphnumeric (basic debugging)
         """
         value = 'feature2'
-        input_str = self._detached_tmpl.substitute(ref=value)
+        input_str = self._detached_git_v2_tmpl.substitute(ref=value)
+        match = GitRepository.RE_DETACHED.search(input_str)
+        self.assertIsNotNone(match)
+        self.assertEqual(match.group(1), value)
+        input_str = self._detached_git_v1_tmpl.substitute(ref=value)
         match = GitRepository.RE_DETACHED.search(input_str)
         self.assertIsNotNone(match)
         self.assertEqual(match.group(1), value)
@@ -626,7 +649,11 @@ def test_re_detached_underscore(self):
         """Test re matches with underscore
         """
         value = 'feature_2'
-        input_str = self._detached_tmpl.substitute(ref=value)
+        input_str = self._detached_git_v2_tmpl.substitute(ref=value)
+        match = GitRepository.RE_DETACHED.search(input_str)
+        self.assertIsNotNone(match)
+        self.assertEqual(match.group(1), value)
+        input_str = self._detached_git_v1_tmpl.substitute(ref=value)
         match = GitRepository.RE_DETACHED.search(input_str)
         self.assertIsNotNone(match)
         self.assertEqual(match.group(1), value)
@@ -635,7 +662,11 @@ def test_re_detached_hyphen(self):
         """Test re matches -
         """
         value = 'feature-2'
-        input_str = self._detached_tmpl.substitute(ref=value)
+        input_str = self._detached_git_v2_tmpl.substitute(ref=value)
+        match = GitRepository.RE_DETACHED.search(input_str)
+        self.assertIsNotNone(match)
+        self.assertEqual(match.group(1), value)
+        input_str = self._detached_git_v1_tmpl.substitute(ref=value)
         match = GitRepository.RE_DETACHED.search(input_str)
         self.assertIsNotNone(match)
         self.assertEqual(match.group(1), value)
@@ -644,7 +675,11 @@ def test_re_detached_period(self):
         """Test re matches .
         """
         value = 'feature.2'
-        input_str = self._detached_tmpl.substitute(ref=value)
+        input_str = self._detached_git_v2_tmpl.substitute(ref=value)
+        match = GitRepository.RE_DETACHED.search(input_str)
+        self.assertIsNotNone(match)
+        self.assertEqual(match.group(1), value)
+        input_str = self._detached_git_v1_tmpl.substitute(ref=value)
         match = GitRepository.RE_DETACHED.search(input_str)
         self.assertIsNotNone(match)
         self.assertEqual(match.group(1), value)
@@ -653,7 +688,11 @@ def test_re_detached_slash(self):
         """Test re matches /
         """
         value = 'feature/2'
-        input_str = self._detached_tmpl.substitute(ref=value)
+        input_str = self._detached_git_v2_tmpl.substitute(ref=value)
+        match = GitRepository.RE_DETACHED.search(input_str)
+        self.assertIsNotNone(match)
+        self.assertEqual(match.group(1), value)
+        input_str = self._detached_git_v1_tmpl.substitute(ref=value)
         match = GitRepository.RE_DETACHED.search(input_str)
         self.assertIsNotNone(match)
         self.assertEqual(match.group(1), value)