hgitaly 18.7.0a0__tar.gz → 18.7.1__tar.gz

{hgitaly-18.7.0a0/hgitaly.egg-info → hgitaly-18.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.7.0a0
+Version: 18.7.1
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -10,7 +10,7 @@ Keywords: hg mercurial heptapod gitlab
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: heptapod>=5.4.0
+Requires-Dist: heptapod~=5.5.0
 Requires-Dist: protobuf~=6.31.1
 Requires-Dist: grpcio~=1.76.0
 Requires-Dist: grpcio-status~=1.76.0

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/functional_tests/test_blob_tree.py

@@ -108,9 +108,9 @@ def oid_normalizer(oid2git):
     return normalizer
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_tree_entry_request(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_tree_entry_request(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
 
     wrapper = fixture.hg_repo_wrapper
     wrapper.write_commit('foo', message="Some foo")
@@ -302,10 +302,9 @@ def test_compare_tree_entry_request(gitaly_rhgitaly_comparison, hg_server):
                        )
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_get_tree_entries_pagination(gitaly_rhgitaly_comparison,
-                                             hg_server):
+def test_compare_get_tree_entries_pagination(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
 
     wrapper = fixture.hg_repo_wrapper
     wrapper.write_commit('foo', message="Some foo")

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/functional_tests/test_commit.py

@@ -17,6 +17,7 @@ from hgitaly.stub.shared_pb2 import (
 from hgitaly.stub.commit_pb2 import (
     CommitLanguagesRequest,
     CommitIsAncestorRequest,
+    CountCommitsRequest,
     FindCommitRequest,
     FindCommitsRequest,
     LastCommitForPathRequest,
@@ -406,8 +407,7 @@ def test_compare_list_files(gitaly_comparison):
         rpc_helper.assert_compare(revision=rev)
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_find_commit(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_find_commit(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     wrapper = fixture.hg_repo_wrapper
 
@@ -416,7 +416,7 @@ def test_compare_find_commit(gitaly_rhgitaly_comparison, hg_server):
             normalize_commit_message(response.commit)
 
     rpc_helper = fixture.rpc_helper(
-        hg_server=hg_server,
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='FindCommit',
         request_cls=FindCommitRequest,
@@ -584,6 +584,12 @@ def test_compare_count_find_commits(gitaly_rhgitaly_comparison, hg_server):
     wrapper.update(2)
     ctx4 = wrapper.merge_commit(ctx3, message=b'merge with stable',
                                 utc_timestamp=ts+20)
+    unknown = b'unknown'
+    unknown_sha = b'cade12fe' * 5
+    range_with_unknown = b'..'.join((unknown_sha, ctx2.hex()))
+    assert_compare_errors(revision=unknown)
+    assert_compare_errors(revision=unknown_sha)
+    assert_compare_errors(revision=range_with_unknown)
 
     # when `revision` is provided as <revspec>
     with sorted_comparison():
@@ -689,7 +695,7 @@ def test_compare_count_find_commits(gitaly_rhgitaly_comparison, hg_server):
         hg_server=hg_server,
         stub_cls=CommitServiceStub,
         method_name='CountCommits',
-        request_cls=FindCommitsRequest,
+        request_cls=CountCommitsRequest,
         request_sha_attrs=['revision'],
     )
 
@@ -698,7 +704,10 @@ def test_compare_count_find_commits(gitaly_rhgitaly_comparison, hg_server):
 
     # when `revision` is provided as <revspec>
     all_revs = [ctx0.hex(), ctx1.hex(), ctx2.hex(), ctx3.hex(), ctx4.hex()]
-    for range_str in (b'..', ):  # TODO symdiff not implemented
+    range_ops = [b'..']
+    if hg_server == 'rhgitaly':
+        range_ops.append(b'...')
+    for range_str in range_ops:
         for r1 in all_revs:
             for r2 in all_revs:
                 assert_compare(revision=r1 + range_str + r2)
@@ -709,11 +718,27 @@ def test_compare_count_find_commits(gitaly_rhgitaly_comparison, hg_server):
     for ref in refs:
         rpc_helper.assert_compare(revision=ref)
 
+    for mc in (0, 1, 2, 3):
+        assert_compare(revision=ctx2.hex(), max_count=mc)
+
+    assert_compare(all=True)
+
+    if hg_server == 'rhgitaly':
+        for date in [date1, date2]:
+            assert_compare(revision=ctx4.hex(), after=date)
+            assert_compare(revision=ctx4.hex(), before=date)
+            assert_compare(revision=ctx4.hex(), before=date, after=date)
+        assert_compare(revision=ctx4.hex(), before=date1, after=date2)
+
     assert_compare_errors()
+    assert_compare(revision=unknown)
+    assert_compare(revision=unknown_sha)
+    assert_compare(revision=range_with_unknown)
 
 
-def test_compare_list_commits(gitaly_comparison):
-    fixture = gitaly_comparison
+@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
+def test_compare_list_commits(gitaly_rhgitaly_comparison, hg_server):
+    fixture = gitaly_rhgitaly_comparison
 
     wrapper = fixture.hg_repo_wrapper
     # set_default_gitlab_branch(wrapper.repo, b'branch/default')
@@ -721,7 +746,7 @@ def test_compare_list_commits(gitaly_comparison):
     #
     #   @    4 (branch/default) merge with stable
     #   |\
-    #   | o  3 creates 'animal' (branch/stable)
+    #   | o  3 creates 'animals' (branch/stable)
     #   | |
     #   o |  2 rename 'foo' to 'zoo' (user: testuser)
     #   |/
@@ -742,9 +767,12 @@ def test_compare_list_commits(gitaly_comparison):
     ctx2 = wrapper.commit([b'foo', b'zoo'],
                           message=b"rename foo to zoo",
                           utc_timestamp=ts - 10)
+    # TODO the converted email by hg-git is more liberal, and would
+    # parse the email correctly from 'testuser <testuser@heptapod.test'.
+    # Same with HGitaly, compared to RHGitaly.
     ctx3 = wrapper.write_commit('animals', branch='stable', parent=ctx0,
                                 utc_timestamp=ts + 10,
-                                user='testuser <testuser@heptapod.test')
+                                user='testuser <testuser@heptapod.test>')
     wrapper.update(2)
     ctx4 = wrapper.merge_commit(ctx3, message=b'merge with stable',
                                 utc_timestamp=ts+20)
@@ -755,6 +783,7 @@ def test_compare_list_commits(gitaly_comparison):
                 normalize_commit_message(commit)
 
     rpc_helper = fixture.rpc_helper(
+        hg_server=hg_server,
         stub_cls=CommitServiceStub,
         method_name='ListCommits',
         request_cls=ListCommitsRequest,
@@ -812,6 +841,18 @@ def test_compare_list_commits(gitaly_comparison):
     # no result
     assert_compare(revisions=[ctx4.hex(), caret(ctx4)])
 
+    # with paths
+    assert_compare(revisions=[ctx4.hex()], paths=[b'animals'])
+    assert_compare(revisions=[ctx4.hex()], paths=[b'foo'])
+    assert_compare(revisions=[ctx4.hex()], paths=[b'zoo'])
+    assert_compare(revisions=[ctx3.hex(), ctx2.hex()],
+                   paths=[b'animals', b'zoo'])
+    assert_compare(revisions=[ctx4.hex()], paths=[b'anim*'])
+    # with two paths, Git starts returning the merge
+    # but Mercurial does not. This seems more consistent on the Mercurial
+    # side, so we won't compare. It would be:
+    #    assert_compare(revisions=[ctx4.hex()], paths=[b'anim*', b'foo'])
+
     # orderings
     #
     # Comparison is limited because Mercurial orderings don't exactly

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/functional_tests/test_ref.py

@@ -122,6 +122,7 @@ def test_update_references(gitaly_rhgitaly_comparison,
             normalize_commit_message(response.commit)
 
     find_commit_helper = fixture.rpc_helper(
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='FindCommit',
         request_cls=FindCommitRequest,

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/functional_tests/test_repository_service.py

@@ -77,8 +77,7 @@ TESTS_DATA_DIR = Path(__file__).parent / 'data'
 TIP_TAG_NAME = b'tip'
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_find_merge_base(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_find_merge_base(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     gitaly_repo = fixture.gitaly_repo
     git_repo = fixture.git_repo
@@ -112,10 +111,7 @@ def test_compare_find_merge_base(gitaly_rhgitaly_comparison, hg_server):
                                parent=node_mod.nullid).hex()
     git_shas[sha4] = git_repo.branches()[b'branch/other']['sha']
 
-    if hg_server == 'rhgitaly':
-        hgitaly_channel = fixture.rhgitaly_channel
-    else:
-        hgitaly_channel = fixture.hgitaly_channel
+    hgitaly_channel = fixture.rhgitaly_channel
     diff_stubs = dict(
         git=RepositoryServiceStub(fixture.gitaly_channel),
         hg=RepositoryServiceStub(hgitaly_channel),
@@ -365,11 +361,10 @@ def test_repository_size(gitaly_comparison,
                                                 relative_path='/some/path'))
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
 def test_has_local_branches(gitaly_rhgitaly_comparison,
-                            server_repos_root,
-                            hg_server):
+                            server_repos_root):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
     grpc_repo = fixture.gitaly_repo
     rpc_helper = fixture.rpc_helper(
         hg_server=hg_server,
@@ -382,6 +377,11 @@ def test_has_local_branches(gitaly_rhgitaly_comparison,
 
     assert_compare(repository=grpc_repo)
 
+    wrapper = fixture.hg_repo_wrapper
+    wrapper.commit_file('foo')
+    wrapper.command('gitlab-mirror')
+    assert_compare(repository=grpc_repo)
+
     # repo does not exist
     assert_compare_errors(
         same_details=False,
@@ -657,9 +657,9 @@ def test_create_bundle_from_ref_list(
         assert not target_repo_path(vcs, 'broken-bundle').exists()
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_search_files_by_name(gitaly_rhgitaly_comparison, hg_server):
+def test_search_files_by_name(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
 
     wrapper = fixture.hg_repo_wrapper
     ctx0 = wrapper.write_commit('afoo', message="Some foo")
@@ -841,6 +841,7 @@ def test_write_ref(gitaly_rhgitaly_comparison, server_repos_root, hg_server):
             normalize_commit_message(response.commit)
 
     find_commit_helper = fixture.rpc_helper(
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='FindCommit',
         request_cls=FindCommitRequest,

hgitaly-18.7.1/hgitaly/VERSION

@@ -0,0 +1 @@
+18.7.1

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/hgitaly/gitlab_ref.py

@@ -13,7 +13,6 @@ utilities about refs, i.e, anything about a full ref path, such as
 or tags.
 """
 from fnmatch import fnmatch
-import os
 import re
 
 from heptapod.gitlab.branch import gitlab_branch_ref
@@ -23,8 +22,6 @@ from hgext3rd.heptapod.branch import (
     get_default_gitlab_branch,
 )
 from hgext3rd.heptapod.tag import gitlab_tags
-from hgext3rd.heptapod import ensure_gitlab_special_refs
-from hgext3rd.heptapod import ensure_gitlab_keep_arounds
 from hgext3rd.heptapod.special_ref import (
     GITLAB_TYPED_REFS_MISSING,
     parse_special_ref,
@@ -40,33 +37,6 @@ from hgext3rd.heptapod.keep_around import (
 DOT_HG_RX = re.compile(br'\.hg$')
 
 
-def has_legacy_git_repo(repo):
-    """Return whether there is a legacy Git repo for this Mercurial repo.
-
-    With "legacy" here is meant the Git repository for a non-native project.
-    Git repositories meant for mirroring are *not* included in this scope.
-
-    As of Heptapod 17.6, this is the best way to know without direct indication
-    (from the inside) that a repository is not legacy (hg-git based).
-    The reverse implication is false, as there are loopholes:
-
-    - leftover Git repositories for Projects that have migrated to native
-    - native projects with addition conversion for mirrors whose Git
-      repositories have not been moved yet (bug, time to run the migration,
-      etc.)
-
-    The caller must be aware of these loopholes and avoid overwriting existing
-    data based on the legacy Git repo. In the intended case where this is to
-    decide on calling the `ensure` methods, this means it is ok only if there
-    is no existing data.
-    """
-    # if a repository is legacy, based on hg-git conversion, is whether
-    # it has a `.git` repository at the same location. Git repositories
-    # for mirroring are in a different place
-    git_path = DOT_HG_RX.sub(b'', repo.root) + b'.git'
-    return os.path.exists(git_path)
-
-
 def gitlab_special_ref_target(repo, ref_path):
     """Return the changeset for a special ref.
 
@@ -135,8 +105,6 @@ def iter_gitlab_special_refs_as_refs(repo, deref=True, patterns=None):
     """
     all_special_refs = special_refs(repo)
     if all_special_refs is GITLAB_TYPED_REFS_MISSING:
-        # transitional while we still have an inner Git repo
-        # would still be the best we can do near the end of HGitaly2 milestone
         all_special_refs = ensure_special_refs(repo)
 
     for sref, sha in all_special_refs.items():
@@ -147,22 +115,18 @@ def iter_gitlab_special_refs_as_refs(repo, deref=True, patterns=None):
 
 
 def ensure_special_refs(repo):
-    if has_legacy_git_repo(repo):
-        return ensure_gitlab_special_refs(repo.ui, repo)
     return {}
 
 
 def ensure_keep_arounds(repo, init_empty=False):
-    """Ensure keep around from Git repo if present or create.
+    """Ensure keep around file by creating it if needed
 
     An empty file is created so that the keep-arounds file is no
     more missing, but only if `init_empty` is `True`, so that
-    responsibility is handed to the caller, than must use the
+    responsibility is handed to the caller, that must use the
     option only after having obtained the missing marker.
     """
-    if has_legacy_git_repo(repo):
-        ensure_gitlab_keep_arounds(repo.ui, repo)
-    elif init_empty:
+    if init_empty:
         init_keep_arounds(repo, ())
 
 

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/hgitaly/manifest.py

@@ -234,19 +234,6 @@ class ManifestMiner:
                    prefix + b'/'.join(flat_path) if flat_path else dir_path
                    )
 
-    def file_names_by_regexp(self, rx, subdir=b''):
-        manifest = self.changeset.manifest()
-        subdir_prefix = subdir + b'/' if subdir else b''
-
-        for file_path in manifest.iterkeys():
-            if not file_path.startswith(subdir_prefix):
-                continue
-
-            if rx is not None and rx.search(file_path) is None:
-                continue
-
-            yield file_path
-
     def iter_files_with_content(self, exclude_binary=False):
         manifest = self.changeset.manifest()
         repo = self.changeset.repo().unfiltered()

{hgitaly-18.7.0a0 → hgitaly-18.7.1}/hgitaly/revset.py

@@ -60,6 +60,9 @@ def revset_from_git_revspec(repo, revspec, for_follow=False):
             return None
         return ctx.hex() if for_follow else b"reverse(::%s)" % ctx
 
+    if revset is None:
+        return None
+
     return b"sort(%s, -rev)" % revset
 
 
@@ -90,6 +93,9 @@ def revset_git_range(repo, r1, r2, for_follow=False):
         raise FollowNotImplemented()
 
     ctx_start, ctx_end = resolve_git_range(repo, r1, r2)
+    if ctx_start is None or ctx_end is None:
+        return None
+
     return b"::%s - ::%s" % (ctx_end, ctx_start)
 
 
@@ -114,6 +120,9 @@ def revset_symmetric_difference(repo, r1, r2, for_follow=False):
         raise FollowNotImplemented()
 
     ctx_start, ctx_end = resolve_git_range(repo, r1, r2)
+    if ctx_start is None or ctx_end is None:
+        return None
+
     left = ctx_start.rev()
     right = ctx_end.rev()
     branchpoint = repo.revs(b"ancestor(%d, %d)" % (left, right)).first()