Add gerrit patchset fetch support

Author: nikitavbv

git_repo/services/ext/gerrit.py

@@ -25,6 +25,7 @@ def connect(self):
             self.create_connection()
         self.server_client = client.get_client('server', connection=self.connection)
         self.project_client = client.get_client('project', connection=self.connection)
+        self.change_client = client.get_client('change', connection=self.connection)
 
         try:
             self.server_client.get_version()
@@ -128,3 +129,26 @@ def request_create(self, onto_user, onto_repo, from_branch, onto_branch=None, ti
             yield '{} -> {}: {}'
             for element in info:
                 yield [element.local_ref, element.remote_ref_string, element.summary]
+
+    def request_fetch(self, user, repo, request, pull=False, force=False):
+        if 'refs/changes/' not in request:
+            if '/' in request:
+                change_id, patch_set = request.split('/')
+            else:
+                change_id = request
+                change = self.change_client.get_all(['change: {}'.format(change_id)], ['CURRENT_REVISION'])[0]
+                current_patchset = change['revisions'][change['current_revision']]
+                patch_set = current_patchset['_number']
+
+            if change_id[0] == 'I':
+                change_id = str(self.change_client.get_by_id(request)['_number'])
+
+            request = 'refs/changes/{}/{}/{}'.format(change_id[-2:], change_id, patch_set)
+        else:
+            change_id = request.split('/')[3]
+
+        remote = self.repository.remote(self.name)
+        local_branch_name = 'requests/{}/{}'.format(self.name, change_id)
+        self.fetch(remote, request, local_branch_name, force=force)
+
+        return local_branch_name

git_repo/services/service.py

@@ -337,15 +337,18 @@ def push(self, remote, branch=None):
         print()
         return result, pb.other_lines
 
-    def fetch(self, remote, remote_branch, local_branch, force=False):
+    def fetch(self, remote, branch, local_branch = None, force=False):
         '''Pull a repository
         :param remote: git-remote instance
         :param branch: name of the branch to pull
         '''
         pb = ProgressBar()
         pb.setup(self.name)
-        remote.fetch(':'.join([remote_branch, local_branch]),
-                update_head_ok=True, force=force, progress=pb)
+
+        if local_branch:
+            branch = ':'.join([branch, local_branch])
+
+        remote.fetch(branch, update_head_ok=True, force=force, progress=pb)
         print()
 
     def clone(self, user, repo, branch=None, rw=True):

tests/helpers.py

@@ -641,7 +641,14 @@ def action_request_list(self, namespace, repository, rq_list_data=[]):
             for i, rq in enumerate(rq_list_data):
                 assert requests[i] == rq
 
-    def action_request_fetch(self, namespace, repository, request, pull=False, fail=False, remote_branch='pull', local_branch='requests'):
+    def action_request_fetch(self, namespace, repository, request, pull=False, fail=False, remote_branch='pull', local_branch='requests', remote_ref=None, local_ref=None):
+        if remote_ref is None:
+            remote_ref = '{}/{}/head'.format(remote_branch, request)
+        if local_ref is None:
+            local_ref = '{}/{}'.format(local_branch, request)
+        additional_flags = ''
+        if not remote_ref.endswith('/head'):
+            additional_flags += '--update-head-ok '
         local_slug = self.service.format_path(namespace=namespace, repository=repository, rw=False)
         with self.recorder.use_cassette(self._make_cassette_name()):
             with self.mockup_git(namespace, repository):
@@ -663,11 +670,11 @@ def action_request_fetch(self, namespace, repository, request, pull=False, fail=
                         ' * [new branch]      master     -> {1}/{0}'.format(request, local_branch)]).encode('utf-8'),
                     0),
                     ('git version', b'git version 2.8.0', b'', 0),
-                    ('git fetch --progress -v {0} {2}/{1}/head:{3}/{1}'.format(
+                    ('git fetch --progress {0}-v {1} {2}:{3}'.format(
+                            additional_flags,
                             self.service.name,
-                            request,
-                            remote_branch,
-                            local_branch), b'', '\n'.join([
+                            remote_ref,
+                            local_ref), b'', '\n'.join([
                         'POST git-upload-pack (140 bytes)',
                         'remote: Counting objects: 8318, done.',
                         'remote: Compressing objects: 100% (3/3), done.',

tests/integration/cassettes/test_gerrithub_test_02_fetch_patchset.json

@@ -0,0 +1,177 @@
+{
+  "http_interactions": [
+    {
+      "recorded_at": "2017-12-20T12:16:57",
+      "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.10.0"
+        },
+        "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": "Wed, 20 Dec 2017 12:16:57 GMT",
+          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
+          "Pragma": "no-cache",
+          "Server": "Apache/2.4.6 (CentOS)",
+          "Set-Cookie": "JSESSIONID=jku5o0xf87zfuoa39kvtkwr;Path=/;Secure",
+          "X-Content-Type-Options": "nosniff"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://review.gerrithub.io/a/config/server/version"
+      }
+    },
+    {
+      "recorded_at": "2017-12-20T12:16:58",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "application/json",
+          "Accept-Encoding": "identity",
+          "Authorization": "Basic UGhhbnRvbS00MjovRk45NTI2TE84MkxYTXJucWJUNWE3Y25wSkY4b2hVTVFRQ1l6TkgzTVE=",
+          "Connection": "keep-alive",
+          "Content-Type": "application/json",
+          "Cookie": "JSESSIONID=jku5o0xf87zfuoa39kvtkwr",
+          "User-Agent": "python-requests/2.10.0"
+        },
+        "method": "GET",
+        "uri": "https://review.gerrithub.io/a/projects/TestUser%2FDemoRepository"
+      },
+      "response": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ")]}'\n{\"id\":\"TestUser%2FDemoRepository\",\"name\":\"TestUser/DemoRepository\",\"parent\":\"All-Projects\",\"description\":\"Just a demo repository for some testing\",\"state\":\"ACTIVE\",\"web_links\":[{\"name\":\"GitHub\",\"url\":\"https://github.com/TestUser/DemoRepository\"}]}\n"
+        },
+        "headers": {
+          "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
+          "Connection": "close",
+          "Content-Disposition": "attachment",
+          "Content-Length": "259",
+          "Content-Type": "application/json;charset=utf-8",
+          "Date": "Wed, 20 Dec 2017 12:16:58 GMT",
+          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
+          "Pragma": "no-cache",
+          "Server": "Apache/2.4.6 (CentOS)",
+          "X-Content-Type-Options": "nosniff"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://review.gerrithub.io/a/projects/TestUser%2FDemoRepository"
+      }
+    },
+    {
+      "recorded_at": "2017-12-20T12:16:58",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "application/json",
+          "Accept-Encoding": "identity",
+          "Authorization": "Basic UGhhbnRvbS00MjovRk45NTI2TE84MkxYTXJucWJUNWE3Y25wSkY4b2hVTVFRQ1l6TkgzTVE=",
+          "Connection": "keep-alive",
+          "Content-Type": "application/json",
+          "Cookie": "JSESSIONID=jku5o0xf87zfuoa39kvtkwr",
+          "User-Agent": "python-requests/2.10.0"
+        },
+        "method": "GET",
+        "uri": "https://review.gerrithub.io/a/projects/TestUser%2FDemoRepository/branches"
+      },
+      "response": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ")]}'\n[{\"ref\":\"HEAD\",\"revision\":\"master\"},{\"web_links\":[{\"name\":\"GitHub\",\"url\":\"https://github.com/TestUser/DemoRepository/tree/refs/meta/config\"}],\"ref\":\"refs/meta/config\",\"revision\":\"3d3d58c5516834d9fcd92d4d10efe5d3b878bdb4\"},{\"web_links\":[{\"name\":\"GitHub\",\"url\":\"https://github.com/TestUser/DemoRepository/tree/refs/heads/master\"}],\"ref\":\"refs/heads/master\",\"revision\":\"d8ffe1ba74eee8dbbf1c305d0828594b65064d24\"},{\"web_links\":[{\"name\":\"GitHub\",\"url\":\"https://github.com/TestUser/DemoRepository/tree/refs/heads/second_branch\"}],\"ref\":\"refs/heads/second_branch\",\"revision\":\"734a6e38bf82c9f1bd5e0d66d3fe06b9010a9b37\",\"can_delete\":true}]\n"
+        },
+        "headers": {
+          "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
+          "Connection": "close",
+          "Content-Disposition": "attachment",
+          "Content-Length": "642",
+          "Content-Type": "application/json;charset=utf-8",
+          "Date": "Wed, 20 Dec 2017 12:16:58 GMT",
+          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
+          "Pragma": "no-cache",
+          "Server": "Apache/2.4.6 (CentOS)",
+          "X-Content-Type-Options": "nosniff"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://review.gerrithub.io/a/projects/TestUser%2FDemoRepository/branches"
+      }
+    },
+    {
+      "recorded_at": "2017-12-20T12:16:59",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "application/json",
+          "Accept-Encoding": "identity",
+          "Authorization": "Basic UGhhbnRvbS00MjovRk45NTI2TE84MkxYTXJucWJUNWE3Y25wSkY4b2hVTVFRQ1l6TkgzTVE=",
+          "Connection": "keep-alive",
+          "Content-Type": "application/json",
+          "Cookie": "JSESSIONID=jku5o0xf87zfuoa39kvtkwr",
+          "User-Agent": "python-requests/2.10.0"
+        },
+        "method": "GET",
+        "uri": "https://review.gerrithub.io/a/changes/?q=change:%20392089&o=CURRENT_REVISION"
+      },
+      "response": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ")]}'\n[{\"id\":\"TestUser%2FDemoRepository~master~I873f1207d660256dd00851852754b8bc3cd7a321\",\"project\":\"TestUser/DemoRepository\",\"branch\":\"master\",\"hashtags\":[],\"change_id\":\"I873f1207d660256dd00851852754b8bc3cd7a321\",\"subject\":\"Test2\",\"status\":\"NEW\",\"created\":\"2017-12-17 08:22:09.808000000\",\"updated\":\"2017-12-17 08:23:37.652000000\",\"submit_type\":\"MERGE_IF_NECESSARY\",\"mergeable\":true,\"insertions\":2,\"deletions\":0,\"unresolved_comment_count\":0,\"_number\":392089,\"owner\":{\"_account_id\":1013076},\"current_revision\":\"010ea1b90c48f414f868b854e7cd946802bbd58d\",\"revisions\":{\"010ea1b90c48f414f868b854e7cd946802bbd58d\":{\"kind\":\"REWORK\",\"_number\":2,\"created\":\"2017-12-17 08:23:37.652000000\",\"uploader\":{\"_account_id\":1013076},\"ref\":\"refs/changes/89/392089/2\",\"fetch\":{\"ssh\":{\"url\":\"ssh://[email protected]:29418/TestUser/DemoRepository\",\"ref\":\"refs/changes/89/392089/2\"},\"anonymous http\":{\"url\":\"https://review.gerrithub.io/TestUser/DemoRepository\",\"ref\":\"refs/changes/89/392089/2\"},\"http\":{\"url\":\"https://[email protected]/a/TestUser/DemoRepository\",\"ref\":\"refs/changes/89/392089/2\"}}}}}]\n"
+        },
+        "headers": {
+          "Cache-Control": "no-cache, no-store, max-age=0, must-revalidate",
+          "Connection": "close",
+          "Content-Disposition": "attachment",
+          "Content-Length": "1113",
+          "Content-Type": "application/json;charset=utf-8",
+          "Date": "Wed, 20 Dec 2017 12:16:59 GMT",
+          "Expires": "Mon, 01 Jan 1990 00:00:00 GMT",
+          "Pragma": "no-cache",
+          "Server": "Apache/2.4.6 (CentOS)",
+          "X-Content-Type-Options": "nosniff"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://review.gerrithub.io/a/changes/?q=change:%20392089&o=CURRENT_REVISION"
+      }
+    }
+  ],
+  "recorded_with": "betamax/0.5.1"
+}