hgitaly 18.4.3__tar.gz → 18.4.5__tar.gz

{hgitaly-18.4.3/hgitaly.egg-info → hgitaly-18.4.5}/PKG-INFO

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

hgitaly-18.4.5/hgitaly/VERSION

@@ -0,0 +1 @@
+18.4.5

{hgitaly-18.4.3 → hgitaly-18.4.5}/hgitaly/message.py

@@ -248,8 +248,9 @@ def tag(name, target, tagging=None, signature_type=None):
         signature_type = SignatureType.NONE
 
     if tagging is None:
-        tag_id = message = tag_author = None
+        message = tag_author = None
         message_size = 0
+        tag_id = pycompat.sysstr(target.hex())
     else:
         # TODO SPEC comment in `shared.proto` says the message will be
         # nullified if above a certain size and the size will be carried over,

{hgitaly-18.4.3 → hgitaly-18.4.5}/hgitaly/tests/test_messages.py

@@ -30,7 +30,7 @@ def test_tag(tmpdir):
     # the factory function doesn't even need the tag to actually exist
     tag = message.tag(b'v3.2.1', ctx)
     assert tag.name == b'v3.2.1'
-    assert not tag.id
+    assert tag.id == ctx.hex().decode()
     assert not tag.message
     assert not tag.message_size
     assert tag.tagger == CommitAuthor()

{hgitaly-18.4.3 → hgitaly-18.4.5/hgitaly.egg-info}/PKG-INFO

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

{hgitaly-18.4.3 → hgitaly-18.4.5}/tests_with_gitaly/test_ref.py

@@ -490,15 +490,12 @@ def test_find_tag(gitaly_rhgitaly_comparison, hg_server):
 
     def normalize_response(rpc_helper, resp, **kw):
         normalize_commit_message(resp.tag.target_commit)
-        # no tag ids in Mercurial until we can assign a tagging changeset
-        # (requires a long-term core change)
-        resp.tag.id = ''
 
     rpc_helper = fixture.rpc_helper(
         hg_server=hg_server,
         stub_cls=RefServiceStub,
         method_name='FindTag',
-        response_sha_attrs=['tag.target_commit.id'],
+        response_sha_attrs=['tag.target_commit.id', 'tag.id'],
         request_cls=FindTagRequest,
         normalizer=normalize_response,
     )

{hgitaly-18.4.3 → hgitaly-18.4.5}/tests_with_gitaly/test_repository_service.py

@@ -25,6 +25,9 @@ from hgitaly import stream
 from hgitaly.stub.commit_pb2 import (
     FindCommitRequest,
 )
+from hgitaly.stub.ref_pb2 import (
+    FindDefaultBranchNameRequest,
+)
 from hgitaly.stub.repository_pb2 import (
     CreateRepositoryRequest,
     CreateBundleRequest,
@@ -47,6 +50,7 @@ from hgitaly.stub.shared_pb2 import (
         ObjectFormat,
 )
 from hgitaly.stub.commit_pb2_grpc import CommitServiceStub
+from hgitaly.stub.ref_pb2_grpc import RefServiceStub
 from hgitaly.stub.repository_pb2_grpc import RepositoryServiceStub
 from hgitaly.workdir import wd_path
 
@@ -886,6 +890,14 @@ def test_write_ref(gitaly_rhgitaly_comparison, server_repos_root, hg_server):
                                   revision=b'HEAD').commit.id == sha2.decode()
     find_commit_helper.assert_compare(revision=b'HEAD')
 
+    default_branch_helper = fixture.rpc_helper(
+        hg_server=hg_server,
+        stub_cls=RefServiceStub,
+        method_name='FindDefaultBranchName',
+        request_cls=FindDefaultBranchNameRequest,
+    )
+    default_branch_helper.assert_compare()
+
     # old_revision is not honoured for symrefs by Gitaly:
     assert_compare(ref=b'HEAD',
                    revision=default_ref,

hgitaly-18.4.3/hgitaly/VERSION

@@ -1 +0,0 @@
-18.4.3