hgitaly 18.5.0.dev0__tar.gz → 18.5.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.5.0.dev0
+Version: 18.5.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.3.0dev0
+Requires-Dist: heptapod>=5.4.0
 Requires-Dist: protobuf~=6.31.1
 Requires-Dist: grpcio~=1.75.0
 Requires-Dist: grpcio-status~=1.75.0

hgitaly-18.5.1/hgitaly/VERSION

@@ -0,0 +1 @@
+18.5.1

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/scripts.py

@@ -197,6 +197,7 @@ def stats():  # pragma no cover
     incomplete = total_requests - sum(len(succ) for succ in succeeded.values())
 
     stats = []
+    all_total_ms = 0
     for req, count in called.items():
         percent = round(count * 100 / total_requests)
         succ = succeeded[req]
@@ -208,10 +209,12 @@ def stats():  # pragma no cover
                          )
         stats.append((req, req_stats))
         if nb_succ > 0:
+            req_total = sum(s for s in succ)
+            all_total_ms += req_total
             timing = req_stats['completion_stats_ms'] = dict(
                 mean=statistics.mean(succ),
                 median=statistics.median(succ),
-                total=sum(s for s in succ),
+                total=req_total,
             )
             if nb_succ > 1:
                 timing['standard_deviation'] = statistics.pstdev(succ)
@@ -246,6 +249,7 @@ def stats():  # pragma no cover
 
     print(f"TOTAL Requests since {first_timestamp}: {total_requests} \n"
           f"      {incomplete} incomplete (cancelled or failed)")
+    print("Total wall time: %d seconds" % int(all_total_ms / 1000))
     print("Breakdown:")
     for req, details in stats.items():
         percent = '%4.1f' % details['percent']

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/server/mono.py

@@ -36,6 +36,7 @@ from ..service.commit import CommitServicer
 from ..service.ref import RefServicer
 from ..service.diff import DiffServicer
 from ..service.mercurial_changeset import MercurialChangesetServicer
+from ..service.mercurial_namespace import MercurialNamespaceServicer
 from ..service.mercurial_operations import MercurialOperationsServicer
 from ..service.mercurial_repository import MercurialRepositoryServicer
 from ..service.operations import OperationServicer
@@ -56,6 +57,9 @@ from ..stub.operations_pb2_grpc import (
 from ..stub.mercurial_changeset_pb2_grpc import (
     add_MercurialChangesetServiceServicer_to_server
 )
+from ..stub.mercurial_namespace_pb2_grpc import (
+    add_MercurialNamespaceServiceServicer_to_server
+)
 from ..stub.mercurial_operations_pb2_grpc import (
     add_MercurialOperationsServiceServicer_to_server
 )
@@ -105,6 +109,8 @@ def init(listen_urls, storages):
     add_DiffServiceServicer_to_server(DiffServicer(storages), server)
     add_MercurialChangesetServiceServicer_to_server(
         MercurialChangesetServicer(storages), server)
+    add_MercurialNamespaceServiceServicer_to_server(
+        MercurialNamespaceServicer(storages), server)
     add_MercurialOperationsServiceServicer_to_server(
         MercurialOperationsServicer(storages), server)
     add_MercurialRepositoryServiceServicer_to_server(

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/service/commit.py

@@ -148,7 +148,7 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
         try:
             ancestor = repo[request.ancestor_id.encode()]
             child = repo[request.child_id.encode()]
-        except error.RepoLookupError as exc:
+        except (error.RepoLookupError, error.ProgrammingError) as exc:
             # Gitaly just returns False. This is probably an inconsistency
             # in the client, so let's log it to help.
             logger.warning(
@@ -925,7 +925,7 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             sort_key = b'-topo' if reverse else b'topo'
         elif request.order == Order.DATE:
             # See docstring about this approximative choice
-            sort_key = b'-date' if reverse else b'date'
+            sort_key = b'date' if reverse else b'-date'
 
         revset = b'sort(%s, %s)' % (revset, sort_key)
 

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/service/diff.py

@@ -279,7 +279,8 @@ class DiffServicer(DiffServiceServicer, HGitalyServicer):
         parsed_request = parse_diff_request(self, request, context)
         parsed, repo, ctx_from, ctx_to = parsed_request
         if not parsed:
-            context.abort(StatusCode.FAILED_PRECONDITION, "exit status 128")
+            context.abort(StatusCode.FAILED_PRECONDITION,
+                          "eachDiff: exit status 128")
 
         m = None
         if request.paths:

hgitaly-18.5.1/hgitaly/service/mercurial_namespace.py

@@ -0,0 +1,101 @@
+# 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 logging
+import os
+import tarfile
+import tempfile
+
+from grpc import StatusCode
+
+from ..logging import LoggerAdapter
+from ..stream import (
+    WRITE_BUFFER_SIZE,
+    streaming_request_tempfile_extract,
+)
+from ..stub.mercurial_namespace_pb2 import (
+    MercurialNamespacesConfigArchive,
+    RestoreMercurialNamespacesConfigResponse,
+)
+from ..stub.mercurial_namespace_pb2_grpc import (
+    MercurialNamespaceServiceServicer,
+)
+from ..servicer import HGitalyServicer
+
+base_logger = logging.getLogger(__name__)
+
+
+class MercurialNamespaceServicer(MercurialNamespaceServiceServicer,
+                                 HGitalyServicer):
+    """MercurialNamespaceService implementation.
+
+    The ordering of methods in this source file is the same as in the proto
+    file.
+    """
+
+    def unique_storage_root(self, context):
+        if len(self.storages) > 1:  # pragma no cover
+            # we will need something to accomodate the case where
+            # several storages are in a common root directory
+            # or just have HGitaly (like RHGitaly) handle only one storage,
+            # but it is not the GitLab standard.
+            # another option (quite premature) is to accept the fact that
+            # this will be duplicated for each storage, not only each
+            # server.
+            context.abort(
+                StatusCode.FAILED_PRECONDITION,
+                "cannot efficiently backup namespaces configurations "
+                "when handling several storages"
+            )
+        return next(iter(self.storages.values()))
+
+    def BackupMercurialNamespacesConfig(self, request, context):
+        logger = LoggerAdapter(base_logger, context)
+        root = self.unique_storage_root(context)
+        with tempfile.TemporaryFile() as tmpf:
+            with tarfile.open(fileobj=tmpf, mode='w:gz') as tarf:
+                for tld in os.listdir(root):
+                    if tld in (b'+gitaly', b'+hgitaly', b'@hashed'):
+                        continue
+                    tld_abs = os.path.join(root, tld)
+                    if not os.path.isdir(tld_abs):
+                        continue
+                    if b'.hg' in os.listdir(tld_abs):
+                        # This is a Mercurial repository, should not
+                        # happen in normal operation, but it does in tests
+                        # let's bail
+                        continue
+
+                    logger.debug("Dumping namespace hgrc files for "
+                                 "top-level dir %r", tld)
+                    for (dir_abspath, subdirs, files) in os.walk(tld_abs):
+                        if b'hgrc' in files:
+                            file_abspath = os.path.join(dir_abspath, b'hgrc')
+                            file_relpath = os.path.relpath(file_abspath,
+                                                           root)
+                            # tarfile wants to operate on str, not bytes
+                            tarf.add(file_abspath,
+                                     arcname=os.fsdecode(file_relpath))
+            tmpf.seek(0)
+            first = True
+            while True:
+                chunk = tmpf.read(WRITE_BUFFER_SIZE)
+                if not chunk and not first:
+                    break
+                first = False
+                yield MercurialNamespacesConfigArchive(data=chunk)
+
+    def RestoreMercurialNamespacesConfig(self, request, context):
+        logger = LoggerAdapter(base_logger, context)
+        with streaming_request_tempfile_extract(
+                request, context) as (_options, tmpf):
+            tmpf.flush()
+            logger.info("Extracting tarball for Namespaces hgrc files")
+            with tarfile.open(fileobj=tmpf, mode='r:gz') as tarf:
+                # The client being the Rails app, it is deeply trusted
+                tarf.extractall(
+                    path=os.fsdecode(self.unique_storage_root(context)))
+        return RestoreMercurialNamespacesConfigResponse()

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/service/ref.py

@@ -647,6 +647,9 @@ class RefServicer(RefServiceServicer, HGitalyServicer):
                 ),
                 context), limit):
             refs.extend(name for name, _tgt in chunk)
+
+        # This is implicitely decoding as UTF-8, and raising if it fails
+        # (checked with the debugger)
         return FindRefsByOIDResponse(refs=refs)
 
 

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/service/repository.py

@@ -36,6 +36,7 @@ from hgext3rd.heptapod.branch import set_default_gitlab_branch
 from hgext3rd.heptapod.special_ref import write_gitlab_special_ref
 from hgext3rd.heptapod.keep_around import (
     create_keep_around,
+    delete_keep_around,
     parse_keep_around_ref,
 )
 
@@ -337,7 +338,9 @@ class RepositoryServicer(RepositoryServiceServicer, HGitalyServicer):
 
             keep_around = parse_keep_around_ref(ref)
             if keep_around is not None:
-                if (CHANGESET_HASH_BYTES_REGEXP.match(keep_around) is None
+                if target == ZERO_SHA:
+                    delete_keep_around(repo, keep_around)
+                elif (CHANGESET_HASH_BYTES_REGEXP.match(keep_around) is None
                         or target != keep_around):
                     context.abort(
                         StatusCode.INVALID_ARGUMENT,
@@ -346,8 +349,8 @@ class RepositoryServicer(RepositoryServiceServicer, HGitalyServicer):
                         "target must "
                         "match the ref name" % (target, ref)
                     )
-
-                create_keep_around(repo, target)
+                else:
+                    create_keep_around(repo, target)
                 return WriteRefResponse()
         except Exception:
             # TODO this is a stop-gap measure to prevent repository breakage

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/service/tests/test_commit.py

@@ -1362,8 +1362,9 @@ def test_list_commits(commit_fixture_empty_repo):
     # orderings
     Order = ListCommitsRequest.Order
     assert list_commits(sha4, order=Order.TOPO) == [sha4, sha3, sha2, sha0]
-    # having no explicit date, ctx0 looks to be the most recent one.
-    assert list_commits(sha4, order=Order.DATE) == [sha2, sha3, sha4, sha0]
+    # being the only one with no explicit date, ctx0 looks to be
+    # the most recent one.
+    assert list_commits(sha4, order=Order.DATE) == [sha0, sha4, sha3, sha2]
 
     # no result
     assert list_commits(sha4, caret(ctx4)) == []

hgitaly-18.5.1/hgitaly/service/tests/test_mercurial_namespace.py

@@ -0,0 +1,93 @@
+# 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 tarfile
+import os
+import shutil
+
+import pytest
+
+from hgitaly.stub.mercurial_namespace_pb2 import (
+    MercurialNamespacesConfigArchive,
+    BackupMercurialNamespacesConfigRequest,
+)
+from hgitaly.stub.mercurial_namespace_pb2_grpc import (
+    MercurialNamespaceServiceStub,
+)
+
+from .fixture import ServiceFixture
+
+parametrize = pytest.mark.parametrize
+
+
+class NamespaceFixture(ServiceFixture):
+    stub_cls = MercurialNamespaceServiceStub
+
+    def backup(self, target, **kw):
+        with open(target, 'wb') as targetf:
+            for resp in self.stub.BackupMercurialNamespacesConfig(
+                    BackupMercurialNamespacesConfigRequest(**kw)):
+                targetf.write(resp.data)
+
+    def restore(self, tarball, **kw):
+        with open(tarball, 'rb') as fobj:
+            def gen():
+                while True:
+                    r = fobj.read(100)
+                    yield MercurialNamespacesConfigArchive(data=r)
+                    if not r:
+                        break
+
+            return self.stub.RestoreMercurialNamespacesConfig(gen())
+
+
+@pytest.fixture
+def namespace_fixture(grpc_channel, server_repos_root):
+    with NamespaceFixture(grpc_channel, server_repos_root) as fixture:
+        yield fixture
+
+
+def test_backup_restore(namespace_fixture, server_repos_root, tmpdir):
+    fixture = namespace_fixture
+
+    group1 = server_repos_root / 'default/group1'
+    group2 = server_repos_root / 'default/group2'
+    group3 = server_repos_root / 'default/group3'
+    subgroup = group2 / 'sub'
+    os.makedirs(group1)
+    os.makedirs(subgroup)
+    os.makedirs(group3)
+    (group1 / 'hgrc').write_text("something\n")
+    (group2 / 'hgrc').write_text("some for two\n")
+    include = "%include ../hgrc\n"
+    (subgroup / 'hgrc').write_text(include)
+    # there is a repo at storage root (part of standard fixture),
+    # let's add some more stuff that we do not want
+    hashed = server_repos_root / 'default/@hashed'
+    os.makedirs(hashed)
+    (hashed / 'hgrc').write_text("unwnated\n")
+    (server_repos_root / 'default/stray-file').write_text(
+        "ignore top-level files")
+
+    tarball = tmpdir / 'testbak1.tgz'
+    fixture.backup(tmpdir / 'testbak1.tgz')
+
+    with tarfile.open(tarball) as tarf:
+        assert set(tarf.getnames()) == {
+            'group1/hgrc',
+            'group2/hgrc',
+            'group2/sub/hgrc',
+            }
+
+    shutil.rmtree(group1)
+    shutil.rmtree(group2)
+    shutil.rmtree(group3)
+    fixture.restore(tarball)
+
+    assert (group1 / 'hgrc').read_text() == "something\n"
+    assert (group2 / 'hgrc').read_text() == "some for two\n"
+    assert (subgroup / 'hgrc').read_text() == include
+    assert not group3.exists()

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/service/tests/test_repository_service.py

@@ -456,6 +456,8 @@ def test_write_ref(fixture_with_repo):
     create_keep_around(repo, existing_ka)
     fixture.write_ref(b'refs/keep-around/' + sha, sha)
     assert set(iter_keep_arounds(repo)) == {sha, existing_ka}
+    fixture.write_ref(b'refs/keep-around/' + existing_ka, ZERO_SHA)
+    assert set(iter_keep_arounds(repo)) == {sha}
 
 
 def test_write_special_refs_exceptions(fixture_with_repo):

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/stub/analysis_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from . import analysis_pb2 as analysis__pb2
 
-GRPC_GENERATED_VERSION = '1.74.0'
+GRPC_GENERATED_VERSION = '1.75.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

{hgitaly-18.5.0.dev0 → hgitaly-18.5.1}/hgitaly/stub/blob_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from . import blob_pb2 as blob__pb2
 
-GRPC_GENERATED_VERSION = '1.74.0'
+GRPC_GENERATED_VERSION = '1.75.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False