🚧 Improves request fetch function and refactor request create

Make it so the look up remote code is also used for fetching refs.

so now the mechanism is:

1. convert_user_into_remote()
2. extracts_ref (that returns a ref given an user and remote

Updated the request create code ; and the request fetch code

Signed-off-by: Guyzmo <[email protected]>

Author: guyzmo

git_repo/services/ext/github.py

@@ -221,28 +221,6 @@ def gist_delete(self, gist_id):
             raise ResourceNotFoundError('Could not find gist')
         gist.delete()
 
-    def _convert_username_into_ref(self, username, from_branch):
-        # 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
-        def exists_ref(ref_name):
-            # this function takes a given ref and returns true if it actually exists
-            for ref in self.repository.refs:
-                if ref.name.endswith(ref_name):
-                    return True
-            return False
-
-        remotes = {remote.name: list(remote.urls) for remote in self.repository.remotes}
-        for name in ('upstream', self.name) + tuple(remotes.keys()):
-            if name in remotes and name != 'all':
-                for url in remotes[name]:
-                    if self.fqdn in url and username == url.split(':')[1].split('/')[0]:
-                        ref = '{}/{}'.format(name, from_branch)
-                        if exists_ref(ref):
-                            return ref
-
-        raise ArgumentError('Could not find a remote for user {} containing branch {}'.format(username, from_branch))
-
     def request_create(self, user, repo, from_branch, onto_branch, title=None, description=None, auto_slug=False, edit=None):
         repository = self.gh.repository(user, repo)
         if not repository:
@@ -263,7 +241,8 @@ def request_create(self, user, repo, from_branch, onto_branch, title=None, descr
         # the branch we're currently working on
         if not onto_branch:
             onto_branch = repository.default_branch or 'master'
-        from_ref = self._convert_username_into_ref(user, from_branch)
+
+        from_ref = self._extracts_ref(user, from_branch)
         if user != repository.owner.login:
             from_branch = ':'.join([user, from_branch])
 
@@ -307,8 +286,9 @@ def request_fetch(self, user, repo, request, pull=False, force=False):
         if pull:
             raise NotImplementedError('Pull operation on requests for merge are not yet supported')
         try:
+            remote_names = list(self._convert_user_into_remote(user))
             for remote in self.repository.remotes:
-                if remote.name == self.name:
+                if remote.name in remote_names:
                     local_branch_name = 'requests/github/{}'.format(request)
                     self.fetch(
                         remote,

git_repo/services/service.py

@@ -226,6 +226,27 @@ def url_rw(self):
         url = self.ssh_url
         return url if '@' in url else '@'.join([self.git_user, url])
 
+    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()):
+            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]:
+                        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
 

tests/helpers.py

@@ -689,7 +689,8 @@ def action_request_create(self,
             namespace, repository, branch,
             title, description, service,
             create_repository='test_create_requests',
-            create_branch='pr-test'):
+            create_branch='pr-test',
+            auto_slug=False):
         '''
         Here we are testing the subcommand 'request create'.
 
@@ -739,6 +740,16 @@ def prepare_project_for_test():
                 self.repository.git.add('second_file')
                 self.repository.git.commit(message='Second commit')
                 self.repository.git.push(service, create_branch)
+            existing_remotes = [r.name for r in self.repository.remotes]
+            if 'all' in existing_remotes:
+                r_all = self.repository.remote('all')
+            else:
+                r_all = self.repository.create_remote('all', '')
+            for name in ('github', 'gitlab', 'bitbucket', 'gogs', 'upstream'):
+                if name not in existing_remotes:
+                    kw = dict(user=namespace, project=repository, host=name)
+                    self.repository.create_remote(name, 'git@{host}.com:{user}/{project}'.format(**kw))
+                    r_all.add_url('git@{host}.com:{user}/{project}'.format(**kw))
             yield
             if will_record:
                 self.service.delete(create_repository)
@@ -747,13 +758,17 @@ def prepare_project_for_test():
         with prepare_project_for_test():
             with self.recorder.use_cassette(cassette_name):
                 self.service.connect()
+                def test_edit(repository, from_branch):
+                    return "PR title", "PR body"
                 request = self.service.request_create(
-                        namespace,
-                        repository,
-                        branch,
-                        title,
-                        description
-                )
+                    namespace,
+                    repository,
+                    branch,
+                    create_branch,
+                    title=title,
+                    description=description,
+                    auto_slug=auto_slug,
+                    edit=test_edit)
                 return request
 
     def action_gist_list(self, gist=None, gist_list_data=[]):