hgitaly 18.6.1__tar.gz → 18.7.0a0__tar.gz

{hgitaly-18.6.1/hgitaly.egg-info → hgitaly-18.7.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.6.1
+Version: 18.7.0a0
 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.4.0
+Requires-Dist: heptapod>=5.4.0
 Requires-Dist: protobuf~=6.31.1
 Requires-Dist: grpcio~=1.76.0
 Requires-Dist: grpcio-status~=1.76.0
@@ -278,16 +278,21 @@ actually a mix of:
 - Gitaly documentation and source code.
 - sampling of Gitaly responses.
 
-#### Gitaly comparison tests
+#### Gitaly comparison and other functional tests
 
 If an appropriate Gitaly installation is found, `run-all-tests` will also
-run the tests from the `tests_with_gitaly` package. This happens automatically
+run the tests from the `functional_tests` package. This happens automatically
 from within a [HDK] workspace.
 
 These are precisely meant for what the Mercurial integration tests can't do:
 check that HGitaly responses take the form expected by the various Gitaly
 clients, by comparing directly with the reference Gitaly implementation.
 
+Some of the included tests also compare the output of RHGitaly and HGitaly,
+when both implementations exist or just test RHGitaly standalone (when
+comparison with Gitaly makes no sense, e.g. because the method is defined
+in the HGitaly protocol, and there is no Python implementation).
+
 The comparisons work by using the conversions to Git provided by
 `py-heptapod`, which are precisely what HGitaly aims to replace as a mean
 to expose Mercurial content to GitLab.
@@ -368,10 +373,10 @@ In some rare cases, the drop in coverage could be due to an actual change
 between Mercurial versions. If that happens, there are good chances that an
 actual bug is lurking around.
 
-#### How to run the tests with coverage of the Gitaly comparison tests
+#### How to run the tests with coverage of the functional tests
 
 ```
-./run-all-tests --cov tests_with_gitaly --cov-report html
+./run-all-tests --cov functional_tests --cov-report html
 ```
 
 The HTML report will be nice if you don't have 100% coverage. To display it,

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/README.md

@@ -255,16 +255,21 @@ actually a mix of:
 - Gitaly documentation and source code.
 - sampling of Gitaly responses.
 
-#### Gitaly comparison tests
+#### Gitaly comparison and other functional tests
 
 If an appropriate Gitaly installation is found, `run-all-tests` will also
-run the tests from the `tests_with_gitaly` package. This happens automatically
+run the tests from the `functional_tests` package. This happens automatically
 from within a [HDK] workspace.
 
 These are precisely meant for what the Mercurial integration tests can't do:
 check that HGitaly responses take the form expected by the various Gitaly
 clients, by comparing directly with the reference Gitaly implementation.
 
+Some of the included tests also compare the output of RHGitaly and HGitaly,
+when both implementations exist or just test RHGitaly standalone (when
+comparison with Gitaly makes no sense, e.g. because the method is defined
+in the HGitaly protocol, and there is no Python implementation).
+
 The comparisons work by using the conversions to Git provided by
 `py-heptapod`, which are precisely what HGitaly aims to replace as a mean
 to expose Mercurial content to GitLab.
@@ -345,10 +350,10 @@ In some rare cases, the drop in coverage could be due to an actual change
 between Mercurial versions. If that happens, there are good chances that an
 actual bug is lurking around.
 
-#### How to run the tests with coverage of the Gitaly comparison tests
+#### How to run the tests with coverage of the functional tests
 
 ```
-./run-all-tests --cov tests_with_gitaly --cov-report html
+./run-all-tests --cov functional_tests --cov-report html
 ```
 
 The HTML report will be nice if you don't have 100% coverage. To display it,

{hgitaly-18.6.1/tests_with_gitaly → hgitaly-18.7.0a0/functional_tests}/rhgitaly.py

@@ -69,11 +69,18 @@ class RHGitalyServer:
         if rhgitaly_exe is None:  # pragma no cover
             subprocess.check_call(('cargo', 'build', '--locked'),
                                   cwd=rhgitaly_dir)
-            run_cmd = ('cargo', 'run')
+            run_cmd = ['cargo', 'run', '--']
         else:  # pragma no cover
             # Popen would not run a relative binary so easily
             run_cmd = [Path(rhgitaly_exe).resolve()]
 
+        conf = self.home_dir / 'rhgitaly.toml'
+        conf.write_text('\n'.join((
+            "[sidecar]",
+            "managed = false",
+        )))
+        run_cmd.extend(("--config", conf))
+
         with open(self.home_dir / 'rhgitaly.log', 'w') as logf:
             rhgitaly = subprocess.Popen(
                 run_cmd,

{hgitaly-18.6.1/tests_with_gitaly → hgitaly-18.7.0a0/functional_tests}/test_commit.py

@@ -41,8 +41,7 @@ if skip_comparison_tests():  # pragma no cover
 parametrize = pytest.mark.parametrize
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_last_commit_for(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_last_commit_for(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     git_repo = fixture.git_repo
 
@@ -80,7 +79,7 @@ def test_compare_last_commit_for(gitaly_rhgitaly_comparison, hg_server):
                 normalize_commit_message(commit_for_tree.commit)
 
     rpc_helper = fixture.rpc_helper(stub_cls=CommitServiceStub,
-                                    hg_server=hg_server,
+                                    hg_server='rhgitaly',
                                     method_name='ListLastCommitsForTree',
                                     streaming=True,
                                     request_cls=ListLastCommitsForTreeRequest,
@@ -131,7 +130,7 @@ def test_compare_last_commit_for(gitaly_rhgitaly_comparison, hg_server):
         normalize_commit_message(response.commit)
 
     rpc_helper = fixture.rpc_helper(stub_cls=CommitServiceStub,
-                                    hg_server=hg_server,
+                                    hg_server='rhgitaly',
                                     method_name='LastCommitForPath',
                                     request_cls=LastCommitForPathRequest,
                                     request_sha_attrs=['revision'],
@@ -722,7 +721,7 @@ def test_compare_list_commits(gitaly_comparison):
     #
     #   @    4 (branch/default) merge with stable
     #   |\
-    #   | o  3 creates 'animals' (branch/stable)
+    #   | o  3 creates 'animal' (branch/stable)
     #   | |
     #   o |  2 rename 'foo' to 'zoo' (user: testuser)
     #   |/
@@ -763,7 +762,8 @@ def test_compare_list_commits(gitaly_comparison):
         request_defaults=dict(
             pagination_params=PaginationParameter(limit=10)),
         request_sha_attrs=['revision'],
-        response_sha_attrs=['commits[].id', 'commits[].parent_ids[]'],
+        response_sha_attrs=['commits[].id', 'commits[].parent_ids[]',
+                            'pagination_cursor.next_cursor'],
         normalizer=normalizer,
         )
     rpc_helper.sorted = False
@@ -812,18 +812,6 @@ def test_compare_list_commits(gitaly_comparison):
     # no result
     assert_compare(revisions=[ctx4.hex(), caret(ctx4)])
 
-    # with paths
-    assert_compare(revisions=[ctx4.hex()], paths=[b'animals'])
-    assert_compare(revisions=[ctx4.hex()], paths=[b'foo'])
-    assert_compare(revisions=[ctx4.hex()], paths=[b'zoo'])
-    assert_compare(revisions=[ctx3.hex(), ctx2.hex()],
-                   paths=[b'animals', b'zoo'])
-    assert_compare(revisions=[ctx4.hex()], paths=[b'anim*'])
-    # with two paths, Git starts returning the merge
-    # but Mercurial does not. This seems more consistent on the Mercurial
-    # side, so we won't compare. It would be:
-    #    assert_compare(revisions=[ctx4.hex()], paths=[b'anim*', b'foo'])
-
     # orderings
     #
     # Comparison is limited because Mercurial orderings don't exactly
@@ -922,8 +910,7 @@ def test_compare_list_commits(gitaly_comparison):
                           same_details=False)
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_list_commits_by_oid(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_list_commits_by_oid(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     wrapper = fixture.hg_repo_wrapper
 
@@ -944,7 +931,7 @@ def test_compare_list_commits_by_oid(gitaly_rhgitaly_comparison, hg_server):
         del response.commits[:]
 
     rpc_helper = fixture.rpc_helper(
-        hg_server=hg_server,
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='ListCommitsByOid',
         request_cls=ListCommitsByOidRequest,
@@ -980,9 +967,7 @@ def test_compare_list_commits_by_oid(gitaly_rhgitaly_comparison, hg_server):
     rpc_helper.assert_compare(oid=[NULL_HEX, hexes[0]])
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_list_commits_by_ref_name(gitaly_rhgitaly_comparison,
-                                          hg_server):
+def test_compare_list_commits_by_ref_name(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     wrapper = fixture.hg_repo_wrapper
 
@@ -996,7 +981,7 @@ def test_compare_list_commits_by_ref_name(gitaly_rhgitaly_comparison,
                 )
 
     rpc_helper = fixture.rpc_helper(
-        hg_server=hg_server,
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='ListCommitsByRefName',
         request_cls=ListCommitsByRefNameRequest,

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/hgext3rd/hgitaly/__init__.py

@@ -73,7 +73,7 @@ def reraise_abort(msg, exc):
              b'repeated to listen on several addresses' % DEFAULT_LISTEN_URL),
            _(b'ADDRESS')),
           (b'', b'mono-process',
-           False,
+           True,
            _(b'Mono process mode (useful for debugging, notably with pdb).'
              b'No forking occurs, the main process is the single worker. '
              b'In particular the hgitaly.workers configuration item is '
@@ -125,18 +125,7 @@ def serve(ui, **opts):
     client_id_slug = opts.get('client_id_file_name', DEFAULT_CLIENT_ID_SLUG)
     client_id_path = Path(config_root) / '+hgitaly' / os.fsdecode(client_id_slug)
     ensure_client_id(client_id_path)
-    nb_workers = ui.configint(b'hgitaly', b'workers')
-    run_opts = dict(nb_workers=nb_workers,
-                    restart_done_workers=True,
-                    mono_process=opts.get('mono_process'))
-    max_rss_mib = ui.configint(b'hgitaly', b'worker.max-rss-mib')
-    if max_rss_mib is not None:
-        run_opts['max_rss_mib'] = max_rss_mib
-    monitoring_interval = ui.configint(b'hgitaly',
-                                       b'worker.monitoring-interval-seconds')
-    if monitoring_interval is not None:
-        run_opts['monitoring_interval'] = monitoring_interval
-
+    run_opts = {}
     shutdown_timeout = ui.configint(
         b'hgitaly',
         b'worker.graceful-shutdown-timeout-seconds')

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/hgext3rd/hgitaly/tests/test_serve.py

@@ -69,37 +69,6 @@ def test_serve_default_url(tmpdir, monkeypatch):
     assert kwargs.get('nb_workers') is None
 
 
-def test_serve_workers_config(tmpdir, monkeypatch):
-    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
-
-
-def test_serve_max_rss_mb(tmpdir, monkeypatch):
-    ui, records = mock_run_forever(
-        tmpdir, monkeypatch,
-        config=dict(hgitaly={'worker.max-rss-mib': '128'}))
-    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
-
-
-def test_serve_monitoring_interval(tmpdir, monkeypatch):
-    ui, records = mock_run_forever(
-        tmpdir, monkeypatch,
-        config=dict(hgitaly={'worker.monitoring-interval-seconds': '13'}))
-    repositories_root = repos_root(tmpdir)
-    hgitaly_ext.serve(ui, listen=[], repositories_root=repositories_root)
-    kwargs = records[0][1]
-    assert kwargs.get('monitoring_interval') == 13
-
-
 def test_serve_graceful_shutdown(tmpdir, monkeypatch):
     ui, records = mock_run_forever(
         tmpdir, monkeypatch,

hgitaly-18.7.0a0/hgitaly/VERSION

@@ -0,0 +1 @@
+18.7.0a0

hgitaly-18.7.0a0/hgitaly/git.py

@@ -0,0 +1,34 @@
+# Copyright 2020 Georges Racinet <georges.racinet@octobus.net>
+#
+# 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
+"""Git specific things, mostly constants."""
+
+ZERO_SHA_1 = '0' * 40
+
+NULL_COMMIT_ID = ZERO_SHA_1
+NULL_BLOB_OID = ZERO_SHA_1
+
+# from `sha1-file.c` in Git 2.28 sources
+# we're not dealing for now with the fact that there will be
+# two kinds of OIDs with SHA-1 and SHA-256 soon.
+
+# The Git tree object hash that corresponds to an empty tree (directory)
+EMPTY_TREE_OID = '4b825dc642cb6eb9a060e54bf8d69288fbee4904'
+
+# The Git blob object hash that corresponds to an empty blob (file)
+EMPTY_BLOB_OID = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
+
+OBJECT_MODE_DOES_NOT_EXIST = 0  # see, e.g, ChangedPaths in diff.proto
+OBJECT_MODE_LINK = 0o120000  # symlink to file or directory
+OBJECT_MODE_EXECUTABLE = 0o100755  # for blobs only
+OBJECT_MODE_NON_EXECUTABLE = 0o100644  # for blobs only
+OBJECT_MODE_TREE = 0o40000
+
+FILECTX_FLAGS_TO_GIT_MODE_BYTES = {
+    b'l': b'%o' % OBJECT_MODE_LINK,
+    b'x': b'%o' % OBJECT_MODE_EXECUTABLE,
+    b'': b'%o' % OBJECT_MODE_NON_EXECUTABLE,
+}

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/hgitaly/message.py

@@ -21,9 +21,6 @@ from .stub.shared_pb2 import (
     Tag,
     User,
 )
-from .stub.commit_pb2 import (
-    ListLastCommitsForTreeResponse,
-)
 from .stub.mercurial_changeset_pb2 import (
     MercurialChangeset,
     MercurialChangesetField,
@@ -272,14 +269,6 @@ def tag(name, target, tagging=None, signature_type=None):
                )
 
 
-CommitForTree = ListLastCommitsForTreeResponse.CommitForTree
-
-
-def commit_for_tree(changeset, path):
-    """Message indicating the last changeset having modified a path"""
-    return CommitForTree(commit=commit(changeset), path_bytes=path)
-
-
 def mercurial_changeset(changeset, fields=None) -> MercurialChangeset:
     """Serialize changeset information.
 

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/hgitaly/procutil.py

@@ -1,25 +1,17 @@
 import os
 import psutil
 
-IS_CHILD_PROCESS = False
-
 
 def is_current_service_process(pid):
     """Determine whether the given pid is part of the current HGitaly service.
 
     For now, the logic is that other processes from the same HGitaly service
     are expected to be siblings of the current process, unless in the special
-    case where HGitaly is not started as a prefork server, which should happen
-    with the `--mono-process` option (debuging sessions) and tests only.
+    case where HGitaly is started direcly (not from RHGitaly's sidecar),
+    hence for debugging purposes or from tests.
     """
-    this_pid = os.getpid()
-
-    if not IS_CHILD_PROCESS:
-        return pid == this_pid
-
     try:
         proc = psutil.Process(pid)
     except psutil.NoSuchProcess:
         return False
-
     return proc.ppid() == os.getppid()

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/hgitaly/server/__init__.py

@@ -11,7 +11,10 @@ from .address import (
 )
 from .mono import (
     BindError,
+    server_process,
 )
-from .prefork import (
-    run_forever,
-)
+
+def run_forever(listen_urls, storages, **process_kwargs):
+    return server_process(0, listen_urls, storages,
+                          mono_process=True,
+                          **process_kwargs)

{hgitaly-18.6.1 → hgitaly-18.7.0a0}/hgitaly/server/worker.py

@@ -61,7 +61,7 @@ class WorkerProcess:
         return self.process.pid
 
     def __str__(self):
-        pid = 'no process' if self.process is None else self.process.pid
+        pid = 'no process' if self.process is None else self.pid
         return f"Worker {self.process_args[0]} (pid: {pid})"
 
     def init_process(self):