hgitaly 17.10.0a0__tar.gz → 17.11.0__tar.gz

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/.hgtags

@@ -138,3 +138,5 @@ e9f5b758dbc13eb7dc1f44b8246bbef0dcc74f1a 17.8.3
 c2dc21a71ccd0cbe8c33ae9b8ff28128e0d977bd 17.8.4
 ac2aa9b92e0d157d1d51cc7864ed4658a2ecdb32 17.9.0
 1febbc24f370e41ac50979a84fdc36a8eef85a41 17.9.1
+138820967edc1ffa23f49bf4101fb7a703baccb3 17.10.0a0
+fdf0201ab1df3afbb372f4dd1005009ca37be713 17.11.0a0

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/PKG-INFO

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

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgext3rd/hgitaly/__init__.py

@@ -19,6 +19,7 @@ from mercurial import (
 
 demandimport.disable()
 
+from hgitaly.identification import ensure_client_id
 from hgitaly.server import (
     run_forever,
     UnsupportedUrlScheme,
@@ -108,6 +109,9 @@ def serve(ui, **opts):
                 b"'heptapod.repositories-root'. Please define it or run "
                 b"the command with the --repositories-root option."
                 ))
+    config_root = os.fsdecode(ui.config(b'hgitaly', b'configuration-root',
+                                        default=repos_root))
+    ensure_client_id(config_root)
     nb_workers = ui.configint(b'hgitaly', b'workers')
     run_opts = dict(nb_workers=nb_workers,
                     restart_done_workers=True,

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgext3rd/hgitaly/tests/test_serve.py

@@ -50,14 +50,19 @@ def mock_run_forever(tmpdir, monkeypatch, config=None):
     return ui, records
 
 
+def repos_root(tmpdir):
+    return os.fsencode(tmpdir / 'repos')
+
+
 def test_serve_default_url(tmpdir, monkeypatch):
     ui, records = mock_run_forever(tmpdir, monkeypatch)
-    hgitaly_ext.serve(ui, listen=[], repositories_root=b'/some/path')
+    repositories_root = repos_root(tmpdir)
+    hgitaly_ext.serve(ui, listen=[], repositories_root=repositories_root)
     (listen_urls, storages), kwargs = records[0]
 
     # we have no bytes in the inner call
     assert listen_urls == [DEFAULT_LISTEN_URL_STR]
-    assert storages == dict(default=b'/some/path')
+    assert storages == dict(default=repositories_root)
 
     # default for workers is also expected to be ``None``
     # (be it explicitely passed or not)
@@ -65,8 +70,11 @@ def test_serve_default_url(tmpdir, monkeypatch):
 
 
 def test_serve_workers_config(tmpdir, monkeypatch):
-    ui, records = mock_run_forever(tmpdir, monkeypatch,
-                                   config=dict(hgitaly=dict(workers='47')))
+    ui, records = mock_run_forever(
+        tmpdir, monkeypatch,
+        config=dict(hgitaly={'workers': '47',
+                             'configuration-root': str(tmpdir / 'config')}),
+    )
     hgitaly_ext.serve(ui, listen=[], repositories_root=b'/some/path')
     kwargs = records[0][1]
     assert kwargs.get('nb_workers') == 47
@@ -76,7 +84,8 @@ def test_serve_max_rss_mb(tmpdir, monkeypatch):
     ui, records = mock_run_forever(
         tmpdir, monkeypatch,
         config=dict(hgitaly={'worker.max-rss-mib': '128'}))
-    hgitaly_ext.serve(ui, listen=[], repositories_root=b'/some/path')
+    repositories_root = repos_root(tmpdir)
+    hgitaly_ext.serve(ui, listen=[], repositories_root=repositories_root)
     kwargs = records[0][1]
     assert kwargs.get('max_rss_mib') == 128
 
@@ -85,7 +94,8 @@ def test_serve_monitoring_interval(tmpdir, monkeypatch):
     ui, records = mock_run_forever(
         tmpdir, monkeypatch,
         config=dict(hgitaly={'worker.monitoring-interval-seconds': '13'}))
-    hgitaly_ext.serve(ui, listen=[], repositories_root=b'/some/path')
+    repositories_root = repos_root(tmpdir)
+    hgitaly_ext.serve(ui, listen=[], repositories_root=repositories_root)
     kwargs = records[0][1]
     assert kwargs.get('monitoring_interval') == 13
 
@@ -95,20 +105,22 @@ def test_serve_graceful_shutdown(tmpdir, monkeypatch):
         tmpdir, monkeypatch,
         config=dict(hgitaly={'worker.graceful-shutdown-timeout-seconds': '18'
                              }))
-    hgitaly_ext.serve(ui, listen=[], repositories_root=b'/some/path')
+    repositories_root = repos_root(tmpdir)
+    hgitaly_ext.serve(ui, listen=[], repositories_root=repositories_root)
     kwargs = records[0][1]
     assert kwargs.get('graceful_shutdown_timeout_seconds') == 18
 
 
 def test_serve_config_repositories_root(tmpdir, monkeypatch):
     ui, records = mock_run_forever(tmpdir, monkeypatch)
-    ui.setconfig(b'heptapod', b'repositories-root', b'/explicit/path')
+    repositories_root = repos_root(tmpdir)
+    ui.setconfig(b'heptapod', b'repositories-root', repositories_root)
     hgitaly_ext.serve(ui, listen=[])
     listen_urls, storages = records[0][0]
 
     # we have no bytes in the inner call
     assert listen_urls == [DEFAULT_LISTEN_URL_STR]
-    assert storages == dict(default=b'/explicit/path')
+    assert storages == dict(default=repositories_root)
 
 
 def test_missing_repos_root():
@@ -118,17 +130,17 @@ def test_missing_repos_root():
     assert b'repositories-root' in exc_info.value.args[0]
 
 
-def test_reraising():
+def test_reraising(tmpdir):
     # the point here is that we don't mock run_forever() , instead
     # we test the whole loop from bad arguments, leading hgitaly.server.init()
     # to raise exceptions and we test the final conversions of the latter.
     ui = make_ui(None, config=activating_config())
-    repos_root = b'/some/path'
+    repositories_root = repos_root(tmpdir)
 
     invalid_ipv6_url = b'tcp://[::'
     with pytest.raises(error.Abort) as exc_info:
         hgitaly_ext.serve(ui, listen=[invalid_ipv6_url],
-                          repositories_root=repos_root)
+                          repositories_root=repositories_root)
     message = exc_info.value.args[0]
     assert invalid_ipv6_url in message
     assert b'Invalid IPv6 URL' in message  # explanation from urlparse()
@@ -136,14 +148,14 @@ def test_reraising():
     unsupported_scheme_url = b'exotic://localhost:1234'
     with pytest.raises(error.Abort) as exc_info:
         hgitaly_ext.serve(ui, listen=[unsupported_scheme_url],
-                          repositories_root=repos_root)
+                          repositories_root=repositories_root)
     message = exc_info.value.args[0]
     assert b"scheme: 'exotic'" in message
 
     cant_bind_url = b'tcp://unresolvable-or-youre-kidding-me:1234'
     with pytest.raises(error.Abort) as exc_info:
         hgitaly_ext.serve(ui, listen=[cant_bind_url],
-                          repositories_root=repos_root)
+                          repositories_root=repositories_root)
     message = exc_info.value.args[0]
     assert cant_bind_url in message
     assert b'could not listen' in message

hgitaly-17.11.0/hgitaly/VERSION

@@ -0,0 +1 @@
+17.11.0

hgitaly-17.11.0/hgitaly/identification.py

@@ -0,0 +1,46 @@
+# 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
+"""Utilities for identificaton of servers and client.
+
+An HGitaly client always have a pair of identifiers:
+
+- the Client ID is a globally unique and persistent identifier
+- the Incarnation ID is volatile. It is convenient for it to be the UNIX
+  timestamp in seconds, serialized as a decimal string, but that is not
+  mandatory.
+
+If an operation records some Client / Incarnation ID pair, a subsequent
+change of the Incarnation ID for the same client means that the client has
+restarted since the recording, and thus that the operation is obsolete
+(whether it finished normally or not, the latter including having been harshly
+killed).
+
+An HGitaly server is always consider to be its own client, even if it accesses
+the resources flagged with these IDs in-process rathere than through gRPC.
+"""
+from pathlib import Path
+import time
+import uuid
+
+INCARNATION_ID = str(int(time.time()))
+CLIENT_ID_SLUG = '+hgitaly/self-client.uuid'
+CLIENT_ID = None  # initialized at startup
+
+
+def ensure_client_id(config_root):
+    """To be used in startup sequence, before any concurrency is possible."""
+    global CLIENT_ID
+
+    path = Path(config_root) / CLIENT_ID_SLUG
+    if path.exists():
+        CLIENT_ID = path.read_text().strip()
+        return
+
+    client_id = str(uuid.uuid4())
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(client_id)
+    CLIENT_ID = client_id

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/server/tests/test_prefork.py

@@ -5,7 +5,10 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 import multiprocessing
+import os
+import psutil
 import pytest
+import random
 import signal
 import socket
 import sys
@@ -14,6 +17,9 @@ from socket import (
 )
 import time
 
+from hgitaly.procutil import is_current_service_process
+from hgitaly.testing.multiprocessing import assert_recv
+
 from .. import prefork as server
 from ..worker import WorkerProcess
 
@@ -142,6 +148,81 @@ def test_run_forever(monkeypatch, tmpdir):
     assert len(workers[tcp_url]) >= 2
 
 
+def test_siblings_recognition():
+
+    def worker_callable(wid, pipe, **kw):  # pragma no cover
+        from hgitaly import procutil
+        procutil.IS_CHILD_PROCESS = wid != 2
+        pipe.send("started")
+
+        while True:
+            pipe.poll(timeout=1)
+            requested_pid = pipe.recv()
+            print(f"Worker {wid} got {requested_pid}")
+            res = is_current_service_process(requested_pid)
+            print(f"Worker {wid} says {res}")
+            pipe.send(is_current_service_process(requested_pid))
+
+    pipes = [multiprocessing.Pipe() for _ in range(3)]
+    parent_pipes = [p[0] for p in pipes]
+    child_pipes = [p[1] for p in pipes]
+
+    workers = [WorkerProcess(process_args=(wid, child_pipes[wid]),
+                             process_callable=worker_callable)
+               for wid in range(3)]
+
+    try:
+        for wp in workers:
+            wp.init_process()
+
+        for wid, worker in enumerate(workers):
+            worker.start()
+            assert_recv(parent_pipes[wid], "started")
+
+        # sanity check: boolean change in child does not leak to parent
+        from hgitaly import procutil
+        assert not procutil.IS_CHILD_PROCESS
+
+        # workers are siblings of themselves
+        parent_pipes[0].send(workers[0].pid)
+        assert_recv(parent_pipes[0], True)
+
+        # other sibling is recognized
+        parent_pipes[0].send(workers[1].pid)
+        assert_recv(parent_pipes[0], True)
+
+        parent_pipes[1].send(workers[0].pid)
+        assert_recv(parent_pipes[1], True)
+
+        # the manager is not a sibling
+        parent_pipes[0].send(os.getpid())
+        assert_recv(parent_pipes[0], False)
+
+        # PID 1 is never a sibling
+        parent_pipes[0].send(1)
+        assert_recv(parent_pipes[0], False)
+
+        # non-existing process cannot be a sibling
+        while True:
+            unknown_pid = random.randint(10000, 1 << 31)
+            if not psutil.pid_exists(unknown_pid):
+                parent_pipes[1].send(unknown_pid)
+                assert_recv(parent_pipes[1], False)
+                break
+
+        # worker 3 considers itself to be standalone
+        parent_pipes[2].send(workers[0].pid)
+        assert_recv(parent_pipes[2], False)
+        parent_pipes[2].send(workers[2].pid)
+        assert_recv(parent_pipes[2], True)
+    finally:
+        for worker in workers:
+            if worker.process.is_alive():
+                # kill() would prevent coverage collection
+                worker.process.terminate()
+            worker.join()
+
+
 def test_terminate_workers(monkeypatch, tmpdir):
 
     def worker_callable(wid, queue, **kw):  # pragma no cover

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/server/worker.py

@@ -56,6 +56,10 @@ class WorkerProcess:
         wp.start()
         return wp
 
+    @property
+    def pid(self):
+        return self.process.pid
+
     def __str__(self):
         pid = 'no process' if self.process is None else self.process.pid
         return f"Worker {self.process_args[0]} (pid: {pid})"

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/service/mercurial_operations.py

@@ -6,6 +6,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 from grpc import StatusCode
 import logging
+import os
 import time
 
 from mercurial.merge import merge
@@ -39,6 +40,11 @@ from ..revision import (
     gitlab_revision_changeset,
     validate_oid,
 )
+from ..workdir import (
+    ClientMismatch,
+    reserve_prepare_workdir,
+    release_workdir_by_id,
+)
 from ..stub.errors_pb2 import (
     MergeConflictError,
     ReferenceUpdateError,
@@ -56,6 +62,10 @@ from ..stub.mercurial_operations_pb2 import (
     PublishChangesetError,
     PublishChangesetRequest,
     PublishChangesetResponse,
+    ReleaseWorkingDirectoryRequest,
+    ReleaseWorkingDirectoryResponse,
+    GetWorkingDirectoryRequest,
+    GetWorkingDirectoryResponse,
 )
 from ..stub.mercurial_operations_pb2_grpc import (
     MercurialOperationsServiceServicer,
@@ -85,6 +95,42 @@ class MercurialOperationsServicer(MercurialOperationsServiceServicer,
     The ordering of methods in this source file is the same as in the proto
     file.
     """
+    def GetWorkingDirectory(self,
+                            request: GetWorkingDirectoryRequest,
+                            context) -> GetWorkingDirectoryResponse:
+        gl_repo = request.repository
+        rev = request.revision
+        repo = self.load_repo(gl_repo, context)
+        workdirs_root = self.repo_workdirs_root(gl_repo, context)
+        changeset = gitlab_revision_changeset(repo, rev)
+        if changeset is None:
+            context.abort(StatusCode.NOT_FOUND, "Revision not found")
+
+        wd = reserve_prepare_workdir(workdirs_root, repo,
+                                     client_id=request.client_id,
+                                     incarnation_id=request.incarnation_id,
+                                     changeset=changeset)
+        repos_root = os.fsdecode(self.storages[gl_repo.storage_name])
+        wd_rpath = str(wd.path.relative_to(repos_root))
+
+        return GetWorkingDirectoryResponse(working_directory_id=wd.id,
+                                           relative_path=wd_rpath)
+
+    def ReleaseWorkingDirectory(self,
+                                request: ReleaseWorkingDirectoryRequest,
+                                context) -> ReleaseWorkingDirectoryResponse:
+        gl_repo = request.repository
+        repo = self.load_repo(gl_repo, context)
+        wd_id = request.working_directory_id
+        try:
+            release_workdir_by_id(repo, wd_id, request.client_id)
+        except ClientMismatch:
+            context.abort(
+                StatusCode.PERMISSION_DENIED,
+                f"Not the owner of the lease on working directory {wd_id}"
+            )
+        return ReleaseWorkingDirectoryResponse()
+
     def MergeAnalysis(self,
                       request: MergeAnalysisRequest,
                       context) -> MergeAnalysisResponse:

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/service/tests/test_mercurial_operations.py

@@ -9,11 +9,13 @@ from grpc import (
     StatusCode,
 )
 import pytest
+import uuid
 
 from mercurial import (
     error as hg_error,
     phases,
 )
+from mercurial_testhelpers import RepoWrapper
 
 from google.protobuf.timestamp_pb2 import Timestamp
 
@@ -25,6 +27,10 @@ from hgitaly.changelog import ancestor
 from hgitaly.errors import (
     parse_assert_structured_error,
 )
+from hgitaly.identification import INCARNATION_ID
+from hgitaly.servicer import (
+    PY_HEPTAPOD_SKIP_HOOKS,
+)
 from hgitaly.stub.errors_pb2 import (
     ReferenceUpdateError,
 )
@@ -37,6 +43,8 @@ from hgitaly.stub.mercurial_operations_pb2 import (
     PublishChangesetRequest,
     MergeAnalysisRequest,
     MergeAnalysisResponse,
+    GetWorkingDirectoryRequest,
+    ReleaseWorkingDirectoryRequest,
 )
 from hgitaly.stub.mercurial_operations_pb2_grpc import (
     MercurialOperationsServiceStub,
@@ -54,6 +62,8 @@ class OperationsFixture(MutationServiceFixture):
 
     stub_cls = MercurialOperationsServiceStub
 
+    client_id = str(uuid.uuid4())
+
     def merge_analysis(self, **kw):
         return self.stub.MergeAnalysis(MergeAnalysisRequest(
             repository=self.grpc_repo, **kw))
@@ -76,6 +86,19 @@ class OperationsFixture(MutationServiceFixture):
         return self.stub.MergeBranch(MergeBranchRequest(**kw),
                                      metadata=self.grpc_metadata())
 
+    def get_workdir(self, **kw):
+        kw.setdefault('client_id', self.client_id)
+        kw.setdefault('incarnation_id', INCARNATION_ID)
+        kw.setdefault('repository', self.grpc_repo)
+        return self.stub.GetWorkingDirectory(
+            GetWorkingDirectoryRequest(**kw))
+
+    def release_workdir(self, **kw):
+        kw.setdefault('client_id', self.client_id)
+        kw.setdefault('repository', self.grpc_repo)
+        return self.stub.ReleaseWorkingDirectory(
+            ReleaseWorkingDirectoryRequest(**kw))
+
 
 @pytest.fixture
 def operations_fixture(grpc_channel, server_repos_root):
@@ -603,3 +626,47 @@ def test_censor(operations_fixture, project_mode):
     assert exc.code() == StatusCode.INVALID_ARGUMENT
     assert 'changeset' in exc.details().lower()
     assert 'not found' in exc.details().lower()
+
+
+def test_working_directories(operations_fixture, server_repos_root):
+    fixture = operations_fixture
+    gl_rev = b'branch/default'
+    wrapper = fixture.repo_wrapper
+    cs0 = wrapper.commit_file('foo')
+
+    resp = fixture.get_workdir(revision=gl_rev)
+    wd_id = resp.working_directory_id
+    wd_path = server_repos_root / 'default' / resp.relative_path
+
+    # let us check that the working directory works by committing a file
+    # in there and retrieve it from the main repo
+    wd_wrapper = RepoWrapper.load(wd_path)
+    wd_wrapper.repo.ui.environ[PY_HEPTAPOD_SKIP_HOOKS] = b'yes'
+    cs_done_in_wd = wd_wrapper.commit_file('bar', "done in wd")
+    wrapper.reload()
+    cs_in_main = wrapper.repo[cs_done_in_wd.hex()]
+    assert cs_in_main.description() == b'done in wd'
+    assert cs_in_main.p1() == cs0
+
+    # releasing without being the correct client
+    with pytest.raises(RpcError) as exc_info:
+        fixture.release_workdir(working_directory_id=wd_id,
+                                client_id='some other client')
+    exc = exc_info.value
+    assert exc.code() == StatusCode.PERMISSION_DENIED
+
+    wd_id2 = fixture.get_workdir(revision=gl_rev).working_directory_id
+    assert wd_id2 != wd_id
+
+    # releasing for good
+    fixture.release_workdir(working_directory_id=wd_id)
+
+    # reuse of first workdir (also tests that no revison ends up selecting
+    # the same Mercurial branch as `branch/default`, hence `default`
+    assert fixture.get_workdir().working_directory_id == wd_id
+
+    # unknown revision
+    with pytest.raises(RpcError) as exc_info:
+        fixture.get_workdir(revision=b'ca34fe12')
+    exc = exc_info.value
+    assert exc.code() == StatusCode.NOT_FOUND

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/service/tests/test_repository_service.py

@@ -32,6 +32,7 @@ from hgext3rd.heptapod.keep_around import (
 
 from mercurial_testhelpers import RepoWrapper
 
+from hgitaly.identification import CLIENT_ID, INCARNATION_ID
 from hgitaly.license_detector import license_content
 from hgitaly.revision import ZERO_SHA
 from hgitaly.stream import WRITE_BUFFER_SIZE
@@ -880,7 +881,10 @@ def test_remove_repository(fixture_with_repo, wds_success):
         working_dirs_roster_path = repo.vfs.join(WDS_ROSTER_FILE_NAME)
         os.symlink(working_dirs_roster_path, working_dirs_roster_path)
     else:
-        with working_directory(wds_root, repo):
+        with working_directory(wds_root, repo,
+                               client_id=CLIENT_ID,
+                               incarnation_id=INCARNATION_ID,
+                               ):
             pass
 
     fixture.remove_repository()

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/servicer.py

@@ -23,6 +23,7 @@ from mercurial import (
 from mercurial.repoview import _filteredrepotypes
 
 from .errors import ServiceError
+from .identification import CLIENT_ID, INCARNATION_ID
 from .logging import LoggerAdapter
 from .workdir import working_directory
 from .stub.shared_pb2 import (
@@ -375,6 +376,8 @@ class HGitalyServicer:
 
         with working_directory(self.repo_workdirs_root(gl_repo, context),
                                repo,
+                               client_id=CLIENT_ID,
+                               incarnation_id=INCARNATION_ID,
                                changeset=changeset) as wd:
             # sadly, even passing repo.ui in share creation is not enough
             # for transient config items to be forwarded. Seems to be

{hgitaly-17.10.0a0 → hgitaly-17.11.0}/hgitaly/stub/mercurial_operations_pb2.py

@@ -19,7 +19,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__
 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\"\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*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\xea\x02\n\x1aMercurialOperationsService\x12V\n\rMergeAnalysis\x12\x1d.hgitaly.MergeAnalysisRequest\x1a\x1e.hgitaly.MergeAnalysisResponse\"\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\x62\x06proto3')
+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\"\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\xca\x04\n\x1aMercurialOperationsService\x12V\n\rMergeAnalysis\x12\x1d.hgitaly.MergeAnalysisRequest\x1a\x1e.hgitaly.MergeAnalysisResponse\"\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)
@@ -34,6 +34,10 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _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['PublishChangeset']._loaded_options = None
@@ -42,10 +46,14 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _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['_MERCURIALPERMISSIONS']._serialized_start=1649
-  _globals['_MERCURIALPERMISSIONS']._serialized_end=1705
-  _globals['_PRECHECKUPDATEERROR']._serialized_start=1707
-  _globals['_PRECHECKUPDATEERROR']._serialized_end=1814
+  _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=2060
+  _globals['_MERCURIALPERMISSIONS']._serialized_end=2116
+  _globals['_PRECHECKUPDATEERROR']._serialized_start=2118
+  _globals['_PRECHECKUPDATEERROR']._serialized_end=2225
   _globals['_MERGEANALYSISREQUEST']._serialized_start=131
   _globals['_MERGEANALYSISREQUEST']._serialized_end=279
   _globals['_MERGEANALYSISRESPONSE']._serialized_start=282
@@ -66,6 +74,14 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_CENSORREQUEST']._serialized_end=1629
   _globals['_CENSORRESPONSE']._serialized_start=1631
   _globals['_CENSORRESPONSE']._serialized_end=1647
-  _globals['_MERCURIALOPERATIONSSERVICE']._serialized_start=1817
-  _globals['_MERCURIALOPERATIONSSERVICE']._serialized_end=2179
+  _globals['_GETWORKINGDIRECTORYREQUEST']._serialized_start=1650
+  _globals['_GETWORKINGDIRECTORYREQUEST']._serialized_end=1785
+  _globals['_GETWORKINGDIRECTORYRESPONSE']._serialized_start=1787
+  _globals['_GETWORKINGDIRECTORYRESPONSE']._serialized_end=1869
+  _globals['_RELEASEWORKINGDIRECTORYREQUEST']._serialized_start=1872
+  _globals['_RELEASEWORKINGDIRECTORYREQUEST']._serialized_end=2023
+  _globals['_RELEASEWORKINGDIRECTORYRESPONSE']._serialized_start=2025
+  _globals['_RELEASEWORKINGDIRECTORYRESPONSE']._serialized_end=2058
+  _globals['_MERCURIALOPERATIONSSERVICE']._serialized_start=2228
+  _globals['_MERCURIALOPERATIONSSERVICE']._serialized_end=2814
 # @@protoc_insertion_point(module_scope)