hgitaly 18.0.1__tar.gz → 18.0.2__tar.gz

{hgitaly-18.0.1/hgitaly.egg-info → hgitaly-18.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.0.1
+Version: 18.0.2
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet

hgitaly-18.0.2/hgitaly/VERSION

@@ -0,0 +1 @@
+18.0.2

{hgitaly-18.0.1 → hgitaly-18.0.2}/hgitaly/service/ref.py

@@ -193,7 +193,10 @@ class RefServicer(RefServiceServicer, HGitalyServicer):
                         context) -> FindAllBranchesResponse:
         Branch = FindAllBranchesResponse.Branch
         repo = self.load_repo(request.repository, context)
-        for chunk in chunked(iter_gitlab_branches(repo)):
+        for chunk in chunked(sorted_gitlab_branches_as_refs(
+                repo,
+                sort_by=BranchSortBy.FULL_REF_NAME
+        )):
             yield FindAllBranchesResponse(
                 branches=(Branch(name=name, target=message.commit(head))
                           for name, head in chunk))

{hgitaly-18.0.1 → hgitaly-18.0.2}/hgitaly/service/tests/test_ref.py

@@ -187,7 +187,7 @@ def test_find_branch(grpc_channel, server_repos_root):
         FindAllBranchesRequest(repository=grpc_repo))
     branches = [br for chunk in resp for br in chunk.branches]
     assert len(branches) == 1
-    assert branches[0].name == b'branch/default'
+    assert branches[0].name == b'refs/heads/branch/default'
     assert branches[0].target == branch.target_commit
 
     resp = list(ref_stub.FindAllRemoteBranches(

{hgitaly-18.0.1 → hgitaly-18.0.2/hgitaly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.0.1
+Version: 18.0.2
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet

{hgitaly-18.0.1 → hgitaly-18.0.2}/tests_with_gitaly/test_ref.py

@@ -4,6 +4,7 @@
 # GNU General Public License version 2 or any later version.
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
+from base64 import b64encode, b64decode
 import pytest
 import time
 
@@ -30,6 +31,8 @@ from hgitaly.stub.ref_pb2 import (
     FindRefsByOIDRequest,
     FindTagError,
     FindTagRequest,
+    FindAllBranchesRequest,
+    FindAllTagsRequest,
     FindLocalBranchesRequest,
     ListRefsRequest,
     UpdateReferencesError,
@@ -53,8 +56,10 @@ if skip_comparison_tests():  # pragma no cover
 parametrize = pytest.mark.parametrize
 
 
-def test_compare_find_branch(gitaly_comparison):
-    fixture = gitaly_comparison
+@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
+def test_compare_find_branch(gitaly_rhgitaly_comparison,
+                             hg_server):
+    fixture = gitaly_rhgitaly_comparison
     git_repo = fixture.git_repo
 
     fixture.hg_repo_wrapper.write_commit('foo', message="Some foo")
@@ -67,6 +72,7 @@ def test_compare_find_branch(gitaly_comparison):
         normalize_commit_message(resp.branch.target_commit)
 
     rpc_helper = fixture.rpc_helper(
+        hg_server=hg_server,
         stub_cls=RefServiceStub,
         method_name='FindBranch',
         request_cls=FindBranchRequest,
@@ -75,6 +81,7 @@ def test_compare_find_branch(gitaly_comparison):
     )
 
     rpc_helper.assert_compare(name=gl_branch)
+    rpc_helper.assert_compare(name=b'unknown')
 
     # invalid case
     rpc_helper.assert_compare_errors(name=gl_branch, repository=None,
@@ -314,8 +321,9 @@ def test_compare_ref_exists(gitaly_rhgitaly_comparison, hg_server):
     assert_compare_errors(ref=b'notrefs/something')
 
 
-def test_compare_find_local_branches(gitaly_comparison):
-    fixture = gitaly_comparison
+@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
+def test_compare_find_local_branches(gitaly_rhgitaly_comparison, hg_server):
+    fixture = gitaly_rhgitaly_comparison
     wrapper = fixture.hg_repo_wrapper
 
     # make three branches with the 3 possible orderings differ
@@ -334,6 +342,7 @@ def test_compare_find_local_branches(gitaly_comparison):
                 normalize_commit_message(branch.target_commit)
 
     rpc_helper = fixture.rpc_helper(
+        hg_server=hg_server,
         stub_cls=RefServiceStub,
         method_name='FindLocalBranches',
         request_cls=FindLocalBranchesRequest,
@@ -359,13 +368,114 @@ def test_compare_find_local_branches(gitaly_comparison):
     # case without any pagination parameters
     assert_compare(123, pagination=False)
 
-    assert_compare(10, page_token='refs/heads/branch/br01')
+    orig_kwargs_to_git = rpc_helper.request_kwargs_to_git
+
+    def pagination_kwargs_to_git(hg_kwargs):
+        git_kwargs = orig_kwargs_to_git(hg_kwargs)
+        hg_pagination = hg_kwargs['pagination_params']
+        git_kwargs['pagination_params'] = PaginationParameter(
+            limit=hg_pagination.limit,
+            page_token=('refs/heads/'
+                        + b64decode(hg_pagination.page_token).decode()),
+        )
+        return git_kwargs
+
+    if hg_server == 'hgitaly':
+        page_token = 'refs/heads/branch/br01'
+    else:
+        page_token = b64encode(b'branch/br01').decode('ascii')
+        rpc_helper.request_kwargs_to_git = pagination_kwargs_to_git
+
+    assert_compare(10, page_token=page_token)
+    rpc_helper.request_kwargs_to_git = orig_kwargs_to_git
 
     # sort options
     for sort_by in FindLocalBranchesRequest.SortBy.values():
         assert_compare(10, sort_by=sort_by)
 
 
+@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
+def test_compare_find_all_branches(gitaly_rhgitaly_comparison, hg_server):
+    fixture = gitaly_rhgitaly_comparison
+    wrapper = fixture.hg_repo_wrapper
+
+    # make three branches with the 3 possible orderings differ
+    now = time.time()
+    commit_ages = {0: 30, 1: 40, 2: 20}
+    for i in range(3):
+        wrapper.commit_file('foo', branch='br%02d' % i, return_ctx=False,
+                            utc_timestamp=now - commit_ages[i])
+    # mirror worked
+    assert set(fixture.git_repo.branch_titles().keys()) == {
+        b'branch/br%02d' % i for i in range(3)}
+
+    def normalize_response(rpc_helper, resp, **kw):
+        for chunk in resp:
+            for branch in chunk.branches:
+                normalize_commit_message(branch.target)
+
+    rpc_helper = fixture.rpc_helper(
+        hg_server=hg_server,
+        stub_cls=RefServiceStub,
+        method_name='FindAllBranches',
+        request_cls=FindAllBranchesRequest,
+        streaming=True,
+        response_sha_attrs=['branches[].target.id',
+                            'branches[].target.parent_ids[]',
+                            ],
+        normalizer=normalize_response,
+    )
+
+    rpc_helper.assert_compare()
+
+
+# Testing just RHGitaly, as we would otherwise need to implement
+# sorting in Python impl, that will be deprecated immediately by Rust impl
+def test_find_all_tags(gitaly_rhgitaly_comparison):
+    fixture = gitaly_rhgitaly_comparison
+    hg_wrapper = fixture.hg_repo_wrapper
+
+    # make three branches with the 3 possible orderings differ
+    now = time.time()
+    commit_ages = {0: 30, 1: 40, 2: 20}
+    commit_tags = {0: b'1.2', 1: b'v0.8', 2: b'not-a-version'}
+    for i in range(3):
+        hg_wrapper.commit_file('foo', return_ctx=False,
+                               utc_timestamp=now - commit_ages[i])
+        hg_wrapper.command('tag', commit_tags[i], rev=b'.')
+    hg_wrapper.command('gitlab-mirror')
+
+    # mirror worked
+    assert fixture.git_repo.tags() == {b'1.2', b'v0.8', b'not-a-version'}
+
+    def normalize_response(rpc_helper, resp, **kw):
+        for chunk in resp:
+            for tag in chunk.tags:
+                normalize_commit_message(tag.target_commit)
+
+    rpc_helper = fixture.rpc_helper(
+        hg_server='rhgitaly',
+        stub_cls=RefServiceStub,
+        method_name='FindAllTags',
+        request_cls=FindAllTagsRequest,
+        streaming=True,
+        response_sha_attrs=['tags[].target_commit.id',
+                            'tags[].target_commit.parent_ids[]',
+                            'tags[].id',
+                            ],
+        normalizer=normalize_response,
+    )
+
+    rpc_helper.assert_compare()
+
+    SortBy = FindAllTagsRequest.SortBy
+    for direction in (SortDirection.ASCENDING, SortDirection.DESCENDING):
+        for key in SortBy.Key.values():
+            rpc_helper.assert_compare(
+                sort_by=SortBy(key=key, direction=direction),
+            )
+
+
 @parametrize('hg_server', ('hgitaly', 'rhgitaly'))
 def test_find_tag(gitaly_rhgitaly_comparison, hg_server):
     fixture = gitaly_rhgitaly_comparison

hgitaly-18.0.1/hgitaly/VERSION

@@ -1 +0,0 @@
-18.0.1