Only parse remote branches in git.

Author: ericholscher

readthedocs/rtd_tests/tests/test_backend.py

@@ -24,19 +24,23 @@ def setUp(self):
         self.project.users.add(self.eric)
 
     def test_parse_branches(self):
-        data = """\
+        data = """
         develop
         master
         release/2.0.0
-        remotes/origin/2.0.X
-        remotes/origin/HEAD -> origin/master
-        remotes/origin/master
-        remotes/origin/release/2.0.0"""
-
-        expected_ids = [('develop', 'develop'), ('master', 'master'),
-                        ('release/2.0.0', 'release-2.0.0'),
-                        ('remotes/origin/2.0.X', '2.0.X'),
-                        ('remotes/origin/release/2.0.0', 'release-2.0.0')]
+        origin/2.0.X
+        origin/HEAD -> origin/master
+        origin/master
+        origin/release/2.0.0
+        """
+
+        expected_ids = [
+            ('develop', 'develop'), 
+            ('master', 'master'),
+            ('release/2.0.0', 'release-2.0.0'),
+            ('origin/2.0.X', '2.0.X'),
+            ('origin/release/2.0.0', 'release-2.0.0')
+        ]
         given_ids = [(x.identifier, x.verbose_name) for x in
                      self.project.vcs_repo().parse_branches(data)]
         assert expected_ids == given_ids

readthedocs/vcs_support/backends/git.py

@@ -104,39 +104,40 @@ def parse_tags(self, data):
 
     @property
     def branches(self):
-        retcode, stdout, err = self.run('git', 'branch', '-a')
+        # Only show remote branches
+        retcode, stdout, err = self.run('git', 'branch', '-r')
         # error (or no tags found)
         if retcode != 0:
             return []
         return self.parse_branches(stdout)
 
     def parse_branches(self, data):
         """
-        Parse output of git branch -a, eg:
-              develop
-              master
-            * release/2.0.0
-              rtd-jonas
-              remotes/origin/2.0.X
-              remotes/origin/HEAD -> origin/master
-              remotes/origin/develop
-              remotes/origin/master
-              remotes/origin/release/2.0.0
-              remotes/origin/release/2.1.0
+        Parse output of git branch -r, eg:
+              origin/2.0.X
+              origin/HEAD -> origin/master
+              origin/develop
+              origin/master
+              origin/release/2.0.0
+              origin/release/2.1.0
         """
         clean_branches = []
         raw_branches = csv.reader(StringIO(data), delimiter=' ')
         for branch in raw_branches:
             branch = filter(lambda f: f != '' and f != '*', branch)
-            branch = branch[0]
-            if branch.startswith('remotes/origin/'):
-                slug = branch[15:].replace('/', '-')
-                if slug in ['HEAD', self.fallback_branch]:
-                    continue
-                clean_branches.append(VCSVersion(self, branch, slug))
-            else:
-                slug = branch.replace('/', '-')
-                clean_branches.append(VCSVersion(self, branch, slug))
+            # Handle empty branches
+            if len(branch):
+                branch = branch[0]
+                if branch.startswith('origin/'):
+                    cut_len = len('origin/')
+                    slug = branch[cut_len:].replace('/', '-')
+                    if slug in ['HEAD', self.fallback_branch]:
+                        continue
+                    clean_branches.append(VCSVersion(self, branch, slug))
+                else:
+                    # Believe this is dead code.
+                    slug = branch.replace('/', '-')
+                    clean_branches.append(VCSVersion(self, branch, slug))
         return clean_branches
 
     def checkout(self, identifier=None):