hgitaly 18.7.0a1__tar.gz → 18.7.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.7.0a1
+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.0a1 → 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,
@@ -583,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():
@@ -688,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'],
     )
 
@@ -697,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)
@@ -708,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')
@@ -720,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)
     #   |/
@@ -741,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)
@@ -754,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,
@@ -811,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.1/hgitaly/VERSION

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

{hgitaly-18.7.0a1 → 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()

{hgitaly-18.7.0a1 → hgitaly-18.7.1}/hgitaly/service/commit.py

@@ -559,6 +559,14 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
         if request.max_parents == 1:
             revset += b" and not merge()"
 
+        if request.paths:
+            revset += b" and ("
+            revset += b" or ".join(
+                b'file("%s/%s")' % (repo.root, p)
+                for p in request.paths
+            )
+            revset += b")"
+
         Order = ListCommitsRequest.Order
         reverse = request.reverse
 

{hgitaly-18.7.0a1 → hgitaly-18.7.1}/hgitaly/service/tests/test_commit.py

@@ -223,6 +223,11 @@ def test_find_commits(commit_fixture_empty_repo):
     # when revision does not exists (including special Node IDs)
     for rev in (b'does_not_exists',
                 b'1234deadbeaf',
+                b'1234dead' * 5,
+                b'unknown..%s' % ctx1.hex(),
+                b'%s..unknown' % ctx1.hex(),
+                b'unknown...%s' % ctx1.hex(),
+                b'%s...unknown' % ctx1.hex(),
                 b'ffffffff' * 5,
                 b'ffffffff'):
         with pytest.raises(grpc.RpcError) as exc_info:
@@ -805,6 +810,13 @@ def test_list_commits(commit_fixture_empty_repo):
     # author regexp
     assert list_commits(sha4, author=b't.stuser') == [sha3]
 
+    # paths
+    assert list_commits(sha4, paths=[b'animals']) == [sha3]
+    assert list_commits(sha4, paths=[b'anim*']) == [sha3]
+    # Mercurial does not count the merge (see also comment in Comp test)
+    assert list_commits(sha4,
+                        paths=[b'foo', b'animals']) == [sha3, sha2, sha0]
+
     # unknown revision, including special cases:
     for unknown in ('branch/unknown',
                     'f' * 39,  # wdir node id, prefix

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.7.0a1
+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.0a1 → hgitaly-18.7.1}/hgitaly.egg-info/requires.txt

@@ -1,4 +1,4 @@
-heptapod>=5.4.0
+heptapod~=5.5.0
 protobuf~=6.31.1
 grpcio~=1.76.0
 grpcio-status~=1.76.0

{hgitaly-18.7.0a1 → hgitaly-18.7.1}/install-requirements.txt

@@ -1,4 +1,4 @@
-heptapod>=5.4.0
+heptapod~=5.5.0
 protobuf~=6.31.1
 grpcio~=1.76.0
 grpcio-status~=1.76.0

hgitaly-18.7.0a1/hgitaly/VERSION

@@ -1 +0,0 @@
-18.7.0a1