Add gerrit review support

Author: nikitavbv

git_repo/repo.py

@@ -426,17 +426,18 @@ def request_edition(repository, from_branch, onto_target):
 
         service = self.get_service(resolve_targets=('upstream', '{service}', 'origin'))
 
-        new_request = service.request_create(self.namespace,
+        print_iter(service.request_create(
+                self.namespace,
                 self.repo_name,
                 self.local_branch,
                 self.remote_branch,
                 self.title,
                 self.message,
                 self._auto_slug,
-                request_edition)
-        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))
+                request_edition
+            )
+        )
+
         return 0
 
     @register_action('request', 'fetch')

git_repo/services/ext/gerrit.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from ...exceptions import ResourceNotFoundError
 from ..service import register_target, RepositoryService
 
 from gerritclient import client
@@ -92,3 +93,38 @@ def get_parent_project_url(self, namespace, repo, rw=True):
         # Gerrit parent project concept is quite different from other services,
         # so it is better to always return None here
         return None
+
+    def request_create(self, onto_user, onto_repo, from_branch, onto_branch=None, title=None, description=None, auto_slug=False, edit=None):
+        from_branch = from_branch or self.repository.active_branch.name
+        onto_branch = onto_branch or 'HEAD:refs/for/' + from_branch
+        remote = self.repository.remote(self.name)
+        info, lines = self.push(remote, onto_branch)
+        new_changes = []
+        new_changes_lines = False
+        for line in lines:
+            if line.startswith('remote:'):
+                line = line[len('remote:'):].strip()
+
+                if 'New Changes' in line:
+                    new_changes_lines = True
+
+                if new_changes_lines and self.fqdn in line:
+                    url = line.split(' ')[0]
+                    new_changes.append(url)
+
+        if len(new_changes) > 0:
+            yield 'Created new review request of `{local}` onto `{project}:{remote}`'.format(
+                local = from_branch,
+                project = '/'.join([onto_user, onto_repo]),
+                remote = onto_branch
+            )
+            yield 'with changeset {} available at {}'
+            for url in new_changes:
+                yield [url, url.split('/')[-1]]
+        else:
+            yield 'Review request of `{local}` was not created'.format(
+                local = from_branch
+            )
+            yield '{} -> {}: {}'
+            for element in info:
+                yield [element.local_ref, element.remote_ref_string, element.summary]

git_repo/services/service.py

@@ -11,6 +11,7 @@
 from git import RemoteProgress, config as git_config
 from progress.bar import IncrementalBar as Bar
 
+from enum import Enum
 from urllib.parse import ParseResult
 from subprocess import call
 
@@ -32,8 +33,18 @@
 
 class ProgressBar(RemoteProgress): # pragma: no cover
     '''Nice looking progress bar for long running commands'''
-    def setup(self, repo_name):
-        self.bar = Bar(message='Pulling from {}'.format(repo_name), suffix='')
+
+    class Action(Enum):
+        PULL = 1
+        PUSH = 2
+
+    def setup(self, repo_name, action=Action.PULL):
+        if action == ProgressBar.Action.PULL:
+            message = 'Pulling from {}'.format(repo_name)
+        elif action == ProgressBar.Action.PUSH:
+            message = 'Pushing to {}'.format(repo_name)
+
+        self.bar = Bar(message=message, suffix='')
 
     def update(self, op_code, cur_count, max_count=100, message=''):
         #log.info("{}, {}, {}, {}".format(op_code, cur_count, max_count, message))
@@ -311,6 +322,21 @@ def pull(self, remote, branch=None):
             remote.pull(progress=pb)
         print()
 
+    def push(self, remote, branch=None):
+        '''Push a repository
+        :param remote: git-remote instance
+        :param branch: name of the branch to push
+        :return: PushInfo, git push output lines
+        '''
+        pb = ProgressBar()
+        pb.setup(self.name, ProgressBar.Action.PUSH)
+        if branch:
+            result = remote.push(branch, progress=pb)
+        else: #pragma: no cover
+            result = remote.push(progress=pb)
+        print()
+        return result, pb.other_lines
+
     def fetch(self, remote, remote_branch, local_branch, force=False):
         '''Pull a repository
         :param remote: git-remote instance

tests/helpers.py

@@ -804,6 +804,35 @@ def test_edit(repository, from_branch):
                     edit=test_edit)
                 return request
 
+    def action_request_create_by_push(self, namespace, repository, branch, remote_ref):
+        local_slug = self.service.format_path(namespace=namespace, repository=repository, rw=True)
+        self.repository.create_remote('all', url=local_slug)
+        self.repository.create_remote(self.service.name, url=local_slug)
+
+        with self.mockup_git(namespace, repository):
+            self.set_mock_popen_commands([
+                ('git version', b'git version 2.7.4', b'', 0),
+                ('git push --porcelain --progress {} HEAD:{}'.format(self.service.name, remote_ref), b'', '\n'.join([
+                    'Counting objects: 6, done.',
+                    'Delta compression using up to 2 threads.',
+                    'Compressing objects: 100% (6/6), done.',
+                    'Writing objects: 100% (6/6), 515 bytes | 0 bytes/s, done.',
+                    'Total 6 (delta 4), reused 0 (delta 0)',
+                    'remote: Resolving deltas: 100% (4/4)',
+                    'remote: Processing changes: new: 1, refs: 1, done',
+                    'remote: ',
+                    'remote: New Changes:',
+                    'remote:   https://{}/391808 One more test'.format(self.service.fqdn),
+                    'remote: ',
+                    'To {}'.format(local_slug),
+                    '*	HEAD:refs/for/{}	[new branch]'.format(branch),
+                    'Done'
+                ]).encode('utf-8'), 0)
+            ])
+            with self.recorder.use_cassette(self._make_cassette_name()):
+                self.service.connect()
+                self.service.request_create(namespace, repository, branch)
+
     def action_gist_list(self, gist=None, gist_list_data=[]):
         with self.recorder.use_cassette(self._make_cassette_name()):
             self.service.connect()

tests/integration/cassettes/test_gerrithub_test_01_review.json

@@ -0,0 +1,48 @@
+{
+  "http_interactions": [
+    {
+      "recorded_at": "2017-12-15T14:57:54",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "application/json",
+          "Accept-Encoding": "identity",
+          "Authorization": "Basic UGhhbnRvbS00MjovRk45NTI2TE84MkxYTXJucWJUNWE3Y25wSkY4b2hVTVFRQ1l6TkgzTVE=",
+          "Connection": "keep-alive",
+          "Content-Type": "application/json",
+          "User-Agent": "python-requests/2.18.2"
+        },
+        "method": "GET",
+        "uri": "https://review.gerrithub.io/a/config/server/version"
+      },
+      "response": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ")]}'\n\"2.13.6-3044-g7e9c06d\"\n"
+        },
+        "headers": {
+          "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
+          "Connection": "close",
+          "Content-Disposition": "attachment",
+          "Content-Length": "28",
+          "Content-Type": "application/json;charset=utf-8",
+          "Date": "Fri, 15 Dec 2017 14:57:54 GMT",
+          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
+          "Pragma": "no-cache",
+          "Server": "Apache/2.4.6 (CentOS)",
+          "Set-Cookie": "JSESSIONID=11nhmra540f822wlpl1srbr9s;Path=/;Secure",
+          "X-Content-Type-Options": "nosniff"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://review.gerrithub.io/a/config/server/version"
+      }
+    }
+  ],
+  "recorded_with": "betamax/0.5.1"
+}

tests/integration/test_gerrit.py

@@ -30,3 +30,9 @@ def get_requests_session(self):
     def test_00_clone(self):
         self.action_clone(namespace='TestUser',
                           repository='DemoRepository')
+
+    def test_01_review(self):
+        self.action_request_create_by_push(namespace='TestUser',
+                                           repository='DemoRepository',
+                                           branch='master',
+                                           remote_ref='refs/for/master')