hgitaly 2.9.0__tar.gz → 2.11.0__tar.gz

{hgitaly-2.9.0 → hgitaly-2.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 2.9.0
+Version: 2.11.0
 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>=4.8.0dev0
+Requires-Dist: heptapod>=5.0.0dev0
 Requires-Dist: protobuf~=4.21.0
 Requires-Dist: grpcio~=1.58.0
 Requires-Dist: grpcio-status~=1.58.0

hgitaly-2.11.0/hgitaly/VERSION

@@ -0,0 +1 @@
+2.11.0

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/gitlab_ref.py

@@ -13,6 +13,8 @@ utilities about refs, i.e, anything about a full ref path, such as
 or tags.
 """
 from fnmatch import fnmatch
+import os
+import re
 
 from heptapod.gitlab.branch import gitlab_branch_ref
 from heptapod.gitlab.tag import gitlab_tag_ref
@@ -30,10 +32,40 @@ from hgext3rd.heptapod.special_ref import (
 )
 from hgext3rd.heptapod.keep_around import (
     iter_keep_arounds,
+    init_keep_arounds,
     KEEP_AROUND_REF_PREFIX,
     KEEP_AROUND_REF_PREFIX_LEN,
 )
 
+DOT_HG_RX = re.compile(br'\.hg$')
+
+
+def has_legacy_git_repo(repo):
+    """Return whether there is a legacy Git repo for this Mercurial repo.
+
+    With "legacy" here is meant the Git repository for a non-native project.
+    Git repositories meant for mirroring are *not* included in this scope.
+
+    As of Heptapod 17.6, this is the best way to know without direct indication
+    (from the inside) that a repository is not legacy (hg-git based).
+    The reverse implication is false, as there are loopholes:
+
+    - leftover Git repositories for Projects that have migrated to native
+    - native projects with addition conversion for mirrors whose Git
+      repositories have not been moved yet (bug, time to run the migration,
+      etc.)
+
+    The caller must be aware of these loopholes and avoid overwriting existing
+    data based on the legacy Git repo. In the intended case where this is to
+    decide on calling the `ensure` methods, this means it is ok only if there
+    is no existing data.
+    """
+    # if a repository is legacy, based on hg-git conversion, is whether
+    # it has a `.git` repository at the same location. Git repositories
+    # for mirroring are in a different place
+    git_path = DOT_HG_RX.sub(b'', repo.root) + b'.git'
+    return os.path.exists(git_path)
+
 
 def gitlab_special_ref_target(repo, ref_path):
     """Return the changeset for a special ref.
@@ -115,7 +147,23 @@ def iter_gitlab_special_refs_as_refs(repo, deref=True, patterns=None):
 
 
 def ensure_special_refs(repo):
-    return ensure_gitlab_special_refs(repo.ui, repo)
+    if has_legacy_git_repo(repo):
+        return ensure_gitlab_special_refs(repo.ui, repo)
+    return {}
+
+
+def ensure_keep_arounds(repo, init_empty=False):
+    """Ensure keep around from Git repo if present or create.
+
+    An empty file is created so that the keep-arounds file is no
+    more missing, but only if `init_empty` is `True`, so that
+    responsibility is handed to the caller, than must use the
+    option only after having obtained the missing marker.
+    """
+    if has_legacy_git_repo(repo):
+        ensure_gitlab_keep_arounds(repo.ui, repo)
+    elif init_empty:
+        init_keep_arounds(repo, ())
 
 
 def has_keep_around(repo, sha):
@@ -125,7 +173,7 @@ def has_keep_around(repo, sha):
     """
     for ka in iter_keep_arounds(repo):
         if ka is GITLAB_TYPED_REFS_MISSING:
-            ensure_gitlab_keep_arounds(repo.ui, repo)
+            ensure_keep_arounds(repo, init_empty=True)
             return has_keep_around(repo, sha)
         if ka == sha:
             return True
@@ -146,7 +194,7 @@ def parse_keep_around_ref_path(ref):
 def iter_keep_arounds_as_refs(repo, deref=True, patterns=None):
     for sha in iter_keep_arounds(repo):
         if sha is GITLAB_TYPED_REFS_MISSING:
-            ensure_gitlab_keep_arounds(repo.ui, repo)
+            ensure_keep_arounds(repo, init_empty=True)
             yield from iter_keep_arounds_as_refs(repo, deref=deref)
             return
         ref_path = keep_around_ref_path(sha)

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/service/mercurial_repository.py

@@ -16,6 +16,7 @@ from mercurial import (
 )
 
 from ..branch import iter_gitlab_branches_matching
+from ..logging import LoggerAdapter
 from ..peer import (
     FileURLOutsidePath,
     InvalidURLScheme,
@@ -30,6 +31,10 @@ from ..repository import (
     set_config_inheritance,
     set_managed_config,
 )
+from ..workdir import (
+    remove_unlisted_workdirs,
+    workdirs_gc,
+)
 from ..errors import (
     not_implemented,
 )
@@ -39,6 +44,8 @@ from ..stub.mercurial_repository_pb2 import (
     GetConfigItemResponse,
     GetManagedConfigRequest,
     GetManagedConfigResponse,
+    HousekeepingRequest,
+    HousekeepingResponse,
     PushRequest,
     PushResponse,
     SetManagedConfigRequest,
@@ -49,7 +56,7 @@ from ..stub.mercurial_repository_pb2_grpc import (
 )
 from ..servicer import HGitalyServicer
 
-logger = logging.getLogger(__name__)
+base_logger = logging.getLogger(__name__)
 
 
 class MercurialRepositoryServicer(MercurialRepositoryServiceServicer,
@@ -186,3 +193,55 @@ class MercurialRepositoryServicer(MercurialRepositoryServiceServicer,
             context.abort(StatusCode.INTERNAL,
                           "Unexpected error, not in the actual "
                           "push to %r: %s" % (remote_url, exc))
+
+    def Housekeeping(self,
+                     request: HousekeepingRequest,
+                     context) -> HousekeepingResponse:
+        logger = LoggerAdapter(base_logger, context)
+        gl_repo = request.repository
+        repo = self.load_repo(gl_repo, context)
+        tasks = []
+        resp_attrs = {}
+        if request.fail:
+            tasks.append('fail')
+        if request.working_directories_age_threshold_seconds:
+            tasks.append('working_dirs_gc')
+        if request.working_directories_remove_unlisted:
+            tasks.append('remove_unlisted_working_dirs')
+        if request.recover:
+            tasks.append('recover')
+        for task in tasks:
+            try:
+                resp_attrs.update(getattr(self, 'housekeeping_' + task)(
+                    repo=repo,
+                    request=request,
+                    context=context
+                ))
+            except Exception as exc:
+                logger.error("Housekeeping task %s failed: %r" % (task, exc))
+
+        return HousekeepingResponse(**resp_attrs)
+
+    def housekeeping_fail(self, *a, **kw):
+        raise RuntimeError("client-required failure")
+
+    def housekeeping_working_dirs_gc(self, repo, request, context):
+        workdirs_gc(
+            workdirs_root=self.repo_workdirs_root(request.repository, context),
+            repo=repo,
+            max_age_seconds=request.working_directories_age_threshold_seconds
+        )
+        return [('working_directories_gc', True)]
+
+    def housekeeping_remove_unlisted_working_dirs(self, repo,
+                                                  request, context):
+        remove_unlisted_workdirs(
+            repo=repo,
+            workdirs_root=self.repo_workdirs_root(request.repository, context),
+        )
+        return [('working_directories_remove_unlisted', True)]
+
+    def housekeeping_recover(self, repo, request, context):
+        return (('recover_run', True),
+                ('recovered_interrupted_transaction',  repo.recover()),
+                )

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/service/tests/fixture.py

@@ -11,7 +11,6 @@ import shutil
 from hgitaly import feature
 from hgitaly.logging import CORRELATION_ID_MD_KEY
 from hgitaly.servicer import (
-    HG_GIT_MIRRORING_MD_KEY,
     NATIVE_PROJECT_MD_KEY,
     PY_HEPTAPOD_SKIP_HOOKS,
     SKIP_HOOKS_MD_KEY,
@@ -36,6 +35,9 @@ from hgitaly.stub.ref_pb2 import (
 from hgitaly.stub.shared_pb2 import (
     User,
 )
+from hgitaly.testing.storage import (
+    stowed_away_git_repo_path,
+)
 
 # for coverage of hgitaly.logging
 intercept_logger.setLevel(logging.DEBUG)
@@ -156,15 +158,11 @@ class ServiceFixture:
         return self.storage_path(**kw) / rel_path
 
     def side_git_repo_path(self, hg_path, **kw):
-        hg_rel_path = hg_path.relative_to(self.storage_path(**kw))
-        git_rel_path = str(hg_rel_path).split('.hg', 1)[0] + '.git'
-        return self.storage_path(**kw) / '+hgitaly/hg-git' / git_rel_path
+        return stowed_away_git_repo_path(self.server_repos_root, hg_path,
+                                         **kw)
 
-    def side_git_repo(self, hg_path, **kw):
-        path = self.side_git_repo_path(hg_path, **kw)
-        if not path.exists():  # can happen if no transaction occurred
-            path = hg_path.with_suffix('.git')
-        return GitRepo(path)
+    def side_git_repo(self, *a, **kw):
+        return GitRepo(self.side_git_repo_path(*a, **kw))
 
     def make_repo_wrapper(self, rel_path, **kw):
         """Utility method to avoid depending too much on actual disk layout.
@@ -216,9 +214,6 @@ class MutationServiceFixture(ServiceFixture):
         mds = super(MutationServiceFixture, self).grpc_metadata()
         native = getattr(self, 'hg_native', True)
         mds.append((NATIVE_PROJECT_MD_KEY, str(native)))
-        with_mirroring = getattr(self, 'with_hg_git_mirroring', None)
-        if native and with_mirroring is not None:
-            mds.append((HG_GIT_MIRRORING_MD_KEY, str(with_mirroring)))
         mds.append((SKIP_HOOKS_MD_KEY, 'true'))
         return mds
 

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/service/tests/test_mercurial_operations.py

@@ -219,17 +219,10 @@ def test_merge_analysis_conflict(operations_fixture):
     )
 
 
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 def test_publish_changeset(operations_fixture, project_mode):
     fixture = operations_fixture
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
 
     wrapper = fixture.repo_wrapper
 
@@ -273,7 +266,7 @@ def test_publish_changeset(operations_fixture, project_mode):
 
     assert fixture.list_refs() == {default_ref: topical.hex().decode()}
 
-    if fixture.hg_native and not fixture.with_hg_git_mirroring:
+    if fixture.hg_native:
         # expect Git branches not to have moved
         assert git_repo.branches() == initial_git_branches
     else:
@@ -298,19 +291,12 @@ def test_publish_changeset(operations_fixture, project_mode):
         fixture.publish(gitlab_revision=hex0, hg_perms=WRITE_PERM)
 
 
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 def test_merge_branch(operations_fixture, project_mode):
     fixture = operations_fixture
     merge = fixture.merge_branch
 
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
     wrapper = fixture.repo_wrapper
 
     gl_branch = b'branch/default'
@@ -421,7 +407,7 @@ def test_merge_branch(operations_fixture, project_mode):
     assert wrapper.repo[ctx2.rev()].phase() == phases.public
     assert gitlab_branches(wrapper.repo)[gl_branch] == sha2.encode()
 
-    if project_mode != 'native-project-without-git':
+    if project_mode != 'native-project':
         git_repo = fixture.git_repo()
         assert git_repo.branch_titles()[gl_branch] == b'fast-forward'
 
@@ -441,7 +427,7 @@ def test_merge_branch(operations_fixture, project_mode):
     assert merge_changeset.p2().hex() == non_linear.encode()
     assert merge_changeset.description() == b"Actual merge!"
 
-    if project_mode != 'native-project-without-git':
+    if project_mode != 'native-project':
         git_repo = fixture.git_repo()
         assert git_repo.branch_titles()[gl_branch] == b'Actual merge!'
 
@@ -461,10 +447,7 @@ def test_merge_branch(operations_fixture, project_mode):
     assert conflict_error.conflicting_files == [b'foo']
 
 
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 @parametrize('semi_lin_req', ('semi_linear_req', 'classical_req'))
 def test_merge_linear_named_branch(operations_fixture,
                                    project_mode,
@@ -473,10 +456,6 @@ def test_merge_linear_named_branch(operations_fixture,
     merge = fixture.merge_branch
 
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
     wrapper = fixture.repo_wrapper
 
     gl_branch = b'branch/default'
@@ -511,19 +490,12 @@ def test_merge_linear_named_branch(operations_fixture,
     assert merge_changeset.description() == merge_msg
 
 
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 def test_merge_branch_timestamp(operations_fixture, project_mode):
     fixture = operations_fixture
     merge = fixture.merge_branch
 
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
     wrapper = fixture.repo_wrapper
 
     gl_branch = b'branch/default'
@@ -553,7 +525,7 @@ def test_merge_branch_timestamp(operations_fixture, project_mode):
     assert merge.p1().hex() == ctx1.hex()
     assert merge.p2() == merged
 
-    if project_mode != 'native-project-without-git':
+    if project_mode != 'native-project':
         git_repo = fixture.git_repo()
         git_branch = git_repo.branches()[gl_branch]
         assert git_branch['title'] == b'we have a date'
@@ -601,21 +573,13 @@ def test_merge_branch_troubled_changesets(operations_fixture):
     assert merge_error.pre_check == PreCheckUpdateError.UNSTABLE_CHANGESET
 
 
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 def test_censor(operations_fixture, project_mode):
     fixture = operations_fixture
     # The `censor` extension is part of py-heptapod's `required.hgrc`, hence
     # always there in Heptapod context
     fixture.repo_wrapper.write_hgrc(dict(extensions=dict(censor='')))
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
-
     wrapper = fixture.repo_wrapper
 
     ctx0 = wrapper.commit_file('foo', content='oops, secret')

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/service/tests/test_mercurial_repository.py

@@ -26,6 +26,7 @@ from hgitaly.stub.mercurial_repository_pb2 import (
     ConfigItemType,
     GetConfigItemRequest,
     GetManagedConfigRequest,
+    HousekeepingRequest,
     SetManagedConfigRequest,
     HeptapodConfigSection,
     MercurialPeer,
@@ -86,6 +87,10 @@ class ConfigFixture(ServiceFixture):
     def include_managed_hgrc(self):
         self.append_main_hgrc('', '%include hgrc.managed', '')
 
+    def housekeeping(self, **kw):
+        kw.setdefault('repository', self.grpc_repo)
+        return self.stub.Housekeeping(HousekeepingRequest(**kw))
+
 
 @pytest.fixture
 def config_fixture(grpc_channel, server_repos_root):
@@ -511,3 +516,18 @@ def test_push_invalid_url(push_fixture, url):
     with pytest.raises(grpc.RpcError) as exc_info:
         push(remote_url=url)
     assert exc_info.value.code() == grpc.StatusCode.INVALID_ARGUMENT
+
+
+def test_housekeeping(config_fixture):
+    fixture = config_fixture
+
+    fixture.housekeeping(fail=True)
+
+    assert fixture.housekeeping(
+        working_directories_age_threshold_seconds=1).working_directories_gc
+
+    fixture.housekeeping(working_directories_remove_unlisted=True)
+
+    resp = fixture.housekeeping(recover=True)
+    assert resp.recover_run
+    assert not resp.recovered_interrupted_transaction

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/service/tests/test_operations.py

@@ -64,10 +64,7 @@ def operations_fixture(grpc_channel, server_repos_root):
 
 
 @parametrize('timestamp', ('timestamp', 'now'))
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 def test_user_squash(operations_fixture, project_mode, timestamp):
     fixture = operations_fixture
     wrapper = fixture.repo_wrapper
@@ -87,10 +84,6 @@ def test_user_squash(operations_fixture, project_mode, timestamp):
     squash = fixture.user_squash
 
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
 
     if timestamp == 'now':
         ts = None
@@ -125,7 +118,7 @@ def test_user_squash(operations_fixture, project_mode, timestamp):
         b'refs/heads/branch/default': folded_sha.decode('ascii')
     }
 
-    if fixture.hg_native and not fixture.with_hg_git_mirroring:
+    if fixture.hg_native:
         # expect Git branches not to have moved
         assert git_repo.branches() == before_squash_git_branches
     else:
@@ -163,19 +156,12 @@ def test_user_squash(operations_fixture, project_mode, timestamp):
     assert amended_ctx.description() == amend_msg
 
 
-@parametrize('project_mode', ('hg-git-project',
-                              'native-project-without-git',
-                              'native-project-with-git',
-                              ))
+@parametrize('project_mode', ('hg-git-project', 'native-project'))
 def test_user_ff_branch(operations_fixture, project_mode):
     fixture = operations_fixture
     ff_branch = fixture.user_ff_branch
 
     fixture.hg_native = project_mode != 'hg-git-project'
-    if fixture.hg_native:
-        fixture.with_hg_git_mirroring = (
-            project_mode == 'native-project-with-git'
-        )
     wrapper = fixture.repo_wrapper
 
     gl_topic = b'topic/default/zetop'

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/service/tests/test_ref.py

@@ -325,6 +325,11 @@ def test_delete_refs(grpc_channel, server_repos_root):
                               refs=refs,
                               except_with_prefix=except_prefixes))
 
+    def assert_special_refs(expected):
+        # it is normal for the client-side repo to need invalidation
+        wrapper.reload()
+        assert special_refs(wrapper.repo) == expected
+
     with pytest.raises(grpc.RpcError) as exc_info:
         do_rpc(refs=[b'xy'], except_prefixes=[b'refs/heads'])
     assert exc_info.value.code() == grpc.StatusCode.INVALID_ARGUMENT
@@ -343,26 +348,19 @@ def test_delete_refs(grpc_channel, server_repos_root):
 
     write_gitlab_special_ref(repo, special_ref_name, ctx.hex())
     # double check
-    assert special_refs(repo) == {special_ref_name: ctx.hex()}
+    assert_special_refs({special_ref_name: ctx.hex()})
 
-    # go (it is normal for the client-side repo to need invalidation)
+    # go
     assert not do_rpc([special_ref_path]).git_error
-    # TODO use the future wrapper.reload()
-    setattr(repo, '_gitlab_refs_special-refs', None)
-    assert special_refs(repo) == {}
+    assert_special_refs({})
 
     # case where one mixes unknown and known refs
     write_gitlab_special_ref(repo, special_ref_name, ctx.hex())
-    # TODO use the future wrapper.reload()
-    setattr(repo, '_gitlab_refs_special-refs', None)
     # double check
-    assert special_refs(repo) == {special_ref_name: ctx.hex()}
+    assert_special_refs({special_ref_name: ctx.hex()})
     mixed_refs = [special_ref_path, b'refs/merge-requests/12/head']
     assert not do_rpc(mixed_refs).git_error
-
-    # TODO use the future wrapper.reload()
-    setattr(repo, '_gitlab_refs_special-refs', None)
-    assert special_refs(repo) == {}
+    assert_special_refs({})
 
     other_special_ref_name = b'environments/124'
     for prefix in (b'refs/environments',
@@ -371,21 +369,19 @@ def test_delete_refs(grpc_channel, server_repos_root):
         write_gitlab_special_ref(repo, special_ref_name, ctx.hex())
         write_gitlab_special_ref(repo, other_special_ref_name, ctx.hex())
         # double check
-        assert special_refs(repo) == {special_ref_name: ctx.hex(),
-                                      other_special_ref_name: ctx.hex()}
+        assert_special_refs({special_ref_name: ctx.hex(),
+                             other_special_ref_name: ctx.hex()})
 
         assert not do_rpc(except_prefixes=[prefix]).git_error
-        # TODO use the future wrapper.reload()
-        setattr(repo, '_gitlab_refs_special-refs', None)
-        assert special_refs(repo) == {other_special_ref_name: ctx.hex()}
+        assert_special_refs({other_special_ref_name: ctx.hex()})
 
     # exclusion matching both special refs
     write_gitlab_special_ref(repo, special_ref_name, ctx.hex())
     write_gitlab_special_ref(repo, other_special_ref_name, ctx.hex())
     assert not do_rpc(except_prefixes=[b'refs/environ',
                                        b'refs/pipel']).git_error
-    assert special_refs(repo) == {special_ref_name: ctx.hex(),
-                                  other_special_ref_name: ctx.hex()}
+    assert_special_refs({special_ref_name: ctx.hex(),
+                         other_special_ref_name: ctx.hex()})
 
 
 def test_list_branch_names_containing_commit(grpc_channel, server_repos_root):

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/ssh.py

@@ -17,6 +17,8 @@ def client_command(priv_key, known_hosts):
 
     :param str priv_key: non-encrypted private key file content.
     """
+    # delete_on_close appears with Python 3.12, and it allows *not* to
+    # remove when exiting the context.
     with (
             NamedTemporaryFile(mode='w', delete=False) as keyf,
             NamedTemporaryFile(mode='w', delete=False) as known_hostsf,

{hgitaly-2.9.0 → hgitaly-2.11.0}/hgitaly/stub/mercurial_repository_pb2.py

@@ -15,7 +15,7 @@ from . import lint_pb2 as lint__pb2
 from . import shared_pb2 as shared__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1amercurial-repository.proto\x12\x07hgitaly\x1a\nlint.proto\x1a\x0cshared.proto\"Y\n\x11InitConfigRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0enamespace_path\x18\x02 \x01(\t\"\x14\n\x12InitConfigResponse\"\x95\x02\n\x15HeptapodConfigSection\x12!\n\x14\x61llow_multiple_heads\x18\x02 \x01(\x08H\x00\x88\x01\x01\x12\x1c\n\x0f\x61llow_bookmarks\x18\x03 \x01(\x08H\x01\x88\x01\x01\x12\x45\n\x0c\x61uto_publish\x18\x04 \x01(\x0e\x32*.hgitaly.HeptapodConfigSection.AutoPublishH\x02\x88\x01\x01\"6\n\x0b\x41utoPublish\x12\x11\n\rWITHOUT_TOPIC\x10\x00\x12\x0b\n\x07NOTHING\x10\x01\x12\x07\n\x03\x41LL\x10\x02\x42\x17\n\x15_allow_multiple_headsB\x12\n\x10_allow_bookmarksB\x0f\n\r_auto_publish\"V\n\x17GetManagedConfigRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\r\n\x05local\x18\x02 \x01(\x08\"]\n\x18GetManagedConfigResponse\x12\x0f\n\x07inherit\x18\x01 \x01(\x08\x12\x30\n\x08heptapod\x18\x02 \x01(\x0b\x32\x1e.hgitaly.HeptapodConfigSection\"\xc2\x01\n\x17SetManagedConfigRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x14\n\x07inherit\x18\x02 \x01(\x08H\x00\x88\x01\x01\x12\x30\n\x08heptapod\x18\x03 \x01(\x0b\x32\x1e.hgitaly.HeptapodConfigSection\x12\x14\n\x0cremove_items\x18\x04 \x03(\t\x12\x0f\n\x07\x62y_line\x18\x05 \x01(\tB\n\n\x08_inherit\"\x1a\n\x18SetManagedConfigResponse\"\x8d\x01\n\x14GetConfigItemRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12(\n\x07\x61s_type\x18\x02 \x01(\x0e\x32\x17.hgitaly.ConfigItemType\x12\x0f\n\x07section\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\"H\n\x15GetConfigItemResponse\x12\x13\n\tas_string\x18\x01 \x01(\tH\x00\x12\x11\n\x07\x61s_bool\x18\x02 \x01(\x08H\x00\x42\x07\n\x05value\">\n\x0eRecoverRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\"%\n\x0fRecoverResponse\x12\x12\n\nnot_needed\x18\x01 \x01(\x08\"?\n\x0fOptimizeRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\"\x12\n\x10OptimizeResponse\"\x88\x01\n\x12ResetCachesRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x31\n\x06\x63\x61\x63hes\x18\x02 \x03(\x0e\x32!.hgitaly.ResetCachesRequest.Cache\"\x11\n\x05\x43\x61\x63he\x12\x08\n\x04TAGS\x10\x00\"\x15\n\x13ResetCachesResponse\"b\n\rMercurialPeer\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0f\n\x07ssh_key\x18\x05 \x01(\t\x12\x17\n\x0fssh_known_hosts\x18\x06 \x01(\t\x12\x1a\n\x12ssh_remote_command\x18\x07 \x01(\x0c\"\xa7\x01\n\x0bPushRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12+\n\x0bremote_peer\x18\x02 \x01(\x0b\x32\x16.hgitaly.MercurialPeer\x12%\n\x1donly_gitlab_branches_matching\x18\x03 \x03(\x0c\x12\x16\n\x0einclude_drafts\x18\x04 \x01(\x08\"&\n\x0cPushResponse\x12\x16\n\x0enew_changesets\x18\x01 \x01(\x08\"\xb8\x01\n\x0bPullRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12+\n\x0bremote_peer\x18\x02 \x01(\x0b\x32\x16.hgitaly.MercurialPeer\x12\x1a\n\x04user\x18\x04 \x01(\x0b\x32\x0c.gitaly.User\x12\x1b\n\x13mercurial_revisions\x18\x05 \x03(\x0cJ\x04\x08\x03\x10\x04R\x0fgitlab_branches\"&\n\x0cPullResponse\x12\x16\n\x0enew_changesets\x18\x01 \x01(\x08\"g\n\rHgCallRequest\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\x0c\n\x04\x61rgs\x18\x03 \x03(\x0c\"3\n\x0eHgCallResponse\x12\x11\n\texit_code\x18\x01 \x01(\x05\x12\x0e\n\x06stdout\x18\x02 \x03(\x0c*&\n\x0e\x43onfigItemType\x12\n\n\x06STRING\x10\x00\x12\x08\n\x04\x42OOL\x10\x01\x32\xa5\x06\n\x1aMercurialRepositoryService\x12M\n\nInitConfig\x12\x1a.hgitaly.InitConfigRequest\x1a\x1b.hgitaly.InitConfigResponse\"\x06\xfa\x97(\x02\x08\x01\x12V\n\rGetConfigItem\x12\x1d.hgitaly.GetConfigItemRequest\x1a\x1e.hgitaly.GetConfigItemResponse\"\x06\xfa\x97(\x02\x08\x02\x12\x44\n\x07Recover\x12\x17.hgitaly.RecoverRequest\x1a\x18.hgitaly.RecoverResponse\"\x06\xfa\x97(\x02\x08\x02\x12G\n\x08Optimize\x12\x18.hgitaly.OptimizeRequest\x1a\x19.hgitaly.OptimizeResponse\"\x06\xfa\x97(\x02\x08\x01\x12P\n\x0bResetCaches\x12\x1b.hgitaly.ResetCachesRequest\x1a\x1c.hgitaly.ResetCachesResponse\"\x06\xfa\x97(\x02\x08\x01\x12\x43\n\x06HgCall\x12\x16.hgitaly.HgCallRequest\x1a\x17.hgitaly.HgCallResponse\"\x06\xfa\x97(\x02\x08\x01\x30\x01\x12_\n\x10GetManagedConfig\x12 .hgitaly.GetManagedConfigRequest\x1a!.hgitaly.GetManagedConfigResponse\"\x06\xfa\x97(\x02\x08\x02\x12_\n\x10SetManagedConfig\x12 .hgitaly.SetManagedConfigRequest\x1a!.hgitaly.SetManagedConfigResponse\"\x06\xfa\x97(\x02\x08\x01\x12;\n\x04Push\x12\x14.hgitaly.PushRequest\x1a\x15.hgitaly.PushResponse\"\x06\xfa\x97(\x02\x08\x01\x12;\n\x04Pull\x12\x14.hgitaly.PullRequest\x1a\x15.hgitaly.PullResponse\"\x06\xfa\x97(\x02\x08\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1amercurial-repository.proto\x12\x07hgitaly\x1a\nlint.proto\x1a\x0cshared.proto\"Y\n\x11InitConfigRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0enamespace_path\x18\x02 \x01(\t\"\x14\n\x12InitConfigResponse\"\x95\x02\n\x15HeptapodConfigSection\x12!\n\x14\x61llow_multiple_heads\x18\x02 \x01(\x08H\x00\x88\x01\x01\x12\x1c\n\x0f\x61llow_bookmarks\x18\x03 \x01(\x08H\x01\x88\x01\x01\x12\x45\n\x0c\x61uto_publish\x18\x04 \x01(\x0e\x32*.hgitaly.HeptapodConfigSection.AutoPublishH\x02\x88\x01\x01\"6\n\x0b\x41utoPublish\x12\x11\n\rWITHOUT_TOPIC\x10\x00\x12\x0b\n\x07NOTHING\x10\x01\x12\x07\n\x03\x41LL\x10\x02\x42\x17\n\x15_allow_multiple_headsB\x12\n\x10_allow_bookmarksB\x0f\n\r_auto_publish\"V\n\x17GetManagedConfigRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\r\n\x05local\x18\x02 \x01(\x08\"]\n\x18GetManagedConfigResponse\x12\x0f\n\x07inherit\x18\x01 \x01(\x08\x12\x30\n\x08heptapod\x18\x02 \x01(\x0b\x32\x1e.hgitaly.HeptapodConfigSection\"\xc2\x01\n\x17SetManagedConfigRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x14\n\x07inherit\x18\x02 \x01(\x08H\x00\x88\x01\x01\x12\x30\n\x08heptapod\x18\x03 \x01(\x0b\x32\x1e.hgitaly.HeptapodConfigSection\x12\x14\n\x0cremove_items\x18\x04 \x03(\t\x12\x0f\n\x07\x62y_line\x18\x05 \x01(\tB\n\n\x08_inherit\"\x1a\n\x18SetManagedConfigResponse\"\x8d\x01\n\x14GetConfigItemRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12(\n\x07\x61s_type\x18\x02 \x01(\x0e\x32\x17.hgitaly.ConfigItemType\x12\x0f\n\x07section\x18\x03 \x01(\t\x12\x0c\n\x04name\x18\x04 \x01(\t\"H\n\x15GetConfigItemResponse\x12\x13\n\tas_string\x18\x01 \x01(\tH\x00\x12\x11\n\x07\x61s_bool\x18\x02 \x01(\x08H\x00\x42\x07\n\x05value\">\n\x0eRecoverRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\"%\n\x0fRecoverResponse\x12\x12\n\nnot_needed\x18\x01 \x01(\x08\"?\n\x0fOptimizeRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\"\x12\n\x10OptimizeResponse\"\x88\x01\n\x12ResetCachesRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x31\n\x06\x63\x61\x63hes\x18\x02 \x03(\x0e\x32!.hgitaly.ResetCachesRequest.Cache\"\x11\n\x05\x43\x61\x63he\x12\x08\n\x04TAGS\x10\x00\"\x15\n\x13ResetCachesResponse\"b\n\rMercurialPeer\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x0f\n\x07ssh_key\x18\x05 \x01(\t\x12\x17\n\x0fssh_known_hosts\x18\x06 \x01(\t\x12\x1a\n\x12ssh_remote_command\x18\x07 \x01(\x0c\"\xa7\x01\n\x0bPushRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12+\n\x0bremote_peer\x18\x02 \x01(\x0b\x32\x16.hgitaly.MercurialPeer\x12%\n\x1donly_gitlab_branches_matching\x18\x03 \x03(\x0c\x12\x16\n\x0einclude_drafts\x18\x04 \x01(\x08\"&\n\x0cPushResponse\x12\x16\n\x0enew_changesets\x18\x01 \x01(\x08\"\xb8\x01\n\x0bPullRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12+\n\x0bremote_peer\x18\x02 \x01(\x0b\x32\x16.hgitaly.MercurialPeer\x12\x1a\n\x04user\x18\x04 \x01(\x0b\x32\x0c.gitaly.User\x12\x1b\n\x13mercurial_revisions\x18\x05 \x03(\x0cJ\x04\x08\x03\x10\x04R\x0fgitlab_branches\"&\n\x0cPullResponse\x12\x16\n\x0enew_changesets\x18\x01 \x01(\x08\"g\n\rHgCallRequest\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\x0c\n\x04\x61rgs\x18\x03 \x03(\x0c\"3\n\x0eHgCallResponse\x12\x11\n\texit_code\x18\x01 \x01(\x05\x12\x0e\n\x06stdout\x18\x02 \x03(\x0c\"\xc2\x01\n\x13HousekeepingRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x0c\n\x04\x66\x61il\x18\x02 \x01(\x08\x12\x0f\n\x07recover\x18\x03 \x01(\x08\x12\x31\n)working_directories_age_threshold_seconds\x18\x04 \x01(\r\x12+\n#working_directories_remove_unlisted\x18\x05 \x01(\x08\"\xa3\x01\n\x14HousekeepingResponse\x12\x13\n\x0brecover_run\x18\x01 \x01(\x08\x12)\n!recovered_interrupted_transaction\x18\x02 \x01(\x08\x12\x1e\n\x16working_directories_gc\x18\x03 \x01(\x08\x12+\n#working_directories_remove_unlisted\x18\x04 \x01(\x08*&\n\x0e\x43onfigItemType\x12\n\n\x06STRING\x10\x00\x12\x08\n\x04\x42OOL\x10\x01\x32\xfa\x06\n\x1aMercurialRepositoryService\x12M\n\nInitConfig\x12\x1a.hgitaly.InitConfigRequest\x1a\x1b.hgitaly.InitConfigResponse\"\x06\xfa\x97(\x02\x08\x01\x12V\n\rGetConfigItem\x12\x1d.hgitaly.GetConfigItemRequest\x1a\x1e.hgitaly.GetConfigItemResponse\"\x06\xfa\x97(\x02\x08\x02\x12\x44\n\x07Recover\x12\x17.hgitaly.RecoverRequest\x1a\x18.hgitaly.RecoverResponse\"\x06\xfa\x97(\x02\x08\x02\x12G\n\x08Optimize\x12\x18.hgitaly.OptimizeRequest\x1a\x19.hgitaly.OptimizeResponse\"\x06\xfa\x97(\x02\x08\x01\x12P\n\x0bResetCaches\x12\x1b.hgitaly.ResetCachesRequest\x1a\x1c.hgitaly.ResetCachesResponse\"\x06\xfa\x97(\x02\x08\x01\x12\x43\n\x06HgCall\x12\x16.hgitaly.HgCallRequest\x1a\x17.hgitaly.HgCallResponse\"\x06\xfa\x97(\x02\x08\x01\x30\x01\x12_\n\x10GetManagedConfig\x12 .hgitaly.GetManagedConfigRequest\x1a!.hgitaly.GetManagedConfigResponse\"\x06\xfa\x97(\x02\x08\x02\x12_\n\x10SetManagedConfig\x12 .hgitaly.SetManagedConfigRequest\x1a!.hgitaly.SetManagedConfigResponse\"\x06\xfa\x97(\x02\x08\x01\x12;\n\x04Push\x12\x14.hgitaly.PushRequest\x1a\x15.hgitaly.PushResponse\"\x06\xfa\x97(\x02\x08\x01\x12;\n\x04Pull\x12\x14.hgitaly.PullRequest\x1a\x15.hgitaly.PullResponse\"\x06\xfa\x97(\x02\x08\x01\x12S\n\x0cHousekeeping\x12\x1c.hgitaly.HousekeepingRequest\x1a\x1d.hgitaly.HousekeepingResponse\"\x06\xfa\x97(\x02\x08\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -43,6 +43,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _PULLREQUEST.fields_by_name['repository']._serialized_options = b'\230\306,\001'
   _HGCALLREQUEST.fields_by_name['repository']._options = None
   _HGCALLREQUEST.fields_by_name['repository']._serialized_options = b'\230\306,\001'
+  _HOUSEKEEPINGREQUEST.fields_by_name['repository']._options = None
+  _HOUSEKEEPINGREQUEST.fields_by_name['repository']._serialized_options = b'\230\306,\001'
   _MERCURIALREPOSITORYSERVICE.methods_by_name['InitConfig']._options = None
   _MERCURIALREPOSITORYSERVICE.methods_by_name['InitConfig']._serialized_options = b'\372\227(\002\010\001'
   _MERCURIALREPOSITORYSERVICE.methods_by_name['GetConfigItem']._options = None
@@ -63,8 +65,10 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _MERCURIALREPOSITORYSERVICE.methods_by_name['Push']._serialized_options = b'\372\227(\002\010\001'
   _MERCURIALREPOSITORYSERVICE.methods_by_name['Pull']._options = None
   _MERCURIALREPOSITORYSERVICE.methods_by_name['Pull']._serialized_options = b'\372\227(\002\010\001'
-  _globals['_CONFIGITEMTYPE']._serialized_start=2129
-  _globals['_CONFIGITEMTYPE']._serialized_end=2167
+  _MERCURIALREPOSITORYSERVICE.methods_by_name['Housekeeping']._options = None
+  _MERCURIALREPOSITORYSERVICE.methods_by_name['Housekeeping']._serialized_options = b'\372\227(\002\010\001'
+  _globals['_CONFIGITEMTYPE']._serialized_start=2492
+  _globals['_CONFIGITEMTYPE']._serialized_end=2530
   _globals['_INITCONFIGREQUEST']._serialized_start=65
   _globals['_INITCONFIGREQUEST']._serialized_end=154
   _globals['_INITCONFIGRESPONSE']._serialized_start=156
@@ -113,6 +117,10 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_HGCALLREQUEST']._serialized_end=2074
   _globals['_HGCALLRESPONSE']._serialized_start=2076
   _globals['_HGCALLRESPONSE']._serialized_end=2127
-  _globals['_MERCURIALREPOSITORYSERVICE']._serialized_start=2170
-  _globals['_MERCURIALREPOSITORYSERVICE']._serialized_end=2975
+  _globals['_HOUSEKEEPINGREQUEST']._serialized_start=2130
+  _globals['_HOUSEKEEPINGREQUEST']._serialized_end=2324
+  _globals['_HOUSEKEEPINGRESPONSE']._serialized_start=2327
+  _globals['_HOUSEKEEPINGRESPONSE']._serialized_end=2490
+  _globals['_MERCURIALREPOSITORYSERVICE']._serialized_start=2533
+  _globals['_MERCURIALREPOSITORYSERVICE']._serialized_end=3423
 # @@protoc_insertion_point(module_scope)