hgitaly 17.11.2__tar.gz → 18.0.0a1__tar.gz

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/.hgtags

@@ -143,3 +143,4 @@ c964e44bbddc2d8fd41fd72a685535dc7c793150 17.9.2
 fdf0201ab1df3afbb372f4dd1005009ca37be713 17.11.0a0
 035b7b7e03a1c34fea4bc7995d54d2c8d088c3f7 17.11.0
 82eb6e9f12cb5a63bcd6a1f5e9c5ff26fb17b0f6 17.11.1
+c719859a655c7de4b357d1c2ff0046fe55f78e2a 18.0.0a0

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/PKG-INFO

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

hgitaly-18.0.0a1/hgitaly/VERSION

@@ -0,0 +1 @@
+18.0.0a1

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly/service/repository.py

@@ -501,13 +501,20 @@ class RepositoryServicer(RepositoryServiceServicer, HGitalyServicer):
                 match_data.seek(0)
 
     def set_custom_hooks(self, request, context):
-        def load_repo(req, context):
-            return self.load_repo(req.repository, context)
+        logger = LoggerAdapter(base_logger, context)
 
         with streaming_request_tempfile_extract(
                 request, context,
-                first_request_handler=load_repo
-        ) as (repo, tmpf):
+                first_request_handler=lambda req, _context: req.repository
+        ) as (grpc_repo, tmpf):
+            if self.is_repo_aux_git(grpc_repo):
+                logger.warning(
+                    "Heptapod does not currently use custom hooks "
+                    "on auxiliary Git repositories. Nothing to do"
+                )
+                return
+
+            repo = self.load_repo(grpc_repo, context)
             tmpf.flush()
             try:
                 restore_additional(repo.ui, repo,

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly/service/tests/test_repository_service.py

@@ -38,6 +38,7 @@ from hgitaly.revision import ZERO_SHA
 from hgitaly.stream import WRITE_BUFFER_SIZE
 from hgitaly.testing import TEST_DATA_DIR
 from hgitaly.testing.bundle import list_bundle_contents
+from hgitaly.testing.storage import GIT_REPOS_STOWED_AWAY_PATH
 from hgitaly.workdir import (
     ROSTER_FILE_NAME as WDS_ROSTER_FILE_NAME,
     working_directory,
@@ -349,6 +350,19 @@ def test_repository_exists(fixture_with_repo):
     assert exc_info.value.code() == INVALID_ARGUMENT
 
 
+def test_vcs_qualified_storage(fixture_with_repo):
+    fixture = fixture_with_repo
+
+    fixture.grpc_repo.storage_name = 'hg:default'
+    assert fixture.exists()
+
+    fixture.grpc_repo.storage_name = 'rhg:default'
+    assert fixture.exists()
+
+    fixture.grpc_repo.relative_path = 'no/such/path'
+    assert not fixture.exists()
+
+
 def test_repository_size(fixture_with_repo):
     fixture = fixture_with_repo
     size = fixture.size()
@@ -854,6 +868,14 @@ def test_set_custom_hooks(fixture_with_repo, tmpdir, rpc_name):
         meth(invalid_tarball_path)
     assert exc_info.value.code() == INTERNAL
 
+    # case of Aux Git repository (nothing to be done, no error even if
+    # repository does not exist)
+    meth(tarball_path,
+         Repository(
+             storage_name=fixture.grpc_repo.storage_name,
+             relative_path=str(GIT_REPOS_STOWED_AWAY_PATH / 'some.git'),
+         ))
+
 
 @parametrize('rpc_name', ['backup', 'get'])
 def test_backup_custom_hooks(fixture_with_repo, tmpdir, rpc_name):

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly/servicer.py

@@ -32,6 +32,7 @@ from .stub.shared_pb2 import (
 
 GARBAGE_COLLECTING_RATE_GEN2 = 250
 GARBAGE_COLLECTING_RATE_GEN1 = 20
+AUX_GIT_REPOS_RELATIVE_DIR = "+hgitaly/hg-git"
 HG_GIT_MIRRORING_MD_KEY = 'x-heptapod-hg-git-mirroring'
 NATIVE_PROJECT_MD_KEY = 'x-heptapod-hg-native'
 # TODO check if there is a GitLab MD for this, it should:
@@ -129,6 +130,11 @@ class HGitalyServicer:
         #   (typically ignoring some settings that can be critical to
         #   operation)
 
+    def is_repo_aux_git(self, repository: Repository):
+        if repository is None:
+            return False
+        return repository.relative_path.startswith(AUX_GIT_REPOS_RELATIVE_DIR)
+
     def load_repo(self, repository: Repository, context,
                   for_mutation_by=None,
                   ):
@@ -288,7 +294,7 @@ class HGitalyServicer:
             # in request, without having the request object itself
             raise ValueError('repository not set')
 
-        root_dir = self.storages.get(storage_name)
+        root_dir = self.storages.get(storage_name.rsplit(':', 1)[-1])
         if root_dir is None:
             raise KeyError('storage', storage_name)
         return root_dir

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly/testing/ssh.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import sys
 
 
+# TODO move up to hgitaly.testing
 def hg_exe_path():  # pragma no cover
     """Return a Mercurial executable path consistent with these tests.
 

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly/tests/test_servicer.py

@@ -28,6 +28,7 @@ from ..testing.context import (
     FakeServicerContext,
     metadatum,
 )
+from ..testing.storage import GIT_REPOS_STOWED_AWAY_PATH
 from ..servicer import (
     HG_GIT_MIRRORING_MD_KEY,
     NATIVE_PROJECT_MD_KEY,
@@ -107,6 +108,23 @@ def test_load_repo(tmpdir):
     assert context.code == grpc.StatusCode.NOT_FOUND
 
 
+def test_is_repo_aux_git(tmpdir):
+    storage_root = tmpdir.join('repos')
+    storage_root_bytes = pycompat.sysbytes(str(storage_root))
+    servicer = HGitalyServicer(dict(storname=storage_root_bytes))
+
+    assert not servicer.is_repo_aux_git(None)
+    assert not servicer.is_repo_aux_git(
+        Repository(storage_name='storname',
+                   relative_path='some/repo.git')
+    )
+    assert servicer.is_repo_aux_git(
+        Repository(
+            storage_name='storname',
+            relative_path=str(GIT_REPOS_STOWED_AWAY_PATH / 'repo.git'))
+    )
+
+
 def test_load_repo_for_mutation(tmpdir):
     storage_root = tmpdir.join('repos')
     storage_root_bytes = pycompat.sysbytes(str(storage_root))

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly.egg-info/PKG-INFO

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

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/hgitaly.egg-info/SOURCES.txt

@@ -189,6 +189,7 @@ protos/hook.proto
 protos/internal.proto
 protos/lint.proto
 protos/log.proto
+protos/mercurial-aux-git.proto
 protos/mercurial-changeset.proto
 protos/mercurial-operations.proto
 protos/mercurial-repository.proto
@@ -215,6 +216,8 @@ ruby/generate-grpc-lib
 ruby/hgitaly.gemspec
 ruby/run.rb
 ruby/lib/hgitaly.rb
+ruby/lib/hgitaly/mercurial-aux-git_pb.rb
+ruby/lib/hgitaly/mercurial-aux-git_services_pb.rb
 ruby/lib/hgitaly/mercurial-changeset_pb.rb
 ruby/lib/hgitaly/mercurial-changeset_services_pb.rb
 ruby/lib/hgitaly/mercurial-operations_pb.rb
@@ -249,6 +252,7 @@ rust/dependencies/proto/google/protobuf/compiler/plugin.proto
 rust/rhgitaly/Cargo.toml
 rust/rhgitaly/build.rs
 rust/rhgitaly/clippy.toml
+rust/rhgitaly/src/bundle.rs
 rust/rhgitaly/src/config.rs
 rust/rhgitaly/src/errors.rs
 rust/rhgitaly/src/git.rs
@@ -260,6 +264,7 @@ rust/rhgitaly/src/message.rs
 rust/rhgitaly/src/metadata.rs
 rust/rhgitaly/src/oid.rs
 rust/rhgitaly/src/process.rs
+rust/rhgitaly/src/repository.rs
 rust/rhgitaly/src/sidecar.rs
 rust/rhgitaly/src/ssh.rs
 rust/rhgitaly/src/streaming.rs
@@ -272,7 +277,9 @@ 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/commit.rs
 rust/rhgitaly/src/service/diff.rs
+rust/rhgitaly/src/service/mercurial_aux_git.rs
 rust/rhgitaly/src/service/mercurial_repository.rs
 rust/rhgitaly/src/service/mod.rs
 rust/rhgitaly/src/service/ref.rs

hgitaly-18.0.0a1/protos/mercurial-aux-git.proto

@@ -0,0 +1,33 @@
+syntax = "proto3";
+
+package hgitaly;
+
+import "lint.proto";
+import "shared.proto";
+import "repository.proto";
+
+// Methods working on auxiliary Git repositories
+//
+// The auxiliary Git repositories are mostly meant to support mirroring
+// to external Git services.
+// These are set aside so that Gitaly does not handle them.
+service MercurialAuxGitService {
+  rpc AuxGitCreateBundle(.gitaly.CreateBundleRequest) returns (stream .gitaly.CreateBundleResponse) {
+    option (.gitaly.op_type) = {
+      op: ACCESSOR
+    };
+  }
+
+  rpc AuxGitCreateFromBundle(stream .gitaly.CreateRepositoryFromBundleRequest) returns (.gitaly.CreateRepositoryFromBundleResponse) {
+    option (.gitaly.op_type) = {
+      op: MUTATOR
+    };
+  }
+
+  rpc AuxGitRepositorySize(.gitaly.RepositorySizeRequest) returns (.gitaly.RepositorySizeResponse) {
+    option (.gitaly.op_type) = {
+      op: MUTATOR
+    };
+  }
+
+}

hgitaly-18.0.0a1/ruby/lib/hgitaly/mercurial-aux-git_pb.rb

@@ -0,0 +1,15 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: mercurial-aux-git.proto
+
+require 'lint_pb'
+require 'shared_pb'
+require 'repository_pb'
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("mercurial-aux-git.proto", :syntax => :proto3) do
+  end
+end
+
+module Hgitaly
+end

hgitaly-18.0.0a1/ruby/lib/hgitaly/mercurial-aux-git_services_pb.rb

@@ -0,0 +1,29 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: mercurial-aux-git.proto for package 'hgitaly'
+
+require 'grpc'
+require 'mercurial-aux-git_pb'
+
+module Hgitaly
+  module MercurialAuxGitService
+    # Methods working on auxiliary Git repositories
+    #
+    # The auxiliary Git repositories are mostly meant to support mirroring
+    # to external Git services.
+    # These are set aside so that Gitaly does not handle them.
+    class Service
+
+      include ::GRPC::GenericService
+
+      self.marshal_class_method = :encode
+      self.unmarshal_class_method = :decode
+      self.service_name = 'hgitaly.MercurialAuxGitService'
+
+      rpc :AuxGitCreateBundle, ::Gitaly::CreateBundleRequest, stream(::Gitaly::CreateBundleResponse)
+      rpc :AuxGitCreateFromBundle, stream(::Gitaly::CreateRepositoryFromBundleRequest), ::Gitaly::CreateRepositoryFromBundleResponse
+      rpc :AuxGitRepositorySize, ::Gitaly::RepositorySizeRequest, ::Gitaly::RepositorySizeResponse
+    end
+
+    Stub = Service.rpc_stub_class
+  end
+end

{hgitaly-17.11.2 → hgitaly-18.0.0a1}/ruby/lib/hgitaly/version.rb

@@ -1,4 +1,4 @@
 # This file is generated by generate-grpc-lib. Do not edit.
 module Hgitaly
-  VERSION = '17.11.1'
+  VERSION = '18.0.0a0'
 end