hgitaly 17.11.0__tar.gz → 17.11.1__tar.gz

{hgitaly-17.11.0 → hgitaly-17.11.1}/PKG-INFO

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

hgitaly-17.11.1/hgitaly/VERSION

@@ -0,0 +1 @@
+17.11.1

{hgitaly-17.11.0 → hgitaly-17.11.1}/hgitaly/revision.py

@@ -145,6 +145,7 @@ def gitlab_revision_hash(repo, revision):
 
 
 ALL_CHANGESETS = object()
+VISIBLE_CHANGESETS = object()
 
 
 def resolve_revspecs_positive_negative(repo, revisions,
@@ -184,9 +185,11 @@ def resolve_revspecs_positive_negative(repo, revisions,
         else:
             if rev == b'ALL':
                 positive = ALL_CHANGESETS
+            elif rev == b'--visible':
+                positive = VISIBLE_CHANGESETS
             collection = positive
 
-        if collection is ALL_CHANGESETS:
+        if collection in (ALL_CHANGESETS, VISIBLE_CHANGESETS):
             # resolution is useless
             continue
 

{hgitaly-17.11.0 → hgitaly-17.11.1}/hgitaly/service/commit.py

@@ -51,6 +51,7 @@ from ..pagination import (
     extract_limit,
 )
 from ..revision import (
+    VISIBLE_CHANGESETS,
     RevisionNotFound,
     gitlab_revision_changeset,
     resolve_revspecs_positive_negative,
@@ -902,14 +903,21 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             context.abort(StatusCode.INTERNAL,
                           "Revision %r could not be resolved" % exc.args[0])
 
-        # now that resolution is done, we can and have to switch to
-        # the unfiltered view, because the resulting hashes can be of
-        # obsolete changesets.
-        repo = repo.unfiltered()
-        if negative:
-            revset = b'only(%ls, %ls)'
+        if positive is VISIBLE_CHANGESETS:
+            # do not switch to unfiltered view!
+            if negative:
+                revset = b'not ::%ls'
+            else:
+                revset = b'all()'
         else:
-            revset = b'::%ls'
+            # now that resolution is done, we can and have to switch to
+            # the unfiltered view, because the resulting hashes can be of
+            # obsolete changesets.
+            repo = repo.unfiltered()
+            if negative:
+                revset = b'only(%ls, %ls)'
+            else:
+                revset = b'::%ls'
 
         msg_patterns = request.commit_message_patterns
         ignore_case = request.ignore_case
@@ -937,7 +945,12 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
         revset = b'sort(%s, %s)' % (revset, sort_key)
 
         try:
-            if negative:
+            if positive is VISIBLE_CHANGESETS:
+                if negative:
+                    revs = repo.revs(revset, negative)
+                else:
+                    revs = repo.revs(revset)
+            elif negative:
                 revs = repo.revs(revset, positive, negative)
             else:
                 revs = repo.revs(revset, positive)

{hgitaly-17.11.0 → hgitaly-17.11.1}/hgitaly/service/tests/test_commit.py

@@ -1333,6 +1333,7 @@ def test_list_commits(commit_fixture_empty_repo):
     ctx0 = wrapper.commit_file('foo', message="root changeset")
     sha0 = ctx0.hex()
     ctx1 = wrapper.commit_file('foo', topic='sampletop')
+    sha1 = ctx1.hex()
     wrapper.update(ctx0.rev())
     wrapper.command(b'mv', wrapper.repo.root + b'/foo',
                     wrapper.repo.root + b'/zoo')
@@ -1351,6 +1352,8 @@ def test_list_commits(commit_fixture_empty_repo):
     def caret(ctx):
         return b'^' + ctx.hex()
 
+    assert list_commits('--visible') == [sha4, sha3, sha2, sha1, sha0]
+    assert list_commits('--visible', caret(ctx3)) == [sha4, sha2, sha1]
     assert list_commits(sha4, caret(ctx1)) == [sha4, sha3, sha2]
     assert list_commits(sha4, caret(ctx1), reverse=True) == [sha2, sha3, sha4]
     assert list_commits(sha4, caret(ctx1), skip=1) == [sha3, sha2]

hgitaly-17.11.1/hgitaly/stub/mercurial_operations_pb2.py

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: mercurial-operations.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import errors_pb2 as errors__pb2
+from . import lint_pb2 as lint__pb2
+from . import shared_pb2 as shared__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from . import operations_pb2 as operations__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1amercurial-operations.proto\x12\x07hgitaly\x1a\x0c\x65rrors.proto\x1a\nlint.proto\x1a\x0cshared.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x10operations.proto\"\x94\x01\n\x14MergeAnalysisRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x17\n\x0fsource_revision\x18\x02 \x01(\x0c\x12\x17\n\x0ftarget_revision\x18\x03 \x01(\x0c\x12\x1c\n\x14skip_conflicts_check\x18\x04 \x01(\x08\"\xad\x02\n\x15MergeAnalysisResponse\x12\x17\n\x0fis_fast_forward\x18\x01 \x01(\x08\x12\x1f\n\x17has_obsolete_changesets\x18\x02 \x01(\x08\x12\x1f\n\x17has_unstable_changesets\x18\x03 \x01(\x08\x12\x15\n\rhas_conflicts\x18\x04 \x01(\x08\x12\x18\n\x10target_is_public\x18\x05 \x01(\x08\x12\x16\n\x0etarget_node_id\x18\x06 \x01(\t\x12\x15\n\rtarget_branch\x18\x07 \x01(\x0c\x12\x14\n\x0ctarget_topic\x18\x08 \x01(\x0c\x12\x16\n\x0esource_node_id\x18\t \x01(\t\x12\x15\n\rsource_branch\x18\n \x01(\x0c\x12\x14\n\x0csource_topic\x18\x0b \x01(\x0c\"N\n\x1eInvalidateMergeAnalysisRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\"<\n\x1fInvalidateMergeAnalysisResponse\x12\x19\n\x11invalidated_count\x18\x01 \x01(\r\"\xad\x01\n\x17PublishChangesetRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.gitaly.User\x12/\n\x08hg_perms\x18\x03 \x01(\x0e\x32\x1d.hgitaly.MercurialPermissions\x12\x17\n\x0fgitlab_revision\x18\x04 \x01(\x0c\"\x1a\n\x18PublishChangesetResponse\"P\n\x15PublishChangesetError\x12.\n\x0bgitlab_hook\x18\x01 \x01(\x0b\x32\x17.gitaly.CustomHookErrorH\x00\x42\x07\n\x05\x65rror\"\xa1\x02\n\x12MergeBranchRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.gitaly.User\x12/\n\x08hg_perms\x18\x03 \x01(\x0e\x32\x1d.hgitaly.MercurialPermissions\x12\x11\n\tcommit_id\x18\x04 \x01(\t\x12\x0e\n\x06\x62ranch\x18\x05 \x01(\x0c\x12\x0f\n\x07message\x18\x06 \x01(\x0c\x12-\n\ttimestamp\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x18\n\x10\x65xpected_old_oid\x18\x08 \x01(\t\x12\x13\n\x0bsemi_linear\x18\t \x01(\x08\"K\n\x13MergeBranchResponse\x12\x34\n\rbranch_update\x18\x01 \x01(\x0b\x32\x1d.gitaly.OperationBranchUpdate\"\xe7\x01\n\x10MergeBranchError\x12.\n\x0bgitlab_hook\x18\x01 \x01(\x0b\x32\x17.gitaly.CustomHookErrorH\x00\x12.\n\x08\x63onflict\x18\x02 \x01(\x0b\x32\x1a.gitaly.MergeConflictErrorH\x00\x12\x37\n\x0freference_check\x18\x03 \x01(\x0b\x32\x1c.gitaly.ReferenceUpdateErrorH\x00\x12\x31\n\tpre_check\x18\x04 \x01(\x0e\x32\x1c.hgitaly.PreCheckUpdateErrorH\x00\x42\x07\n\x05\x65rror\"\x9a\x01\n\rCensorRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x1a\n\x04user\x18\x02 \x01(\x0b\x32\x0c.gitaly.User\x12\x19\n\x11\x63hangeset_node_id\x18\x03 \x01(\t\x12\x11\n\tfile_path\x18\x04 \x01(\x0c\x12\x11\n\ttombstone\x18\x05 \x01(\x0c\"\x10\n\x0e\x43\x65nsorResponse\"\x87\x01\n\x1aGetWorkingDirectoryRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x11\n\tclient_id\x18\x02 \x01(\t\x12\x16\n\x0eincarnation_id\x18\x03 \x01(\t\x12\x10\n\x08revision\x18\x04 \x01(\x0c\"R\n\x1bGetWorkingDirectoryResponse\x12\x1c\n\x14working_directory_id\x18\x01 \x01(\r\x12\x15\n\rrelative_path\x18\x02 \x01(\t\"\x97\x01\n\x1eReleaseWorkingDirectoryRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x11\n\tclient_id\x18\x02 \x01(\t\x12\x16\n\x0eincarnation_id\x18\x03 \x01(\t\x12\x1c\n\x14working_directory_id\x18\x04 \x01(\r\"!\n\x1fReleaseWorkingDirectoryResponse*8\n\x14MercurialPermissions\x12\x08\n\x04READ\x10\x00\x12\t\n\x05WRITE\x10\x01\x12\x0b\n\x07PUBLISH\x10\x02*k\n\x13PreCheckUpdateError\x12\x0e\n\nNO_PROBLEM\x10\x00\x12\x14\n\x10NOT_FAST_FORWARD\x10\x01\x12\x16\n\x12OBSOLETE_CHANGESET\x10\x02\x12\x16\n\x12UNSTABLE_CHANGESET\x10\x03\x32\xc0\x05\n\x1aMercurialOperationsService\x12V\n\rMergeAnalysis\x12\x1d.hgitaly.MergeAnalysisRequest\x1a\x1e.hgitaly.MergeAnalysisResponse\"\x06\xfa\x97(\x02\x08\x02\x12t\n\x17InvalidateMergeAnalysis\x12\'.hgitaly.InvalidateMergeAnalysisRequest\x1a(.hgitaly.InvalidateMergeAnalysisResponse\"\x06\xfa\x97(\x02\x08\x02\x12_\n\x10PublishChangeset\x12 .hgitaly.PublishChangesetRequest\x1a!.hgitaly.PublishChangesetResponse\"\x06\xfa\x97(\x02\x08\x01\x12\x41\n\x06\x43\x65nsor\x12\x16.hgitaly.CensorRequest\x1a\x17.hgitaly.CensorResponse\"\x06\xfa\x97(\x02\x08\x01\x12P\n\x0bMergeBranch\x12\x1b.hgitaly.MergeBranchRequest\x1a\x1c.hgitaly.MergeBranchResponse\"\x06\xfa\x97(\x02\x08\x01\x12h\n\x13GetWorkingDirectory\x12#.hgitaly.GetWorkingDirectoryRequest\x1a$.hgitaly.GetWorkingDirectoryResponse\"\x06\xfa\x97(\x02\x08\x01\x12t\n\x17ReleaseWorkingDirectory\x12\'.hgitaly.ReleaseWorkingDirectoryRequest\x1a(.hgitaly.ReleaseWorkingDirectoryResponse\"\x06\xfa\x97(\x02\x08\x01\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'mercurial_operations_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_MERGEANALYSISREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_MERGEANALYSISREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_INVALIDATEMERGEANALYSISREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_INVALIDATEMERGEANALYSISREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_PUBLISHCHANGESETREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_PUBLISHCHANGESETREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_MERGEBRANCHREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_MERGEBRANCHREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_CENSORREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_CENSORREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_GETWORKINGDIRECTORYREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_GETWORKINGDIRECTORYREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_RELEASEWORKINGDIRECTORYREQUEST'].fields_by_name['repository']._loaded_options = None
+  _globals['_RELEASEWORKINGDIRECTORYREQUEST'].fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['MergeAnalysis']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['MergeAnalysis']._serialized_options = b'\372\227(\002\010\002'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['InvalidateMergeAnalysis']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['InvalidateMergeAnalysis']._serialized_options = b'\372\227(\002\010\002'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['PublishChangeset']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['PublishChangeset']._serialized_options = b'\372\227(\002\010\001'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['Censor']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['Censor']._serialized_options = b'\372\227(\002\010\001'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['MergeBranch']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['MergeBranch']._serialized_options = b'\372\227(\002\010\001'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['GetWorkingDirectory']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['GetWorkingDirectory']._serialized_options = b'\372\227(\002\010\001'
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['ReleaseWorkingDirectory']._loaded_options = None
+  _globals['_MERCURIALOPERATIONSSERVICE'].methods_by_name['ReleaseWorkingDirectory']._serialized_options = b'\372\227(\002\010\001'
+  _globals['_MERCURIALPERMISSIONS']._serialized_start=2202
+  _globals['_MERCURIALPERMISSIONS']._serialized_end=2258
+  _globals['_PRECHECKUPDATEERROR']._serialized_start=2260
+  _globals['_PRECHECKUPDATEERROR']._serialized_end=2367
+  _globals['_MERGEANALYSISREQUEST']._serialized_start=131
+  _globals['_MERGEANALYSISREQUEST']._serialized_end=279
+  _globals['_MERGEANALYSISRESPONSE']._serialized_start=282
+  _globals['_MERGEANALYSISRESPONSE']._serialized_end=583
+  _globals['_INVALIDATEMERGEANALYSISREQUEST']._serialized_start=585
+  _globals['_INVALIDATEMERGEANALYSISREQUEST']._serialized_end=663
+  _globals['_INVALIDATEMERGEANALYSISRESPONSE']._serialized_start=665
+  _globals['_INVALIDATEMERGEANALYSISRESPONSE']._serialized_end=725
+  _globals['_PUBLISHCHANGESETREQUEST']._serialized_start=728
+  _globals['_PUBLISHCHANGESETREQUEST']._serialized_end=901
+  _globals['_PUBLISHCHANGESETRESPONSE']._serialized_start=903
+  _globals['_PUBLISHCHANGESETRESPONSE']._serialized_end=929
+  _globals['_PUBLISHCHANGESETERROR']._serialized_start=931
+  _globals['_PUBLISHCHANGESETERROR']._serialized_end=1011
+  _globals['_MERGEBRANCHREQUEST']._serialized_start=1014
+  _globals['_MERGEBRANCHREQUEST']._serialized_end=1303
+  _globals['_MERGEBRANCHRESPONSE']._serialized_start=1305
+  _globals['_MERGEBRANCHRESPONSE']._serialized_end=1380
+  _globals['_MERGEBRANCHERROR']._serialized_start=1383
+  _globals['_MERGEBRANCHERROR']._serialized_end=1614
+  _globals['_CENSORREQUEST']._serialized_start=1617
+  _globals['_CENSORREQUEST']._serialized_end=1771
+  _globals['_CENSORRESPONSE']._serialized_start=1773
+  _globals['_CENSORRESPONSE']._serialized_end=1789
+  _globals['_GETWORKINGDIRECTORYREQUEST']._serialized_start=1792
+  _globals['_GETWORKINGDIRECTORYREQUEST']._serialized_end=1927
+  _globals['_GETWORKINGDIRECTORYRESPONSE']._serialized_start=1929
+  _globals['_GETWORKINGDIRECTORYRESPONSE']._serialized_end=2011
+  _globals['_RELEASEWORKINGDIRECTORYREQUEST']._serialized_start=2014
+  _globals['_RELEASEWORKINGDIRECTORYREQUEST']._serialized_end=2165
+  _globals['_RELEASEWORKINGDIRECTORYRESPONSE']._serialized_start=2167
+  _globals['_RELEASEWORKINGDIRECTORYRESPONSE']._serialized_end=2200
+  _globals['_MERCURIALOPERATIONSSERVICE']._serialized_start=2370
+  _globals['_MERCURIALOPERATIONSSERVICE']._serialized_end=3074
+# @@protoc_insertion_point(module_scope)

{hgitaly-17.11.0 → hgitaly-17.11.1}/hgitaly/stub/mercurial_operations_pb2_grpc.py

@@ -44,6 +44,11 @@ class MercurialOperationsServiceStub(object):
                 request_serializer=mercurial__operations__pb2.MergeAnalysisRequest.SerializeToString,
                 response_deserializer=mercurial__operations__pb2.MergeAnalysisResponse.FromString,
                 _registered_method=True)
+        self.InvalidateMergeAnalysis = channel.unary_unary(
+                '/hgitaly.MercurialOperationsService/InvalidateMergeAnalysis',
+                request_serializer=mercurial__operations__pb2.InvalidateMergeAnalysisRequest.SerializeToString,
+                response_deserializer=mercurial__operations__pb2.InvalidateMergeAnalysisResponse.FromString,
+                _registered_method=True)
         self.PublishChangeset = channel.unary_unary(
                 '/hgitaly.MercurialOperationsService/PublishChangeset',
                 request_serializer=mercurial__operations__pb2.PublishChangesetRequest.SerializeToString,
@@ -83,6 +88,15 @@ class MercurialOperationsServiceServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def InvalidateMergeAnalysis(self, request, context):
+        """Invalidate cache for MergeAnalysis
+
+        Will be used in mergeability checks and last-minute checks if needed.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def PublishChangeset(self, request, context):
         """Publish a changeset
 
@@ -140,6 +154,11 @@ def add_MercurialOperationsServiceServicer_to_server(servicer, server):
                     request_deserializer=mercurial__operations__pb2.MergeAnalysisRequest.FromString,
                     response_serializer=mercurial__operations__pb2.MergeAnalysisResponse.SerializeToString,
             ),
+            'InvalidateMergeAnalysis': grpc.unary_unary_rpc_method_handler(
+                    servicer.InvalidateMergeAnalysis,
+                    request_deserializer=mercurial__operations__pb2.InvalidateMergeAnalysisRequest.FromString,
+                    response_serializer=mercurial__operations__pb2.InvalidateMergeAnalysisResponse.SerializeToString,
+            ),
             'PublishChangeset': grpc.unary_unary_rpc_method_handler(
                     servicer.PublishChangeset,
                     request_deserializer=mercurial__operations__pb2.PublishChangesetRequest.FromString,
@@ -202,6 +221,33 @@ class MercurialOperationsService(object):
             metadata,
             _registered_method=True)
 
+    @staticmethod
+    def InvalidateMergeAnalysis(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.MercurialOperationsService/InvalidateMergeAnalysis',
+            mercurial__operations__pb2.InvalidateMergeAnalysisRequest.SerializeToString,
+            mercurial__operations__pb2.InvalidateMergeAnalysisResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
     @staticmethod
     def PublishChangeset(request,
             target,

{hgitaly-17.11.0 → hgitaly-17.11.1}/hgitaly.egg-info/PKG-INFO

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

{hgitaly-17.11.0 → hgitaly-17.11.1}/hgitaly.egg-info/SOURCES.txt

@@ -1,24 +1,8 @@
-.coveragerc
-.gitlab-ci.yml
-.hgignore
-.hgtags
 LICENSE
 MANIFEST.in
 README.md
-conftest.py
-dev-requirements.txt
-generate-stubs
 install-requirements.txt
-lint
-run-all-tests
 setup.py
-test-requirements.txt
-ci/heptapod-sftp-push
-ci/heptapod-sign-package
-ci/heptapod_known_hosts.ssh
-ci/upload-rhgitaly
-examples/client.py
-examples/client_list_lcft.py
 hgext3rd/__init__.py
 hgext3rd/hgitaly/__init__.py
 hgext3rd/hgitaly/revset.py
@@ -61,7 +45,6 @@ hgitaly.egg-info/dependency_links.txt
 hgitaly.egg-info/entry_points.txt
 hgitaly.egg-info/requires.txt
 hgitaly.egg-info/top_level.txt
-hgitaly/license_detector/GPL-2.sample
 hgitaly/license_detector/__init__.py
 hgitaly/license_detector/spdx-licenses.json
 hgitaly/linguist/__init__.py
@@ -144,15 +127,6 @@ hgitaly/testing/multiprocessing.py
 hgitaly/testing/ssh.py
 hgitaly/testing/sshd.py
 hgitaly/testing/storage.py
-hgitaly/testing/data/authorized_keys
-hgitaly/testing/data/backup_additional_no_git.tar
-hgitaly/testing/data/id_ecdsa_user
-hgitaly/testing/data/known_hosts
-hgitaly/testing/data/ssh_host_ecdsa_key
-hgitaly/testing/data/ssh_host_ecdsa_key.pub
-hgitaly/testing/data/ssh_host_ed25519
-hgitaly/testing/data/ssh_host_ed25519.pub
-hgitaly/testing/data/sshd_config
 hgitaly/testing/tests/__init__.py
 hgitaly/testing/tests/test_sshd.py
 hgitaly/tests/__init__.py
@@ -177,112 +151,6 @@ hgitaly/tests/test_servicer.py
 hgitaly/tests/test_stream.py
 hgitaly/tests/test_tag.py
 hgitaly/tests/test_workdir.py
-protos/analysis.proto
-protos/blob.proto
-protos/cleanup.proto
-protos/cluster.proto
-protos/commit.proto
-protos/conflicts.proto
-protos/diff.proto
-protos/errors.proto
-protos/hook.proto
-protos/internal.proto
-protos/lint.proto
-protos/log.proto
-protos/mercurial-changeset.proto
-protos/mercurial-operations.proto
-protos/mercurial-repository.proto
-protos/namespace.proto
-protos/objectpool.proto
-protos/operations.proto
-protos/packfile.proto
-protos/partition.proto
-protos/praefect.proto
-protos/ref.proto
-protos/remote.proto
-protos/repository.proto
-protos/server.proto
-protos/service_config.proto
-protos/shared.proto
-protos/smarthttp.proto
-protos/ssh.proto
-protos/transaction.proto
-protos/wiki.proto
-ruby/.ruby-version
-ruby/Gemfile
-ruby/README.md
-ruby/generate-grpc-lib
-ruby/hgitaly.gemspec
-ruby/run.rb
-ruby/lib/hgitaly.rb
-ruby/lib/hgitaly/mercurial-changeset_pb.rb
-ruby/lib/hgitaly/mercurial-changeset_services_pb.rb
-ruby/lib/hgitaly/mercurial-operations_pb.rb
-ruby/lib/hgitaly/mercurial-operations_services_pb.rb
-ruby/lib/hgitaly/mercurial-repository_pb.rb
-ruby/lib/hgitaly/mercurial-repository_services_pb.rb
-ruby/lib/hgitaly/version.rb
-rust/Cargo.lock
-rust/Cargo.toml
-rust/Makefile
-rust/build-from-tarball.sh
-rust/check-line-width
-rust/go-enry.rev
-rust/lint
-rust/mercurial.rev
-rust/rs-enry.rev
-rust/src-tarball.sh
-rust/dependencies/README.md
-rust/dependencies/mercurial.patch
-rust/dependencies/proto/google/protobuf/any.proto
-rust/dependencies/proto/google/protobuf/api.proto
-rust/dependencies/proto/google/protobuf/descriptor.proto
-rust/dependencies/proto/google/protobuf/duration.proto
-rust/dependencies/proto/google/protobuf/empty.proto
-rust/dependencies/proto/google/protobuf/field_mask.proto
-rust/dependencies/proto/google/protobuf/source_context.proto
-rust/dependencies/proto/google/protobuf/struct.proto
-rust/dependencies/proto/google/protobuf/timestamp.proto
-rust/dependencies/proto/google/protobuf/type.proto
-rust/dependencies/proto/google/protobuf/wrappers.proto
-rust/dependencies/proto/google/protobuf/compiler/plugin.proto
-rust/rhgitaly/Cargo.toml
-rust/rhgitaly/build.rs
-rust/rhgitaly/clippy.toml
-rust/rhgitaly/src/config.rs
-rust/rhgitaly/src/errors.rs
-rust/rhgitaly/src/git.rs
-rust/rhgitaly/src/glob.rs
-rust/rhgitaly/src/lib.rs
-rust/rhgitaly/src/main.rs
-rust/rhgitaly/src/mercurial.rs
-rust/rhgitaly/src/message.rs
-rust/rhgitaly/src/metadata.rs
-rust/rhgitaly/src/oid.rs
-rust/rhgitaly/src/process.rs
-rust/rhgitaly/src/sidecar.rs
-rust/rhgitaly/src/ssh.rs
-rust/rhgitaly/src/streaming.rs
-rust/rhgitaly/src/util.rs
-rust/rhgitaly/src/generated/README.md
-rust/rhgitaly/src/gitlab/mod.rs
-rust/rhgitaly/src/gitlab/reference.rs
-rust/rhgitaly/src/gitlab/revision.rs
-rust/rhgitaly/src/gitlab/state.rs
-rust/rhgitaly/src/repository/spawner.rs
-rust/rhgitaly/src/service/analysis.rs
-rust/rhgitaly/src/service/blob.rs
-rust/rhgitaly/src/service/diff.rs
-rust/rhgitaly/src/service/mercurial_repository.rs
-rust/rhgitaly/src/service/mod.rs
-rust/rhgitaly/src/service/ref.rs
-rust/rhgitaly/src/service/remote.rs
-rust/rhgitaly/src/service/repository.rs
-rust/rhgitaly/src/service/server.rs
-rust/rhgitaly/src/service/commit/find_commits.rs
-rust/rhgitaly/src/service/commit/get_tree_entries.rs
-rust/rhgitaly/src/service/commit/last_commits.rs
-rust/rhgitaly/src/service/commit/tree_entry.rs
 tests_with_gitaly/__init__.py
 tests_with_gitaly/comparison.py
 tests_with_gitaly/conftest.py
@@ -295,6 +163,7 @@ tests_with_gitaly/test_comparison.py
 tests_with_gitaly/test_diff.py
 tests_with_gitaly/test_gitaly_server.py
 tests_with_gitaly/test_mercurial_aux_git.py
+tests_with_gitaly/test_mercurial_operations.py
 tests_with_gitaly/test_mercurial_repository.py
 tests_with_gitaly/test_operations.py
 tests_with_gitaly/test_ref.py

hgitaly-17.11.1/tests_with_gitaly/test_mercurial_operations.py

@@ -0,0 +1,68 @@
+# Copyright 2025 Georges Racinet <georges.racinet@cloudcrane.io>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+import pytest
+
+from hgitaly.stub.mercurial_operations_pb2 import (
+    MergeAnalysisRequest,
+    InvalidateMergeAnalysisRequest,
+)
+from hgitaly.stub.mercurial_operations_pb2_grpc import (
+    MercurialOperationsServiceStub,
+)
+
+from . import skip_comparison_tests
+
+if skip_comparison_tests():  # pragma no cover
+    pytestmark = pytest.mark.skip
+
+
+def test_compare_merge_analysis(hgitaly_rhgitaly_comparison):
+    fixture = hgitaly_rhgitaly_comparison
+    repo_wrapper = fixture.hg_repo_wrapper
+    commit_file = repo_wrapper.commit_file
+    default_ctx = commit_file('foo')
+    top_cs = commit_file('foo', parent=default_ctx, topic='zetop')
+
+    rpc_helper = fixture.rpc_helper(
+        stub_cls=MercurialOperationsServiceStub,
+        method_name='MergeAnalysis',
+        request_cls=MergeAnalysisRequest,
+    )
+    assert_compare = rpc_helper.assert_compare
+    target_rev = b'branch/default'
+    assert_compare(source_revision=b'topic/default/zetop',
+                   target_revision=target_rev)
+    # second time to exert the cache
+    assert_compare(source_revision=b'topic/default/zetop',
+                   target_revision=target_rev)
+
+    obs_hex = top_cs.hex()
+    repo_wrapper.amend_file('foo')
+
+    # without invalidation, we have a problem:
+    obs_args = dict(source_revision=obs_hex, target_revision=target_rev)
+    resp = rpc_helper.rpc('rhgitaly', **obs_args)
+    assert not resp.has_obsolete_changesets  # oops
+    resp = rpc_helper.rpc('hgitaly', **obs_args)
+    assert resp.has_obsolete_changesets  # as expected
+
+    # invalidation (RHGitaly only)
+    resp = rpc_helper.stubs['rhgitaly'].InvalidateMergeAnalysis(
+        InvalidateMergeAnalysisRequest(
+            repository=fixture.hgitaly_repo)
+    )
+    assert resp.invalidated_count == 1
+
+    # third time that works thanks to cache invalidation.
+    assert_compare(**obs_args)
+
+    # resolution errors (uncached)
+    assert_errors = rpc_helper.assert_compare_errors
+    assert_errors(source_revision=b'topic/default/unknown',
+                  target_revision=b'branch/default')
+    assert_errors(source_revision=b'topic/default/zetop',
+                  target_revision=b'branch/unknown')

hgitaly-17.11.0/.coveragerc

@@ -1,5 +0,0 @@
-[run]
-omit=
-  hgitaly/stub/*
-  hgitaly/tests/*
-plugins = coverage_mercurial