🚧 Improves the request create function

improves:

git hub request create
git hub request foo/bar create

so it looks up the first ref containing the requested branch, and
returns the matching remote.

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

Author: guyzmo

git_repo/repo.py

@@ -167,13 +167,13 @@ def _guess_repo_slug(self, repository, service, resolve_targets=None):
                         if url.endswith('.git'):
                             url = url[:-4]
                         *_, user, name = url.split('/')
-                        self.set_repo_slug('/'.join([user, name]))
+                        self.set_repo_slug('/'.join([user, name]), auto=True)
                         return
                     elif url.startswith('git@'):
                         if url.endswith('.git'):
                             url = url[:-4]
                         _, repo_slug = url.split(':')
-                        self.set_repo_slug(repo_slug)
+                        self.set_repo_slug(repo_slug, auto=True)
                         return
 
     def get_service(self, lookup_repository=True, resolve_targets=None):
@@ -223,8 +223,9 @@ def set_verbosity(self, verbose): # pragma: no cover
         log.addHandler(logging.StreamHandler())
 
     @store_parameter('<user>/<repo>')
-    def set_repo_slug(self, repo_slug):
+    def set_repo_slug(self, repo_slug, auto=False):
         self.repo_slug = EXTRACT_URL_RE.sub('', repo_slug) if repo_slug else repo_slug
+        self._auto_slug = auto
         if not self.repo_slug:
             self.user_name = None
             self.repo_name = None
@@ -443,7 +444,7 @@ def request_edition(repository, from_branch):
                 self.remote_branch,
                 self.title,
                 self.message,
-                self.repo_slug != None,
+                self._auto_slug,
                 request_edition)
         log.info('Successfully created request of `{local}` onto `{}:{remote}`, with id `{ref}`!'.format(
             '/'.join([self.user_name, self.repo_name]),

git_repo/services/ext/github.py

@@ -221,6 +221,28 @@ 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:
@@ -241,10 +263,13 @@ 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'
-        if self.username != repository.owner.login:
-            from_branch = ':'.join([self.username, from_branch])
+        from_ref = self._convert_username_into_ref(user, from_branch)
+        if user != repository.owner.login:
+            from_branch = ':'.join([user, from_branch])
+
+        # translate from github username to git remote name
         if not title and not description and edit:
-            title, description = edit(self.repository, from_branch)
+            title, description = edit(self.repository, from_ref)
             if not title and not description:
                 raise ArgumentError('Missing message for request creation')
         try: