🔥 Got rid of extracts_ref

Author: guyzmo

git_repo/services/service.py

@@ -251,23 +251,13 @@ def _convert_user_into_remote(self, username, exclude=['all']):
         # builds a ref with an username and a branch
         # this method parses the repository's remotes to find the url matching username
         # and containing the given branch and returns the corresponding ref
-
         remotes = {remote.name: list(remote.urls) for remote in self.repository.remotes}
-        for name in ('upstream', self.name) + tuple(remotes.keys()):
+        for name in (self.name, 'upstream') + tuple(remotes.keys()):
             if name in remotes and name not in exclude:
                 for url in remotes[name]:
-                    if self.fqdn in url and username == url.split(':')[1].split('/')[0]:
+                    if self.fqdn in url and username == url.split('/')[-2].split(':')[-1]:
                         yield name
 
-    def _extracts_ref(self, user, from_branch):
-        for name in self._convert_user_into_remote(user):
-            ref_name = '{}/{}'.format(name, from_branch)
-            for ref in self.repository.refs:
-                if ref.name.endswith(ref_name):
-                    return ref
-
-        raise ArgumentError('Could not find a remote for user {} containing branch {}'.format(username))
-
     def format_path(self, repository, namespace=None, rw=False):
         '''format the repository's URL