fix(git): Status with branches that contain periods

Author: tony

libvcs/git.py

@@ -64,7 +64,7 @@ def extract_status(value):
             branch.head
             [\W]+
             (?P<branch_head>
-                [\w-]*
+                [/.\w-]*
             )
             
         )?
@@ -74,7 +74,7 @@ def extract_status(value):
             branch.upstream
             [\W]+
             (?P<branch_upstream>
-                [/\w-]*
+                [/.\w-]*
             )
         )?
         (
@@ -301,17 +301,20 @@ def update_repo(self):
             # Pull changes from the remote branch
             try:
                 process = self.run(['rebase', git_remote_name + '/' + git_tag])
-            except exc.CommandError:
-                # Rebase failed: Restore previous state.
-                self.run(['rebase', '--abort'])
-                if need_stash:
-                    self.run(['stash', 'pop', '--index', '--quiet'])
-
-                self.error(
-                    "\nFailed to rebase in: '%s'.\n"
-                    "You will have to resolve the conflicts manually" % self.path
-                )
-                return
+            except exc.CommandError as e:
+                if 'invalid_upstream' in str(e):
+                    self.error(e)
+                else:
+                    # Rebase failed: Restore previous state.
+                    self.run(['rebase', '--abort'])
+                    if need_stash:
+                        self.run(['stash', 'pop', '--index', '--quiet'])
+
+                    self.error(
+                        "\nFailed to rebase in: '%s'.\n"
+                        "You will have to resolve the conflicts manually" % self.path
+                    )
+                    return
 
             if need_stash:
                 try:

tests/test_git.py

@@ -287,6 +287,22 @@ def test_extract_status():
             '# branch.upstream moo/origin/myslash/remote',
             {"branch_upstream": 'moo/origin/myslash/remote'},
         ],
+        [
+            """
+            # branch.oid c3c5323abc5dca78d9bdeba6c163c2a37b452e69
+            # branch.head libvcs-0.4.0
+            # branch.upstream origin/libvcs-0.4.0
+            # branch.ab +0 -0
+            """,
+            {
+                "branch_oid": 'c3c5323abc5dca78d9bdeba6c163c2a37b452e69',
+                "branch_head": 'libvcs-0.4.0',
+                "branch_upstream": 'origin/libvcs-0.4.0',
+                "branch_ab": '+0 -0',
+                "branch_ahead": '0',
+                "branch_behind": '0',
+            },
+        ],
     ],
 )
 def test_extract_status_b(fixture, expected_result):