hgitaly 2.8.0__tar.gz → 2.8.1__tar.gz

{hgitaly-2.8.0/hgitaly.egg-info → hgitaly-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 2.8.0
+Version: 2.8.1
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -10,7 +10,7 @@ Keywords: hg mercurial heptapod gitlab
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: heptapod>=4.4.1dev0
+Requires-Dist: heptapod<4.9,>=4.8.0dev0
 Requires-Dist: protobuf~=4.21.0
 Requires-Dist: grpcio~=1.58.0
 Requires-Dist: grpcio-status~=1.58.0

hgitaly-2.8.1/hgitaly/VERSION

@@ -0,0 +1 @@
+2.8.1

{hgitaly-2.8.0 → hgitaly-2.8.1}/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.8.0 → hgitaly-2.8.1}/hgitaly/service/tests/fixture.py

@@ -155,6 +155,17 @@ 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
+
+    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 make_repo_wrapper(self, rel_path, **kw):
         """Utility method to avoid depending too much on actual disk layout.
 
@@ -181,8 +192,8 @@ class ServiceFixture:
             metadata.append((CORRELATION_ID_MD_KEY, corr_id))
         return metadata
 
-    def git_repo(self):
-        return GitRepo(str(self.repo_wrapper.path) + '.git')
+    def git_repo(self, **storage_kw):
+        return self.side_git_repo(self.repo_wrapper.path, **storage_kw)
 
 
 class MutationServiceFixture(ServiceFixture):

{hgitaly-2.8.0 → hgitaly-2.8.1}/hgitaly/service/tests/test_mercurial_operations.py

@@ -20,7 +20,6 @@ from google.protobuf.timestamp_pb2 import Timestamp
 from hgext3rd.heptapod.branch import (
     gitlab_branches,
 )
-from heptapod.testhelpers.git import GitRepo
 
 from hgitaly.changelog import ancestor
 from hgitaly.errors import (
@@ -244,7 +243,7 @@ def test_publish_changeset(operations_fixture, project_mode):
 
     # because of the config set by fixture, operations through wrapper
     # are performed in all cases with Git mirroring.
-    git_repo = GitRepo(str(wrapper.path) + '.git')
+    git_repo = fixture.git_repo()
     initial_git_branches = git_repo.branches()
 
     default_ref = b'refs/heads/branch/default'
@@ -278,7 +277,9 @@ def test_publish_changeset(operations_fixture, project_mode):
         # expect Git branches not to have moved
         assert git_repo.branches() == initial_git_branches
     else:
-        # expect Git branch to point on new commit
+        # expect Git branch to point on new commit (and Git repo has moved
+        # to the protected location so we need to reinstantiate it)
+        git_repo = fixture.git_repo()
         assert git_repo.branches()[b'branch/default']['title'] == b'topical'
 
     # error cases

{hgitaly-2.8.0 → hgitaly-2.8.1}/hgitaly/service/tests/test_operations.py

@@ -15,7 +15,6 @@ from mercurial import (
     phases,
 )
 
-from heptapod.testhelpers.git import GitRepo
 from hgext3rd.heptapod.branch import (
     gitlab_branches,
 )
@@ -81,7 +80,7 @@ def test_user_squash(operations_fixture, project_mode, timestamp):
     sha3 = wrapper.commit_file('foo', message='foo3').hex().decode('ascii')
     wrapper.update(sha1)  # avoid keeping changeset 3 visible
     # let's confirm it
-    git_repo = GitRepo(str(wrapper.path) + '.git')
+    git_repo = fixture.git_repo()
     before_squash_git_branches = git_repo.branches()
     assert before_squash_git_branches[b'branch/default']['title'] == b'foo3'
 
@@ -130,7 +129,9 @@ def test_user_squash(operations_fixture, project_mode, timestamp):
         # expect Git branches not to have moved
         assert git_repo.branches() == before_squash_git_branches
     else:
-        # expect Git branch to point on new commit
+        # expect Git branch to point on new commit (also Git repo may have
+        # moved, let's also reload it)
+        git_repo = fixture.git_repo()
         assert git_repo.branches()[b'branch/default']['title'] == b'squashed!'
 
     for kw in (

{hgitaly-2.8.0 → hgitaly-2.8.1}/hgitaly/tests/common.py

@@ -47,8 +47,10 @@ def make_empty_repo(storages_root, relative_path=None, storage='default',
         relative_path = 'repo-' + hex(random.getrandbits(64))[2:]
     repo_path = storages_root / storage / relative_path
     if config is None:
-        config = MINIMAL_HG_CONFIG
+        config = deepcopy(MINIMAL_HG_CONFIG)
 
+    config.setdefault('heptapod', {}
+                      )['repositories-root'] = str(storages_root / storage)
     config['extensions'].update((ext, '') for ext in extra_extensions)
     wrapper = LocalRepoWrapper.init(repo_path, config=config)
     wrapper.write_hgrc(config)

{hgitaly-2.8.0 → hgitaly-2.8.1}/hgitaly/tests/test_branch.py

@@ -31,9 +31,12 @@ from hgext3rd.heptapod.branch import (
 
 
 def make_repo(path):
-    return LocalRepoWrapper.init(path,
+    return LocalRepoWrapper.init(path / 'repo.hg',
                                  config=dict(
                                      extensions=dict(topic='', evolve=''),
+                                     heptapod={
+                                         'repositories-root': str(path)
+                                     }
                                  ))
 
 

{hgitaly-2.8.0 → hgitaly-2.8.1}/hgitaly/tests/test_gitlab_ref.py

@@ -4,6 +4,8 @@
 # GNU General Public License version 2 or any later version.
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
+from copy import deepcopy
+import shutil
 
 import pytest
 from heptapod.testhelpers import (
@@ -28,11 +30,14 @@ from ..gitlab_ref import (
     keep_around_ref_path,
     parse_keep_around_ref_path,
 )
+from .. import gitlab_ref as glref_mod  # for monkey-patching
 
 
 @pytest.fixture
 def repo_wrapper(tmpdir):
-    wrapper = LocalRepoWrapper.init(tmpdir, config=MINIMAL_HG_CONFIG)
+    config = deepcopy(MINIMAL_HG_CONFIG)
+    config.setdefault('heptapod', {})['repositories-root'] = tmpdir
+    wrapper = LocalRepoWrapper.init(tmpdir / 'repo.hg', config=config)
     yield wrapper.repo, wrapper
 
 
@@ -40,8 +45,12 @@ def repo_wrapper(tmpdir):
 def mirror(tmpdir, monkeypatch):
     config = MINIMAL_HG_CONFIG.copy()
     config['extensions']['heptapod'] = ''
+    config.setdefault('heptapod', {}).update((
+        ('native', 'no'),
+        ('repositories-root', tmpdir),
+    ))
 
-    with GitLabMirrorFixture.init(tmpdir, monkeypatch,
+    with GitLabMirrorFixture.init(tmpdir / 'repos', monkeypatch,
                                   common_repo_name='repo',
                                   hg_config=config) as mirror:
         mirror.activate_mirror()
@@ -90,6 +99,25 @@ def test_gitlab_special_ref_target_ensure(mirror):
     assert gitlab_special_ref_target(wrapper.repo, ref_path) == ctx
 
 
+def should_not_be_called(*a, **kw):  # pragma: no cover
+    raise AssertionError("should not have been called")
+
+
+def test_special_ref_not_ensure(mirror, monkeypatch):
+    wrapper = mirror.hg_repo_wrapper
+    git_repo = mirror.git_repo
+
+    shutil.rmtree(git_repo.path)
+    monkeypatch.setattr(glref_mod, 'ensure_gitlab_special_refs',
+                        should_not_be_called)
+    monkeypatch.setattr(glref_mod, 'ensure_gitlab_keep_arounds',
+                        should_not_be_called)
+
+    ref_path = b'refs/environments/654'
+    assert gitlab_special_ref_target(wrapper.repo, ref_path) is None
+    assert tuple(iter_keep_arounds_as_refs(wrapper.repo)) == ()
+
+
 def test_write_special_ref(repo_wrapper):
     repo, wrapper = repo_wrapper
 

{hgitaly-2.8.0 → hgitaly-2.8.1/hgitaly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 2.8.0
+Version: 2.8.1
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -10,7 +10,7 @@ Keywords: hg mercurial heptapod gitlab
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: heptapod>=4.4.1dev0
+Requires-Dist: heptapod<4.9,>=4.8.0dev0
 Requires-Dist: protobuf~=4.21.0
 Requires-Dist: grpcio~=1.58.0
 Requires-Dist: grpcio-status~=1.58.0

{hgitaly-2.8.0 → hgitaly-2.8.1}/hgitaly.egg-info/requires.txt

@@ -1,4 +1,4 @@
-heptapod>=4.4.1dev0
+heptapod<4.9,>=4.8.0dev0
 protobuf~=4.21.0
 grpcio~=1.58.0
 grpcio-status~=1.58.0

{hgitaly-2.8.0 → hgitaly-2.8.1}/install-requirements.txt

@@ -1,4 +1,4 @@
-heptapod>=4.4.1dev0
+heptapod>=4.8.0dev0,<4.9
 protobuf~=4.21.0
 grpcio~=1.58.0
 grpcio-status~=1.58.0

{hgitaly-2.8.0 → hgitaly-2.8.1}/tests_with_gitaly/comparison.py

@@ -170,6 +170,10 @@ def gitaly_comparison_fixture(server_repos_root,
 
     hg_config = dict(phases=dict(publish=False),
                      ui=dict(username='Hgitaly Tests <hgitaly@heptapod.test>'),
+                     heptapod={
+                         'native': 'no',
+                         'repositories-root': str(server_repos_root / storage),
+                     },
                      extensions={name: '' for name in ('evolve',
                                                        'hggit',
                                                        'topic',

{hgitaly-2.8.0 → hgitaly-2.8.1}/tests_with_gitaly/hgitaly_rhgitaly_comparison.py

@@ -140,6 +140,7 @@ def hgitaly_rhgitaly_comparison_fixture(server_repos_root,
         hg_config = dict(
             phases=dict(publish=False),
             ui=dict(username='Hgitaly Tests <hgitaly@heptapod.test>'),
+            heptapod={'repositories-root': str(server_repos_root / storage)},
             extensions={name: '' for name in ('evolve',
                                               'topic',
                                               'hgitaly',

hgitaly-2.8.0/hgitaly/VERSION

@@ -1 +0,0 @@
-2.8.0