hgitaly 18.4.0__tar.gz → 18.4.1__tar.gz

{hgitaly-18.4.0/hgitaly.egg-info → hgitaly-18.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.0
+Version: 18.4.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>=5.3.0dev0
+Requires-Dist: heptapod>=5.4.0
 Requires-Dist: protobuf~=6.31.1
 Requires-Dist: grpcio~=1.74.0
 Requires-Dist: grpcio-status~=1.74.0

hgitaly-18.4.1/hgitaly/VERSION

@@ -0,0 +1 @@
+18.4.1

{hgitaly-18.4.0 → hgitaly-18.4.1}/hgitaly/service/repository.py

@@ -36,6 +36,7 @@ from hgext3rd.heptapod.branch import set_default_gitlab_branch
 from hgext3rd.heptapod.special_ref import write_gitlab_special_ref
 from hgext3rd.heptapod.keep_around import (
     create_keep_around,
+    delete_keep_around,
     parse_keep_around_ref,
 )
 
@@ -337,7 +338,9 @@ class RepositoryServicer(RepositoryServiceServicer, HGitalyServicer):
 
             keep_around = parse_keep_around_ref(ref)
             if keep_around is not None:
-                if (CHANGESET_HASH_BYTES_REGEXP.match(keep_around) is None
+                if target == ZERO_SHA:
+                    delete_keep_around(repo, keep_around)
+                elif (CHANGESET_HASH_BYTES_REGEXP.match(keep_around) is None
                         or target != keep_around):
                     context.abort(
                         StatusCode.INVALID_ARGUMENT,
@@ -346,8 +349,8 @@ class RepositoryServicer(RepositoryServiceServicer, HGitalyServicer):
                         "target must "
                         "match the ref name" % (target, ref)
                     )
-
-                create_keep_around(repo, target)
+                else:
+                    create_keep_around(repo, target)
                 return WriteRefResponse()
         except Exception:
             # TODO this is a stop-gap measure to prevent repository breakage

{hgitaly-18.4.0 → hgitaly-18.4.1}/hgitaly/service/tests/test_repository_service.py

@@ -456,6 +456,8 @@ def test_write_ref(fixture_with_repo):
     create_keep_around(repo, existing_ka)
     fixture.write_ref(b'refs/keep-around/' + sha, sha)
     assert set(iter_keep_arounds(repo)) == {sha, existing_ka}
+    fixture.write_ref(b'refs/keep-around/' + existing_ka, ZERO_SHA)
+    assert set(iter_keep_arounds(repo)) == {sha}
 
 
 def test_write_special_refs_exceptions(fixture_with_repo):

{hgitaly-18.4.0 → hgitaly-18.4.1/hgitaly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.4.0
+Version: 18.4.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>=5.3.0dev0
+Requires-Dist: heptapod>=5.4.0
 Requires-Dist: protobuf~=6.31.1
 Requires-Dist: grpcio~=1.74.0
 Requires-Dist: grpcio-status~=1.74.0

{hgitaly-18.4.0 → hgitaly-18.4.1}/hgitaly.egg-info/requires.txt

@@ -1,4 +1,4 @@
-heptapod>=5.3.0dev0
+heptapod>=5.4.0
 protobuf~=6.31.1
 grpcio~=1.74.0
 grpcio-status~=1.74.0

{hgitaly-18.4.0 → hgitaly-18.4.1}/install-requirements.txt

@@ -1,4 +1,4 @@
-heptapod>=5.3.0dev0
+heptapod>=5.4.0
 protobuf~=6.31.1
 grpcio~=1.74.0
 grpcio-status~=1.74.0

{hgitaly-18.4.0 → hgitaly-18.4.1}/tests_with_gitaly/test_repository_service.py

@@ -13,6 +13,10 @@ from mercurial import (
 import pytest
 import grpc
 import itertools
+
+from hgext3rd.heptapod.keep_around import (
+    iter_keep_arounds,
+)
 # from hgitaly.git import EMPTY_TREE_OID
 from hgitaly.testing import license_content
 from hgitaly.revision import ZERO_SHA
@@ -816,14 +820,17 @@ def test_find_license(gitaly_rhgitaly_comparison):
     rpc_helper.assert_compare()
 
 
-def test_write_ref(gitaly_comparison, server_repos_root):
-    fixture = gitaly_comparison
+@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
+def test_write_ref(gitaly_rhgitaly_comparison, server_repos_root, hg_server):
+    fixture = gitaly_rhgitaly_comparison
     rpc_helper = fixture.rpc_helper(
+        hg_server=hg_server,
         stub_cls=RepositoryServiceStub,
         method_name='WriteRef',
         request_sha_attrs=['revision', 'old_revision'],
         request_cls=WriteRefRequest,
     )
+    rpc_helper.feature_flags = [('rhgitaly-write-ref', True)]
 
     def commit_normalizer(rpc_helper, response, **kw):
         if response.HasField('commit'):
@@ -843,11 +850,18 @@ def test_write_ref(gitaly_comparison, server_repos_root):
     wrapper = fixture.hg_repo_wrapper
     sha0 = wrapper.write_commit('afoo', message="Some foo").hex()
     sha1 = wrapper.write_commit('afoo', message="Some foo").hex()
+    sha2 = wrapper.write_commit('afoo', message="Other foo",
+                                branch='other').hex()
     default_rev = b'branch/default'
+    default_ref = b'refs/heads/' + default_rev
+    other_rev = b'branch/other'
+    other_ref = b'refs/heads/' + other_rev
 
     # precondition for the test: mirror worked
-    assert fixture.git_repo.branch_titles() == {default_rev: b"Some foo"}
+    assert fixture.git_repo.branch_titles() == {default_rev: b"Some foo",
+                                                other_rev: b"Other foo"}
 
+    # a special ref, insertion then removal
     pipeline_1 = b'refs/pipelines/1'
     assert_compare(ref=pipeline_1, revision=default_rev)
     find_commit_helper.assert_compare(revision=pipeline_1)
@@ -858,10 +872,42 @@ def test_write_ref(gitaly_comparison, server_repos_root):
                           old_revision=ZERO_SHA)
     assert_compare_errors(ref=pipeline_1, revision=sha0, old_revision=sha1)
 
+    # removal
+    assert_compare_errors(ref=pipeline_1, revision=ZERO_SHA, old_revision=sha1)
+    find_commit_helper.assert_compare(revision=pipeline_1)
+    assert_compare(ref=pipeline_1, revision=ZERO_SHA)
+    find_commit_helper.assert_compare(revision=pipeline_1)
+    # removal of unknown is not an error
+    assert_compare(ref=b'refs/merge-requests/unknown', revision=ZERO_SHA)
+
+    # Default branch
+    assert_compare(ref=b'HEAD', revision=other_ref)
+    assert find_commit_helper.rpc('hg',
+                                  revision=b'HEAD').commit.id == sha2.decode()
+    find_commit_helper.assert_compare(revision=b'HEAD')
+
     # old_revision is not honoured for symrefs by Gitaly:
     assert_compare(ref=b'HEAD',
-                   revision=b"refs/heads/something",
-                   old_revision=b"refs/heads/other")
+                   revision=default_ref,
+                   old_revision=b"refs/heads/something")
+    assert find_commit_helper.rpc('hg',
+                                  revision=b'HEAD').commit.id == sha1.decode()
+    find_commit_helper.assert_compare(revision=b'HEAD')
+
+    # keep-arounds
+    ka = b'refs/keep-around/' + sha1
+    assert_compare(ref=ka, revision=sha1)
+
+    find_commit_helper.assert_compare(revision=ka)
+    assert_compare(ref=ka, revision=sha1)  # no error if already there
+
+    # removal (FindCommit having a shortcut to resolve keep-arounds
+    # without reading the file, we check the content directly (Gitaly would
+    # return an empty response for this, a very very minor discrepancy that
+    # we tolerate).
+    assert_compare(ref=ka, revision=ZERO_SHA)
+    assert not find_commit_helper.rpc('git', revision=ka).commit.id
+    assert not list(iter_keep_arounds(wrapper.repo))
 
     # HGitaly is stricter than Gitaly with this (notably keep-arounds
     # consistency checks), and we don't want to downgrade that.

hgitaly-18.4.0/hgitaly/VERSION

@@ -1 +0,0 @@
-18.4.0