🚧 Updates Github/Gitlab request create

* fixed from project vs onto project handling
* proper support of argumentless call
* more information about what's going on
* better determinism

Author: guyzmo

git_repo/repo.py

@@ -376,13 +376,13 @@ def do_request_list(self):
 
     @register_action('request', 'create')
     def do_request_create(self):
-        def request_edition(repository, from_branch):
+        def request_edition(repository, from_branch, onto_target):
             try:
                 commit = repository.commit(from_branch)
                 title, *body = commit.message.split('\n')
             except BadName:
                 log.error('Couldn\'t find local source branch {}'.format(from_branch))
-                return None
+                return None, None
             from tempfile import NamedTemporaryFile
             from subprocess import call
             with NamedTemporaryFile(
@@ -399,9 +399,13 @@ def request_edition(repository, from_branch):
                     '## Filled with commit:\n'
                     '## {}\n'
                     '####################################################\n'
+                    '## To be applied:\n'
+                    '##   from branch: {}\n'
+                    '##   onto project: {}\n'
+                    '####################################################\n'
                     '## * All lines starting with # will be ignored.\n'
                     '## * First non-ignored line is the title of the request.\n'
-                        ).format(title, '\n'.join(body), commit.name_rev).encode('utf-8'))
+                      ).format(title, '\n'.join(body), commit.name_rev, from_branch, onto_target).encode('utf-8'))
                 request_file.flush()
                 rv = call("{} {}".format(os.environ['EDITOR'], request_file.name), shell=True)
                 if rv != 0:
@@ -428,10 +432,7 @@ def request_edition(repository, from_branch):
                 self.message,
                 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]),
-            **new_request)
-        )
+        log.info('Successfully created request of `{local}` onto `{project}:{remote}`, with id `{ref}`!'.format(**new_request))
         if 'url' in new_request:
             log.info('available at: {url}'.format(**new_request))
         return 0

git_repo/services/ext/github.py

@@ -221,41 +221,65 @@ def gist_delete(self, gist_id):
             raise ResourceNotFoundError('Could not find gist')
         gist.delete()
 
-    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:
-            raise ResourceNotFoundError('Could not find repository `{}/{}`!'.format(user, repo))
+    def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=None, description=None, auto_slug=False, edit=None):
+        onto_project = self.gh.repository(onto_user, onto_repo)
+
+        if not onto_project:
+            raise ResourceNotFoundError('Could not find project `{}/{}`!'.format(onto_user, onto_repo))
+
+        from_reposlug = self.guess_repo_slug(self.repository, self)
+        if from_reposlug:
+            from_user, from_repo = from_reposlug.split('/')
+            if (onto_user, onto_repo) == (from_user, from_repo):
+                from_project = onto_project
+            else:
+                from_project = self.gh.repository(from_user, from_repo)
+        else:
+            from_project = None
+
+        if not from_project:
+            raise ResourceNotFoundError('Could not find project `{}`!'.format(from_user, from_repo))
+
         # when no repo slug has been given to `git-repo X request create`
-        if auto_slug:
-            # then chances are current repository is a fork of the target
-            # repository we want to push to
-            if repository.fork:
-                user = repository.parent.owner.login
-                repo = repository.parent.name
-                from_branch = from_branch or repository.parent.default_branch
+        # then chances are current project is a fork of the target
+        # project we want to push to
+        if auto_slug and onto_project.fork:
+            onto_user = onto_project.parent.owner.login
+            onto_repo = onto_project.parent.name
+            onto_project = self.gh.repository(onto_user, onto_repo)
+
         # if no onto branch has been defined, take the default one
         # with a fallback on master
         if not from_branch:
             from_branch = self.repository.active_branch.name
         # if no from branch has been defined, chances are we want to push
         # the branch we're currently working on
         if not onto_branch:
-            onto_branch = repository.default_branch or 'master'
+            onto_branch = onto_project.default_branch or 'master'
 
-        from_ref = self._extracts_ref(user, from_branch)
-        if user != repository.owner.login:
-            from_branch = ':'.join([user, from_branch])
+        from_target = '{}:{}'.format(from_user, from_branch)
+        onto_target = '{}/{}:{}'.format(onto_user, onto_project, onto_branch)
 
         # translate from github username to git remote name
         if not title and not description and edit:
-            title, description = edit(self.repository, from_ref)
+            title, description = edit(self.repository, from_branch, onto_target)
             if not title and not description:
                 raise ArgumentError('Missing message for request creation')
+
         try:
-            request = repository.create_pull(title,
+            request = onto_project.create_pull(title,
+                    head=from_target,
                     base=onto_branch,
-                    head=from_branch,
                     body=description)
+
+            return {
+                'local': from_branch,
+                'project': '/'.join([onto_user, onto_repo]),
+                'remote': onto_branch,
+                'ref': request.number,
+                'url': request.html_url
+            }
+
         except github3.models.GitHubError as err:
             if err.code == 422:
                 if err.message == 'Validation Failed':
@@ -272,9 +296,6 @@ def request_create(self, user, repo, from_branch, onto_branch, title=None, descr
                     raise ResourceError("Unhandled formatting error: {}".format(err.errors))
             raise ResourceError(err.message)
 
-        return {'local': from_branch, 'remote': onto_branch, 'ref': request.number,
-                'url': request.html_url}
-
     def request_list(self, user, repo):
         repository = self.gh.repository(user, repo)
         yield "{}\t{:<60}\t{}"

git_repo/services/ext/gitlab.py

@@ -257,37 +257,75 @@ def gist_delete(self, snippet):
 
         return snippet.delete()
 
-    def request_create(self, user, repo, local_branch, remote_branch, title, description=None, auto_slug=False):
+    def request_create(self, onto_user, onto_repo, from_branch, onto_branch, title=None, description=None, auto_slug=False, edit=None):
         try:
-            repository = self.gl.projects.get('/'.join([user, repo]))
-            if not repository:
-                raise ResourceNotFoundError('Could not find repository `{}/{}`!'.format(user, repo))
+            onto_project = self.gl.projects.get('/'.join([onto_user, onto_repo]))
+
+            if not onto_project:
+                raise ResourceNotFoundError('Could not find project `{}/{}`!'.format(onto_user, onto_repo))
+
+            from_reposlug = self.guess_repo_slug(self.repository, self)
+            if from_reposlug:
+                from_user, from_repo = from_reposlug.split('/')
+                if (onto_user, onto_repo) == (from_user, from_repo):
+                    from_project = onto_project
+                else:
+                    from_project = self.gl.projects.get('/'.join([from_user, from_repo]))
+            else:
+                from_project = None
+
+            if not from_project:
+                raise ResourceNotFoundError('Could not find project `{}/{}`!'.format(from_user, from_repo))
+
+            # when no repo slug has been given to `git-repo X request create`
+            # then chances are current project is a fork of the target
+            # project we want to push to
+            if auto_slug and 'forked_from_project' in onto_project.as_dict():
+                parent = self.gl.projects.get(onto_project.forked_from_project['id'])
+                onto_user, onto_repo = parent.namespace.path, parent.path
+                onto_project = self.gl.projects.get('/'.join([onto_user, onto_repo]))
+
+            # if no onto branch has been defined, take the default one
+            # with a fallback on master
+            if not from_branch:
+                from_branch = self.repository.active_branch.name
+            # if no from branch has been defined, chances are we want to push
+            # the branch we're currently working on
+            if not onto_branch:
+                onto_branch = onto_project.default_branch or 'master'
+
+            onto_target = '{}/{}:{}'.format(onto_user, onto_project.name, onto_branch)
+
+            # translate from gitlab username to git remote name
             if not title and not description and edit:
-                title, description = edit(repository, from_branch)
+                title, description = edit(self.repository, from_branch, onto_target)
                 if not title and not description:
                     raise ArgumentError('Missing message for request creation')
-            if not local_branch:
-                remote_branch = self.repository.active_branch.name or self.repository.active_branch.name
-            if not remote_branch:
-                local_branch = repository.master_branch or 'master'
+
             request = self.gl.project_mergerequests.create(
-                    project_id=repository.id,
-                    data= {
-                        'source_branch':local_branch,
-                        'target_branch':remote_branch,
-                        'title':title,
-                        'description':description
-                        }
-                    )
+                    project_id=from_project.id,
+                    data={
+                        'source_branch': from_branch,
+                        'target_branch': onto_branch,
+                        'target_project_id': onto_project.id,
+                        'title': title,
+                        'description': description
+                    }
+            )
+
+            return {
+                'local': from_branch,
+                'project': '/'.join([onto_user, onto_repo]),
+                'remote': onto_branch,
+                'url': request.web_url,
+                'ref': request.iid
+            }
+
         except GitlabGetError as err:
             raise ResourceNotFoundError(err) from err
         except Exception as err:
             raise ResourceError("Unhandled error: {}".format(err)) from err
 
-        return {'local': local_branch,
-                'remote': remote_branch,
-                'ref': request.iid}
-
     def request_list(self, user, repo):
         project = self.gl.projects.get('/'.join([user, repo]))
         yield "{:>3}\t{:<60}\t{:2}"