hgitaly 18.4.0__tar.gz → 18.5.0.dev0__tar.gz

{hgitaly-18.4.0/hgitaly.egg-info → hgitaly-18.5.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.0
+Version: 18.5.0.dev0
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -12,8 +12,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: heptapod>=5.3.0dev0
 Requires-Dist: protobuf~=6.31.1
-Requires-Dist: grpcio~=1.74.0
-Requires-Dist: grpcio-status~=1.74.0
+Requires-Dist: grpcio~=1.75.0
+Requires-Dist: grpcio-status~=1.75.0
 Requires-Dist: grpc-interceptor
 Requires-Dist: grpcio-health-checking
 Requires-Dist: hg-loggingmod>=0.4.1

hgitaly-18.5.0.dev0/hgitaly/VERSION

@@ -0,0 +1 @@
+18.5.0dev0

{hgitaly-18.4.0 → hgitaly-18.5.0.dev0}/hgitaly/stub/mercurial_aux_git_pb2.py

@@ -24,21 +24,30 @@ _sym_db = _symbol_database.Default()
 
 from . import lint_pb2 as lint__pb2
 from . import repository_pb2 as repository__pb2
+from . import shared_pb2 as shared__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17mercurial-aux-git.proto\x12\x07hgitaly\x1a\nlint.proto\x1a\x10repository.proto2\xcd\x02\n\x16MercurialAuxGitService\x12Y\n\x12\x41uxGitCreateBundle\x12\x1b.gitaly.CreateBundleRequest\x1a\x1c.gitaly.CreateBundleResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12y\n\x16\x41uxGitCreateFromBundle\x12).gitaly.CreateRepositoryFromBundleRequest\x1a*.gitaly.CreateRepositoryFromBundleResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x12]\n\x14\x41uxGitRepositorySize\x12\x1d.gitaly.RepositorySizeRequest\x1a\x1e.gitaly.RepositorySizeResponse\"\x06\xfa\x97(\x02\x08\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17mercurial-aux-git.proto\x12\x07hgitaly\x1a\nlint.proto\x1a\x10repository.proto\x1a\x0cshared.proto\"h\n\x1a\x41uxGitCommitMappingRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x0b\n\x03ids\x18\x02 \x03(\t\x12\x0f\n\x07reverse\x18\x03 \x01(\x08\"*\n\x1b\x41uxGitCommitMappingResponse\x12\x0b\n\x03ids\x18\x02 \x03(\t2\xb7\x03\n\x16MercurialAuxGitService\x12Y\n\x12\x41uxGitCreateBundle\x12\x1b.gitaly.CreateBundleRequest\x1a\x1c.gitaly.CreateBundleResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12y\n\x16\x41uxGitCreateFromBundle\x12).gitaly.CreateRepositoryFromBundleRequest\x1a*.gitaly.CreateRepositoryFromBundleResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x12]\n\x14\x41uxGitRepositorySize\x12\x1d.gitaly.RepositorySizeRequest\x1a\x1e.gitaly.RepositorySizeResponse\"\x06\xfa\x97(\x02\x08\x01\x12h\n\x13\x41uxGitCommitMapping\x12#.hgitaly.AuxGitCommitMappingRequest\x1a$.hgitaly.AuxGitCommitMappingResponse\"\x06\xfa\x97(\x02\x08\x02\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'mercurial_aux_git_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
+  _globals['_AUXGITCOMMITMAPPINGREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_AUXGITCOMMITMAPPINGREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCreateBundle']._loaded_options = None
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCreateBundle']._serialized_options = b'\372\227(\002\010\002'
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCreateFromBundle']._loaded_options = None
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCreateFromBundle']._serialized_options = b'\372\227(\002\010\001'
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitRepositorySize']._loaded_options = None
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitRepositorySize']._serialized_options = b'\372\227(\002\010\001'
-  _globals['_MERCURIALAUXGITSERVICE']._serialized_start=67
-  _globals['_MERCURIALAUXGITSERVICE']._serialized_end=400
+  _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCommitMapping']._loaded_options = None
+  _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCommitMapping']._serialized_options = b'\372\227(\002\010\002'
+  _globals['_AUXGITCOMMITMAPPINGREQUEST']._serialized_start=80
+  _globals['_AUXGITCOMMITMAPPINGREQUEST']._serialized_end=184
+  _globals['_AUXGITCOMMITMAPPINGRESPONSE']._serialized_start=186
+  _globals['_AUXGITCOMMITMAPPINGRESPONSE']._serialized_end=228
+  _globals['_MERCURIALAUXGITSERVICE']._serialized_start=231
+  _globals['_MERCURIALAUXGITSERVICE']._serialized_end=670
 # @@protoc_insertion_point(module_scope)

{hgitaly-18.4.0 → hgitaly-18.5.0.dev0}/hgitaly/stub/mercurial_aux_git_pb2_grpc.py

@@ -3,6 +3,7 @@
 import grpc
 import warnings
 
+from . import mercurial_aux_git_pb2 as mercurial__aux__git__pb2
 from . import repository_pb2 as repository__pb2
 
 GRPC_GENERATED_VERSION = '1.74.0'
@@ -54,6 +55,11 @@ class MercurialAuxGitServiceStub(object):
                 request_serializer=repository__pb2.RepositorySizeRequest.SerializeToString,
                 response_deserializer=repository__pb2.RepositorySizeResponse.FromString,
                 _registered_method=True)
+        self.AuxGitCommitMapping = channel.unary_unary(
+                '/hgitaly.MercurialAuxGitService/AuxGitCommitMapping',
+                request_serializer=mercurial__aux__git__pb2.AuxGitCommitMappingRequest.SerializeToString,
+                response_deserializer=mercurial__aux__git__pb2.AuxGitCommitMappingResponse.FromString,
+                _registered_method=True)
 
 
 class MercurialAuxGitServiceServicer(object):
@@ -82,6 +88,13 @@ class MercurialAuxGitServiceServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def AuxGitCommitMapping(self, request, context):
+        """/ Resolve Mercurial commit ID from Git commit ID and conversely
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_MercurialAuxGitServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -100,6 +113,11 @@ def add_MercurialAuxGitServiceServicer_to_server(servicer, server):
                     request_deserializer=repository__pb2.RepositorySizeRequest.FromString,
                     response_serializer=repository__pb2.RepositorySizeResponse.SerializeToString,
             ),
+            'AuxGitCommitMapping': grpc.unary_unary_rpc_method_handler(
+                    servicer.AuxGitCommitMapping,
+                    request_deserializer=mercurial__aux__git__pb2.AuxGitCommitMappingRequest.FromString,
+                    response_serializer=mercurial__aux__git__pb2.AuxGitCommitMappingResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'hgitaly.MercurialAuxGitService', rpc_method_handlers)
@@ -196,3 +214,30 @@ class MercurialAuxGitService(object):
             timeout,
             metadata,
             _registered_method=True)
+
+    @staticmethod
+    def AuxGitCommitMapping(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/hgitaly.MercurialAuxGitService/AuxGitCommitMapping',
+            mercurial__aux__git__pb2.AuxGitCommitMappingRequest.SerializeToString,
+            mercurial__aux__git__pb2.AuxGitCommitMappingResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

{hgitaly-18.4.0 → hgitaly-18.5.0.dev0/hgitaly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.0
+Version: 18.5.0.dev0
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -12,8 +12,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: heptapod>=5.3.0dev0
 Requires-Dist: protobuf~=6.31.1
-Requires-Dist: grpcio~=1.74.0
-Requires-Dist: grpcio-status~=1.74.0
+Requires-Dist: grpcio~=1.75.0
+Requires-Dist: grpcio-status~=1.75.0
 Requires-Dist: grpc-interceptor
 Requires-Dist: grpcio-health-checking
 Requires-Dist: hg-loggingmod>=0.4.1

{hgitaly-18.4.0 → hgitaly-18.5.0.dev0}/hgitaly.egg-info/requires.txt

@@ -1,7 +1,7 @@
 heptapod>=5.3.0dev0
 protobuf~=6.31.1
-grpcio~=1.74.0
-grpcio-status~=1.74.0
+grpcio~=1.75.0
+grpcio-status~=1.75.0
 grpc-interceptor
 grpcio-health-checking
 hg-loggingmod>=0.4.1

{hgitaly-18.4.0 → hgitaly-18.5.0.dev0}/install-requirements.txt

@@ -1,7 +1,7 @@
 heptapod>=5.3.0dev0
 protobuf~=6.31.1
-grpcio~=1.74.0
-grpcio-status~=1.74.0
+grpcio~=1.75.0
+grpcio-status~=1.75.0
 grpc-interceptor
 grpcio-health-checking
 hg-loggingmod>=0.4.1

{hgitaly-18.4.0 → hgitaly-18.5.0.dev0}/tests_with_gitaly/test_mercurial_aux_git.py

@@ -6,6 +6,9 @@ from hgitaly.stub.repository_pb2 import (
     CreateRepositoryFromBundleRequest,
     RepositorySizeRequest,
 )
+from hgitaly.stub.mercurial_aux_git_pb2 import (
+    AuxGitCommitMappingRequest,
+)
 from hgitaly.stub.mercurial_aux_git_pb2_grpc import MercurialAuxGitServiceStub
 from hgitaly.testing.storage import stowed_away_git_repo_path
 
@@ -98,3 +101,42 @@ def test_repository_size(gitaly_rhgitaly_comparison_native):
     )
     # results may vary according to how system reports size of small files
     assert rpc_helper.rpc('hg').size > 20
+
+
+def test_commit_mapping(gitaly_rhgitaly_comparison_native):
+    fixture = gitaly_rhgitaly_comparison_native
+    wrapper = fixture.hg_repo_wrapper
+    src_git_repo = fixture.git_repo
+    cs0 = wrapper.write_commit('foo')
+    hg_sha0 = cs0.hex().decode()
+    cs1 = wrapper.write_commit('bar', parent=cs0, branch='other')
+    hg_sha1 = cs1.hex().decode()
+    wrapper.command('hpd-export-native-to-git')
+    # export worked
+    git_branches = src_git_repo.branches()
+    assert set(git_branches) == {b'branch/default', b'branch/other'}
+    git_sha0 = git_branches[b'branch/default']['sha'].decode()
+    git_sha1 = git_branches[b'branch/other']['sha'].decode()
+
+    rpc_helper = fixture.rpc_helper(
+        hg_server='rhgitaly',
+        stub_cls=MercurialAuxGitServiceStub,
+        method_name='AuxGitCommitMapping',
+        request_cls=AuxGitCommitMappingRequest,
+    )
+
+    unknown = '12fe34ca' * 5
+
+    def rpc(*ids, **kw):
+        return rpc_helper.rpc('hg', ids=ids, **kw).ids
+
+    assert rpc(git_sha0) == [hg_sha0]
+    assert rpc(git_sha1, git_sha0) == [hg_sha1, hg_sha0]
+    assert rpc(git_sha0, git_sha0) == [hg_sha0, hg_sha0]
+    assert rpc(git_sha0, git_sha1) == [hg_sha0, hg_sha1]
+    assert rpc(hg_sha0, hg_sha1, reverse=True) == [git_sha0, git_sha1]
+
+    assert rpc(unknown) == ['']
+    assert rpc(unknown, reverse=True) == ['']
+    assert rpc(git_sha0, unknown) == [hg_sha0, '']
+    assert rpc(unknown, git_sha0) == ['', hg_sha0]

hgitaly-18.4.0/hgitaly/VERSION

@@ -1 +0,0 @@
-18.4.0