hgitaly 18.2.2__tar.gz → 18.3.0__tar.gz

{hgitaly-18.2.2/hgitaly.egg-info → hgitaly-18.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.2.2
+Version: 18.3.0
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -11,9 +11,9 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: heptapod>=5.2.0dev0
-Requires-Dist: protobuf~=5.26.0
-Requires-Dist: grpcio~=1.63.0
-Requires-Dist: grpcio-status~=1.63.0
+Requires-Dist: protobuf~=6.31.1
+Requires-Dist: grpcio~=1.74.0
+Requires-Dist: grpcio-status~=1.74.0
 Requires-Dist: grpc-interceptor
 Requires-Dist: grpcio-health-checking
 Requires-Dist: hg-loggingmod>=0.4.1

hgitaly-18.3.0/hgitaly/VERSION

@@ -0,0 +1 @@
+18.3.0

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/diff.py

@@ -32,6 +32,7 @@ from .oid import (
 from .stub.diff_pb2 import (
     ChangedPaths,
     DiffStats,
+    FindChangedPathsRequest,
 )
 
 GIT_PATCH_ID_TIMEOUT_SECONDS = 10
@@ -57,8 +58,23 @@ RENAMED = ChangedPaths.Status.RENAMED
 DIFF_HUNKS_START_RX = re.compile(rb'^(--- )|^(Binary file)')
 """To match the header line right before hunks start getting dumped."""
 
+DiffStatus = FindChangedPathsRequest.DiffStatus
 
-def changed_paths(repo, from_ctx, to_ctx, base_path, find_renames=False):
+Status_Filter_Map = dict(
+    added=DiffStatus.DIFF_STATUS_ADDED,
+    modified=DiffStatus.DIFF_STATUS_MODIFIED,
+    removed=DiffStatus.DIFF_STATUS_DELETED,
+    copied=DiffStatus.DIFF_STATUS_COPIED,
+    renamed=DiffStatus.DIFF_STATUS_RENAMED,
+    # TODO in case TYPE_CHANGE is explicitly filtered out or included,
+    # we should make the difference.
+)
+"""Mapping status object attributes to DiffFilter enum."""
+
+
+def changed_paths(repo, from_ctx, to_ctx, base_path,
+                  find_renames=False,
+                  diff_filters=()):
     if base_path is None:
         matcher = None
         path_trim_at = 0
@@ -83,19 +99,32 @@ def changed_paths(repo, from_ctx, to_ctx, base_path, find_renames=False):
     status = from_ctx.status(to_ctx, match=matcher)
     # this will remove renames from copy_info, keeping only actual copies
     yield from status_changed_paths(from_ctx, to_ctx, status, copy_info,
+                                    diff_filters=diff_filters,
                                     find_renames=find_renames,
                                     trim_at=path_trim_at)
+    if filtered_out('copied', diff_filters):
+        return
+
     yield from copy_changed_paths(from_ctx,
                                   to_ctx,
                                   copy_info,
                                   trim_at=path_trim_at)
 
 
+def filtered_out(status_type, diff_filters):
+    if not diff_filters:
+        return False
+    return Status_Filter_Map[status_type] not in diff_filters
+
+
 def status_changed_paths(from_ctx, to_ctx, status, copy_info,
+                         diff_filters=(),
                          find_renames=False, trim_at=0):
     rcopy_info = {v: k for k, v in copy_info.items()}
     """Return ChangedPaths from Mercurial status object"""
     for stype in ['added', 'modified', 'removed']:
+        if stype != 'removed' and filtered_out(stype, diff_filters):
+            continue
         for path in status.__getattribute__(stype):
             copied_from = copy_info.get(path)
             if copied_from is not None:
@@ -113,17 +142,23 @@ def status_changed_paths(from_ctx, to_ctx, status, copy_info,
             if stype == 'removed':
                 new_path = rcopy_info.get(path)
                 if new_path is None:
+                    if filtered_out(stype, diff_filters):
+                        continue
                     new_mode = OBJECT_MODE_DOES_NOT_EXIST
                     new_blob_id = NULL_BLOB_OID
                 else:
                     del copy_info[new_path]
                     if find_renames:
                         stype = 'renamed'
+                        if filtered_out(stype, diff_filters):
+                            continue
                         old_path = path
                         path = new_path
                         new_mode = git_perms(to_ctx.filectx(new_path))
                         new_blob_id = ctx_blob_oid(to_ctx, new_path)
                     else:
+                        if filtered_out(stype, diff_filters):
+                            continue
                         new_mode = OBJECT_MODE_DOES_NOT_EXIST
                         new_blob_id = NULL_BLOB_OID
             else:

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/errors.py

@@ -103,8 +103,9 @@ def operation_error_treatment(context, error_message_class, logger,
     except GitLabPreReceiveError as exc:
         message = exc.message
         if isinstance(message, str):
-            # should not normally happen, but let's make sure it is not
-            # a problem
+            # almost impossible with Mercurial 7.1, because the parent class,
+            # `error.Abort` converts automatically to bytes. Still keeping
+            # this last line of defense:
             message = message.encode('utf-8')
         attrs = {
             error_message_attr: CustomHookError(

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/service/commit.py

@@ -613,6 +613,11 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
                 context, StatusCode.NOT_FOUND, "commits not found",
                 FindCommitsError())
 
+        message_regex = request.message_regex
+        if message_regex:
+            grep = f" and grep('(?i){message_regex}')"
+            opts[b'rev'][0] += grep.encode('utf-8')
+
         walk_opts = logcmdutil.parseopts(repo.ui, pats, opts)
         revs, _ = logcmdutil.getrevs(repo, walk_opts)
 

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/service/diff.py

@@ -525,7 +525,8 @@ class DiffServicer(DiffServiceServicer, HGitalyServicer):
         for paths in chunked(path for extr in extracted
                              for path in changed_paths(
                                      repo, *extr,
-                                     find_renames=find_renames)):
+                                     find_renames=find_renames,
+                                     diff_filters=request.diff_filters)):
             yield FindChangedPathsResponse(paths=paths)
 
     def GetPatchID(self, request: GetPatchIDRequest,

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/service/operations.py

@@ -426,7 +426,9 @@ class OperationServicer(OperationServiceServicer, HGitalyServicer):
 
                     if header.action in (ActionType.CREATE,
                                          ActionType.UPDATE):
-                        content_handler = UserCommitFilesContent(wd, header)
+                        content_handler = UserCommitFilesContent(
+                            context, wd, header
+                        )
                     else:
                         content_handler = None
 
@@ -477,6 +479,31 @@ class OperationServicer(OperationServiceServicer, HGitalyServicer):
         )
 
 
+def validate_checkout_path(context, relpath):
+    # absolute paths are interpreted by Gitaly as relative to the
+    # root of checkout.
+    relpath = relpath.lstrip(b'/')
+
+    for p in FORBIDDEN_IN_PATHS:
+        if p in relpath:
+            relpath_str = relpath.decode('utf-8', 'surrogateescape')
+
+            if p == DIRECTORY_CLIMB_UP:
+                # ill-named by upstream
+                error_type = 'ERROR_TYPE_DIRECTORY_TRAVERSAL'
+                msg = 'Path cannot include directory traversal'
+            else:
+                error_type = 'ERROR_TYPE_INVALID_PATH'
+                msg = f'invalid path: "{relpath_str}"'
+
+            index_error(context,
+                        status_code='INVALID_ARGUMENT',
+                        error_type=error_type,
+                        msg=msg,
+                        path=relpath)
+    return relpath
+
+
 class UserCommitFilesAction:
 
     def __init__(self, context, header, working_dir, changed_files):
@@ -485,9 +512,8 @@ class UserCommitFilesAction:
         self.changed_files = changed_files
 
         wd = self.working_dir = working_dir
-        relpath = self.relpath = header.file_path
-        self.validate(relpath)
-        self.abspath = wd.file_path(relpath)
+        self.relpath = validate_checkout_path(context, header.file_path)
+        self.abspath = wd.file_path(self.relpath)
 
     def __call__(self):
         action = self.header.action
@@ -504,36 +530,6 @@ class UserCommitFilesAction:
         elif action == ActionType.CHMOD:
             return self.chmod()
 
-    def validate(self, relpath):
-        if os.path.isabs(relpath):
-            index_error(
-                self.context,
-                status_code='INVALID_ARGUMENT',
-                error_type='ERROR_TYPE_INVALID_PATH',
-                msg='absolute',
-                path=relpath,
-            )
-
-        for p in FORBIDDEN_IN_PATHS:
-            if p in relpath:
-                relpath_str = relpath.decode('utf-8', 'surrogateescape')
-
-                if p == DIRECTORY_CLIMB_UP:
-                    # ill-named by upstream
-                    error_type = 'ERROR_TYPE_DIRECTORY_TRAVERSAL'
-                    msg = 'Path cannot include directory traversal'
-                else:
-                    error_type = 'ERROR_TYPE_INVALID_PATH'
-                    msg = f'invalid path: "{relpath_str}"'
-
-                index_error(
-                    self.context,
-                    status_code='INVALID_ARGUMENT',
-                    error_type=error_type,
-                    msg=msg,
-                    path=relpath,
-                )
-
     def create(self):
         if os.path.exists(self.abspath):
             index_error(
@@ -600,8 +596,8 @@ class UserCommitFilesAction:
     def move(self):
         self.require_file_absence()
         abspath = self.abspath
-        prev_relpath = self.header.previous_path
-        self.validate(prev_relpath)
+        prev_relpath = validate_checkout_path(self.context,
+                                              self.header.previous_path)
         prev_abspath = self.working_dir.file_path(prev_relpath)
         self.require_file_existence(abspath=prev_abspath,
                                     relpath=prev_relpath)
@@ -636,8 +632,9 @@ class UserCommitFilesAction:
 
 class UserCommitFilesContent:
 
-    def __init__(self, workdir, header):
-        self.file_path = workdir.file_path(header.file_path)
+    def __init__(self, context, workdir, header):
+        relpath = validate_checkout_path(context, header.file_path)
+        self.file_path = workdir.file_path(relpath)
         self.fobj = open(self.file_path, 'wb')
         self.make_hg_executable = (header.action == ActionType.CREATE
                                    and header.execute_filemode)

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/service/tests/test_commit.py

@@ -368,6 +368,8 @@ def test_find_commits(commit_fixture_empty_repo):
         assert exc_info.value.code() == grpc.StatusCode.NOT_FOUND
     # with all, return all the commits
     assert find_commits_ids(all=True) == [sha0, sha1, sha2, sha3, sha4]
+    # with message_regex
+    assert find_commits_ids(all=True, message_regex='FOO.*zoO') == [sha2]
     # with offset
     assert find_commits_ids(all=True, offset=2) == [sha2, sha3, sha4]
     # with skip_merges

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/service/tests/test_diff.py

@@ -34,6 +34,13 @@ from hgitaly.stub.diff_pb2_grpc import DiffServiceStub
 from .fixture import ServiceFixture
 
 StatusCode = grpc.StatusCode
+DiffStatus = FindChangedPathsRequest.DiffStatus
+
+DS_ADDED = DiffStatus.DIFF_STATUS_ADDED
+DS_MODIFIED = DiffStatus.DIFF_STATUS_MODIFIED
+DS_DELETED = DiffStatus.DIFF_STATUS_DELETED
+DS_COPIED = DiffStatus.DIFF_STATUS_COPIED
+DS_RENAMED = DiffStatus.DIFF_STATUS_RENAMED
 
 
 class DiffFixture(ServiceFixture):
@@ -170,9 +177,9 @@ def test_raw_diff(diff_fixture):
                                message=b'added foo')
     ctx1 = wrapper.commit_file('foo', content="I am foo\n",
                                message=b'changes foo')
-    wrapper.command(b'mv', wrapper.repo.root + b'/foo',
+    wrapper.command('mv', wrapper.repo.root + b'/foo',
                     wrapper.repo.root + b'/zoo')
-    wrapper.command(b'ci', message=b"rename foo to zoo")
+    wrapper.command('ci', message=b"rename foo to zoo")
     ctx2 = wrapper.repo[b'.']
     sha0, sha1, sha2 = ctx0.hex(), ctx1.hex(), ctx2.hex()
 
@@ -367,7 +374,7 @@ def test_commit_diff(diff_fixture):
                                message="Add bar")
     ctx1 = wrapper.commit_file('bar', content="I am in\nbar\n",
                                message="Changes bar")
-    wrapper.command(b'mv', wrapper.repo.root + b'/bar',
+    wrapper.command('mv', wrapper.repo.root + b'/bar',
                     wrapper.repo.root + b'/zar')
     ctx2 = wrapper.commit([b'bar', b'zar'], message="Rename bar to zar")
     ctx3 = wrapper.commit_file('zoo', content="I am in\nzoo\n",
@@ -470,7 +477,7 @@ def test_commit_delta(diff_fixture):
                                message="Add bar")
     ctx1 = wrapper.commit_file('bar', content="I am in\nbar\n",
                                message="Changes bar")
-    wrapper.command(b'mv', wrapper.repo.root + b'/bar',
+    wrapper.command('mv', wrapper.repo.root + b'/bar',
                     wrapper.repo.root + b'/zar')
     ctx2 = wrapper.commit([b'bar', b'zar'], message="Rename bar to zar")
     ctx3 = wrapper.commit_file('zoo', content="I am in\nzoo\n",
@@ -545,7 +552,7 @@ def test_diff_stats(diff_fixture):
                         message="Add bar")
     ctx1 = wrapper.commit_file('bar', content="I am in\nbar\n",
                                message="Changes bar")
-    wrapper.command(b'mv', wrapper.repo.root + b'/bar',
+    wrapper.command('mv', wrapper.repo.root + b'/bar',
                     wrapper.repo.root + b'/zar')
     ctx2 = wrapper.commit([b'bar', b'zar'], message="Rename bar to zar")
     ctx3 = wrapper.commit_file('zoo', content="I am in\nzoo\n",
@@ -586,8 +593,15 @@ def test_diff_stats(diff_fixture):
     assert exc_info.value.code() == grpc.StatusCode.FAILED_PRECONDITION
 
 
+def sub_dict(d, *keys):
+    """Sub dict with given keys, after encoding to bytes."""
+    return {k.encode('ascii'): d[k.encode('ascii')]
+            for k in keys}
+
+
 def test_find_changed_paths(diff_fixture):
     wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
 
     (wrapper.path / 'sub').mkdir()
     (wrapper.path / 'sub/foo').write_text('foo content')
@@ -599,8 +613,7 @@ def test_find_changed_paths(diff_fixture):
     (wrapper.path / 'too').chmod(0o755)
     (wrapper.path / 'sub/foo').write_text('foo content modified')
     (wrapper.path / 'bar').unlink()
-    wrapper.command(b'cp', wrapper.repo.root + b'/zoo',
-                    wrapper.repo.root + b'/zaz')
+    wrapper.command('cp', repo.root + b'/zoo', repo.root + b'/zaz')
     ctx1 = wrapper.commit(rel_paths=['sub/foo', 'bar', 'zaz', 'too'],
                           add_remove=True)
 
@@ -635,6 +648,15 @@ def test_find_changed_paths(diff_fixture):
     assert diff_fixture.find_changed_paths_commits(
         [ctx1.hex(), ctx2.hex()]) == resp_dict
 
+    # diff_filters
+    def fcp_filtered(filters):
+        return diff_fixture.find_changed_paths_commits(
+            [ctx1.hex(), ctx2.hex()], diff_filters=filters)
+
+    assert fcp_filtered([DS_ADDED]) == sub_dict(resp_dict, 'too')
+    assert fcp_filtered([DS_MODIFIED]) == sub_dict(resp_dict, 'sub/foo')
+    assert fcp_filtered([DS_COPIED]) == sub_dict(resp_dict, 'zaz')
+
     # Testing by passing "parents" (changesets to compare to)
     ctx3 = wrapper.commit_file("toto")
     assert diff_fixture.find_changed_paths_commits(
@@ -648,7 +670,6 @@ def test_find_changed_paths(diff_fixture):
         }
 
     # Tree requests
-    repo = wrapper.repo
     sub0_oid, sub1_oid = [tree_oid(repo, ctx.hex().decode('ascii'), b'sub')
                           for ctx in (ctx0, ctx1)]
     assert diff_fixture.find_changed_paths_tree(sub0_oid, sub1_oid) == {
@@ -669,17 +690,16 @@ def test_find_changed_paths(diff_fixture):
 
 def test_find_changed_paths_copy_in_tree(diff_fixture):
     wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
 
     (wrapper.path / 'subdir').mkdir()  # avoid all lengths to be 3
     (wrapper.path / 'subdir/bar').write_text('some bar')
     ctx0 = wrapper.commit(rel_paths=['subdir'], add_remove=True)
 
-    wrapper.command(b'cp', wrapper.repo.root + b'/subdir/bar',
-                    wrapper.repo.root + b'/subdir/baz')
+    wrapper.command('cp', repo.root + b'/subdir/bar',
+                    repo.root + b'/subdir/baz')
     ctx1 = wrapper.commit(rel_paths=['subdir'])
 
-    repo = wrapper.repo
-
     sub0_oid, sub1_oid = [tree_oid(repo, ctx.hex().decode('ascii'), b'subdir')
                           for ctx in (ctx0, ctx1)]
     assert diff_fixture.find_changed_paths_tree(sub0_oid, sub1_oid) == {
@@ -689,25 +709,23 @@ def test_find_changed_paths_copy_in_tree(diff_fixture):
 
 def test_find_changed_paths_rename(diff_fixture):
     wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
 
     (wrapper.path / 'subdir').mkdir()  # avoid all lengths to be 3
     (wrapper.path / 'subdir/bar').write_text('some bar')
     ctx0 = wrapper.commit(rel_paths=['subdir'], add_remove=True)
 
-    wrapper.command(b'mv', wrapper.repo.root + b'/subdir/bar',
-                    wrapper.repo.root + b'/subdir/baz')
+    wrapper.command('mv', repo.root + b'/subdir/bar',
+                    repo.root + b'/subdir/baz')
     ctx1 = wrapper.commit(rel_paths=['subdir'])
 
-    repo = wrapper.repo
+    def fcp(**opts):
+        return diff_fixture.find_changed_paths_commits(
+            [ctx1.hex()],
+            compare_to=[ctx0.hex()],
+            **opts)
 
-    sub0_oid, sub1_oid = [tree_oid(repo, ctx.hex().decode('ascii'), b'subdir')
-                          for ctx in (ctx0, ctx1)]
-    ret = diff_fixture.find_changed_paths_commits(
-        [ctx1.hex()],
-        compare_to=[ctx0.hex()],
-        find_renames=False,
-    )
-    assert ret == {
+    expected_no_renames = {
         b'subdir/baz': [(ChangedPaths.Status.ADDED,
                          (OBJECT_MODE_DOES_NOT_EXIST,
                           OBJECT_MODE_NON_EXECUTABLE),
@@ -718,17 +736,50 @@ def test_find_changed_paths_rename(diff_fixture):
                          )],
     }
 
-    ret = diff_fixture.find_changed_paths_commits(
-        [ctx1.hex()],
-        compare_to=[ctx0.hex()],
-        find_renames=True,
-    )
-    assert ret == {
+    assert fcp(find_renames=False) == expected_no_renames
+    assert fcp(find_renames=False,
+               diff_filters=[DS_ADDED],
+               ) == sub_dict(expected_no_renames, 'subdir/baz')
+    assert fcp(find_renames=False,
+               diff_filters=[DS_DELETED],
+               ) == sub_dict(expected_no_renames, 'subdir/bar')
+
+    expected_renames = {
         b'subdir/baz': [(ChangedPaths.Status.RENAMED, None)],
     }
+    assert fcp(find_renames=True) == expected_renames
+    assert fcp(find_renames=True,
+               diff_filters=[DS_ADDED, DS_MODIFIED, DS_DELETED]
+               ) == {}
+    assert fcp(find_renames=True,
+               diff_filters=[DS_RENAMED]) == expected_renames
+
+
+def test_find_changed_paths_rename_and_copy(diff_fixture):
+    wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
+
+    ctx0 = wrapper.commit_file('foo')
+    wrapper.command('cp', repo.root + b'/foo', repo.root + b'/bar')
+    wrapper.command('mv', repo.root + b'/foo', repo.root + b'/bar2')
+    ctx1 = wrapper.commit(rel_paths=['foo', 'bar', 'bar2'])
+
+    def fcp(find_renames=True, **opts):
+        return diff_fixture.find_changed_paths_commits(
+            [ctx1.hex()],
+            compare_to=[ctx0.hex()],
+            find_renames=find_renames,
+            **opts)
+
+    expected = {
+        b'bar': [(ChangedPaths.Status.COPIED, None)],
+        b'bar2': [(ChangedPaths.Status.RENAMED, None)],
+    }
 
-    # TODO test the case of rename with duplication:
-    # hg cp foo bar; hg mv foo bar2
+    assert fcp() == expected
+    assert fcp(diff_filters=[DS_ADDED]) == {}
+    assert fcp(diff_filters=[DS_RENAMED]) == sub_dict(expected, 'bar2')
+    assert fcp(diff_filters=[DS_COPIED]) == sub_dict(expected, 'bar')
 
 
 def test_get_patch_id(diff_fixture):

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/service/tests/test_operations.py

@@ -757,7 +757,7 @@ def test_user_commit_files(operations_fixture, tmpdir):
     assert exc_info.value.code() == StatusCode.ALREADY_EXISTS
 
     # invalid paths
-    for path in ('double//slash', '../../../good.joke', '/etc/shadow'):
+    for path in ('double//slash', '../../../good.joke'):
         with pytest.raises(RpcError) as exc_info:
             commit_files(
                 branch_name=gl_branch,
@@ -793,6 +793,21 @@ def test_user_commit_files(operations_fixture, tmpdir):
             )
         assert exc_info.value.code() == StatusCode.INVALID_ARGUMENT
 
+    # leading slash is interpreted as meaning the root of checkout
+    resp = commit_files(
+        branch_name=gl_branch,
+        commit_message=b'Deleted intopic',
+        actions=(dict(action=ActionType.CREATE,
+                      file_path=b'/etc/shadow',
+                      content=b"This is in repo!",
+                      ),
+                 )
+    )
+    hex11 = resp.branch_update.commit_id.encode()
+    wrapper.reload()
+    clone_pull_update(hex11)
+    assert (clone.path / 'etc/shadow').read_binary() == b"This is in repo!"
+
     # bogus request flows
     header_req = fixture.user_commit_files_header(
         branch_name=gl_other_branch,

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/stub/analysis_pb2.py

@@ -1,12 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: analysis.proto
-# Protobuf Python Version: 5.26.1
+# Protobuf Python Version: 6.31.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 runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'analysis.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/stub/analysis_pb2_grpc.py

@@ -5,10 +5,8 @@ import warnings
 
 from . import analysis_pb2 as analysis__pb2
 
-GRPC_GENERATED_VERSION = '1.63.2'
+GRPC_GENERATED_VERSION = '1.74.0'
 GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
 _version_not_supported = False
 
 try:
@@ -18,15 +16,12 @@ except ImportError:
     _version_not_supported = True
 
 if _version_not_supported:
-    warnings.warn(
+    raise RuntimeError(
         f'The grpc package installed is at version {GRPC_VERSION},'
         + f' but the generated code in analysis_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
     )
 
 
@@ -78,6 +73,7 @@ def add_AnalysisServiceServicer_to_server(servicer, server):
     generic_handler = grpc.method_handlers_generic_handler(
             'gitaly.AnalysisService', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('gitaly.AnalysisService', rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/stub/blob_pb2.py

@@ -1,12 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: blob.proto
-# Protobuf Python Version: 5.26.1
+# Protobuf Python Version: 6.31.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 runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'blob.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/stub/blob_pb2_grpc.py

@@ -5,10 +5,8 @@ import warnings
 
 from . import blob_pb2 as blob__pb2
 
-GRPC_GENERATED_VERSION = '1.63.2'
+GRPC_GENERATED_VERSION = '1.74.0'
 GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
 _version_not_supported = False
 
 try:
@@ -18,15 +16,12 @@ except ImportError:
     _version_not_supported = True
 
 if _version_not_supported:
-    warnings.warn(
+    raise RuntimeError(
         f'The grpc package installed is at version {GRPC_VERSION},'
         + f' but the generated code in blob_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
     )
 
 
@@ -190,6 +185,7 @@ def add_BlobServiceServicer_to_server(servicer, server):
     generic_handler = grpc.method_handlers_generic_handler(
             'gitaly.BlobService', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('gitaly.BlobService', rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.

{hgitaly-18.2.2 → hgitaly-18.3.0}/hgitaly/stub/commit_pb2.py

@@ -1,12 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: commit.proto
-# Protobuf Python Version: 5.26.1
+# Protobuf Python Version: 6.31.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 runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'commit.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()