hgitaly 18.3.0a1__tar.gz → 18.3.2__tar.gz

{hgitaly-18.3.0a1/hgitaly.egg-info → hgitaly-18.3.2}/PKG-INFO

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

hgitaly-18.3.2/hgitaly/VERSION

@@ -0,0 +1 @@
+18.3.2

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/diff.py

@@ -32,6 +32,7 @@ from .oid import (
 from .stub.diff_pb2 import (
     ChangedPaths,
     DiffStats,
+    FindChangedPathsRequest,
 )
 
 GIT_PATCH_ID_TIMEOUT_SECONDS = 10
@@ -57,8 +58,23 @@ RENAMED = ChangedPaths.Status.RENAMED
 DIFF_HUNKS_START_RX = re.compile(rb'^(--- )|^(Binary file)')
 """To match the header line right before hunks start getting dumped."""
 
+DiffStatus = FindChangedPathsRequest.DiffStatus
 
-def changed_paths(repo, from_ctx, to_ctx, base_path, find_renames=False):
+Status_Filter_Map = dict(
+    added=DiffStatus.DIFF_STATUS_ADDED,
+    modified=DiffStatus.DIFF_STATUS_MODIFIED,
+    removed=DiffStatus.DIFF_STATUS_DELETED,
+    copied=DiffStatus.DIFF_STATUS_COPIED,
+    renamed=DiffStatus.DIFF_STATUS_RENAMED,
+    # TODO in case TYPE_CHANGE is explicitly filtered out or included,
+    # we should make the difference.
+)
+"""Mapping status object attributes to DiffFilter enum."""
+
+
+def changed_paths(repo, from_ctx, to_ctx, base_path,
+                  find_renames=False,
+                  diff_filters=()):
     if base_path is None:
         matcher = None
         path_trim_at = 0
@@ -83,19 +99,32 @@ def changed_paths(repo, from_ctx, to_ctx, base_path, find_renames=False):
     status = from_ctx.status(to_ctx, match=matcher)
     # this will remove renames from copy_info, keeping only actual copies
     yield from status_changed_paths(from_ctx, to_ctx, status, copy_info,
+                                    diff_filters=diff_filters,
                                     find_renames=find_renames,
                                     trim_at=path_trim_at)
+    if filtered_out('copied', diff_filters):
+        return
+
     yield from copy_changed_paths(from_ctx,
                                   to_ctx,
                                   copy_info,
                                   trim_at=path_trim_at)
 
 
+def filtered_out(status_type, diff_filters):
+    if not diff_filters:
+        return False
+    return Status_Filter_Map[status_type] not in diff_filters
+
+
 def status_changed_paths(from_ctx, to_ctx, status, copy_info,
+                         diff_filters=(),
                          find_renames=False, trim_at=0):
     rcopy_info = {v: k for k, v in copy_info.items()}
     """Return ChangedPaths from Mercurial status object"""
     for stype in ['added', 'modified', 'removed']:
+        if stype != 'removed' and filtered_out(stype, diff_filters):
+            continue
         for path in status.__getattribute__(stype):
             copied_from = copy_info.get(path)
             if copied_from is not None:
@@ -113,17 +142,23 @@ def status_changed_paths(from_ctx, to_ctx, status, copy_info,
             if stype == 'removed':
                 new_path = rcopy_info.get(path)
                 if new_path is None:
+                    if filtered_out(stype, diff_filters):
+                        continue
                     new_mode = OBJECT_MODE_DOES_NOT_EXIST
                     new_blob_id = NULL_BLOB_OID
                 else:
                     del copy_info[new_path]
                     if find_renames:
                         stype = 'renamed'
+                        if filtered_out(stype, diff_filters):
+                            continue
                         old_path = path
                         path = new_path
                         new_mode = git_perms(to_ctx.filectx(new_path))
                         new_blob_id = ctx_blob_oid(to_ctx, new_path)
                     else:
+                        if filtered_out(stype, diff_filters):
+                            continue
                         new_mode = OBJECT_MODE_DOES_NOT_EXIST
                         new_blob_id = NULL_BLOB_OID
             else:

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/errors.py

@@ -103,8 +103,9 @@ def operation_error_treatment(context, error_message_class, logger,
     except GitLabPreReceiveError as exc:
         message = exc.message
         if isinstance(message, str):
-            # should not normally happen, but let's make sure it is not
-            # a problem
+            # almost impossible with Mercurial 7.1, because the parent class,
+            # `error.Abort` converts automatically to bytes. Still keeping
+            # this last line of defense:
             message = message.encode('utf-8')
         attrs = {
             error_message_attr: CustomHookError(

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/server/tests/test_mono.py

@@ -10,7 +10,10 @@ import socket
 
 import grpc
 
-from hgitaly.testing.grpc import wait_server_accepts_connection
+from hgitaly.testing.grpc import (
+    wait_health_check,
+    wait_server_accepts_connection,
+)
 from .. import mono as server
 
 
@@ -93,6 +96,7 @@ def test_server_process(tmpdir):
     p.start()
     with grpc.insecure_channel(listen_url) as channel:
         wait_server_accepts_connection(channel)
+        wait_health_check(channel)
 
     p.terminate()
 

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/service/commit.py

@@ -613,6 +613,11 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
                 context, StatusCode.NOT_FOUND, "commits not found",
                 FindCommitsError())
 
+        message_regex = request.message_regex
+        if message_regex:
+            grep = f" and grep('(?i){message_regex}')"
+            opts[b'rev'][0] += grep.encode('utf-8')
+
         walk_opts = logcmdutil.parseopts(repo.ui, pats, opts)
         revs, _ = logcmdutil.getrevs(repo, walk_opts)
 

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/service/diff.py

@@ -525,7 +525,8 @@ class DiffServicer(DiffServiceServicer, HGitalyServicer):
         for paths in chunked(path for extr in extracted
                              for path in changed_paths(
                                      repo, *extr,
-                                     find_renames=find_renames)):
+                                     find_renames=find_renames,
+                                     diff_filters=request.diff_filters)):
             yield FindChangedPathsResponse(paths=paths)
 
     def GetPatchID(self, request: GetPatchIDRequest,

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/service/operations.py

@@ -361,9 +361,14 @@ class OperationServicer(OperationServiceServicer, HGitalyServicer):
             start_ctx = repo[ZERO_SHA]
         if commit_header.branch_name:
             old_oid = commit_header.expected_old_oid.encode('ascii')
-            if old_oid and start_ctx.hex() != old_oid:
-                context.abort(StatusCode.INVALID_ARGUMENT,
-                              "wrong old oid")
+            if old_oid:
+                old_ctx = gitlab_revision_changeset(repo, gl_branch)
+                if (
+                        (old_ctx is None and old_oid != ZERO_SHA)
+                        or (old_ctx is not None and old_ctx.hex() != old_oid)
+                ):
+                    context.abort(StatusCode.INVALID_ARGUMENT,
+                                  "wrong old oid")
 
         if to_publish and self.heptapod_permission != 'publish':
             context.abort(

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/service/tests/test_commit.py

@@ -368,6 +368,8 @@ def test_find_commits(commit_fixture_empty_repo):
         assert exc_info.value.code() == grpc.StatusCode.NOT_FOUND
     # with all, return all the commits
     assert find_commits_ids(all=True) == [sha0, sha1, sha2, sha3, sha4]
+    # with message_regex
+    assert find_commits_ids(all=True, message_regex='FOO.*zoO') == [sha2]
     # with offset
     assert find_commits_ids(all=True, offset=2) == [sha2, sha3, sha4]
     # with skip_merges

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/service/tests/test_diff.py

@@ -34,6 +34,13 @@ from hgitaly.stub.diff_pb2_grpc import DiffServiceStub
 from .fixture import ServiceFixture
 
 StatusCode = grpc.StatusCode
+DiffStatus = FindChangedPathsRequest.DiffStatus
+
+DS_ADDED = DiffStatus.DIFF_STATUS_ADDED
+DS_MODIFIED = DiffStatus.DIFF_STATUS_MODIFIED
+DS_DELETED = DiffStatus.DIFF_STATUS_DELETED
+DS_COPIED = DiffStatus.DIFF_STATUS_COPIED
+DS_RENAMED = DiffStatus.DIFF_STATUS_RENAMED
 
 
 class DiffFixture(ServiceFixture):
@@ -170,9 +177,9 @@ def test_raw_diff(diff_fixture):
                                message=b'added foo')
     ctx1 = wrapper.commit_file('foo', content="I am foo\n",
                                message=b'changes foo')
-    wrapper.command(b'mv', wrapper.repo.root + b'/foo',
+    wrapper.command('mv', wrapper.repo.root + b'/foo',
                     wrapper.repo.root + b'/zoo')
-    wrapper.command(b'ci', message=b"rename foo to zoo")
+    wrapper.command('ci', message=b"rename foo to zoo")
     ctx2 = wrapper.repo[b'.']
     sha0, sha1, sha2 = ctx0.hex(), ctx1.hex(), ctx2.hex()
 
@@ -367,7 +374,7 @@ def test_commit_diff(diff_fixture):
                                message="Add bar")
     ctx1 = wrapper.commit_file('bar', content="I am in\nbar\n",
                                message="Changes bar")
-    wrapper.command(b'mv', wrapper.repo.root + b'/bar',
+    wrapper.command('mv', wrapper.repo.root + b'/bar',
                     wrapper.repo.root + b'/zar')
     ctx2 = wrapper.commit([b'bar', b'zar'], message="Rename bar to zar")
     ctx3 = wrapper.commit_file('zoo', content="I am in\nzoo\n",
@@ -470,7 +477,7 @@ def test_commit_delta(diff_fixture):
                                message="Add bar")
     ctx1 = wrapper.commit_file('bar', content="I am in\nbar\n",
                                message="Changes bar")
-    wrapper.command(b'mv', wrapper.repo.root + b'/bar',
+    wrapper.command('mv', wrapper.repo.root + b'/bar',
                     wrapper.repo.root + b'/zar')
     ctx2 = wrapper.commit([b'bar', b'zar'], message="Rename bar to zar")
     ctx3 = wrapper.commit_file('zoo', content="I am in\nzoo\n",
@@ -545,7 +552,7 @@ def test_diff_stats(diff_fixture):
                         message="Add bar")
     ctx1 = wrapper.commit_file('bar', content="I am in\nbar\n",
                                message="Changes bar")
-    wrapper.command(b'mv', wrapper.repo.root + b'/bar',
+    wrapper.command('mv', wrapper.repo.root + b'/bar',
                     wrapper.repo.root + b'/zar')
     ctx2 = wrapper.commit([b'bar', b'zar'], message="Rename bar to zar")
     ctx3 = wrapper.commit_file('zoo', content="I am in\nzoo\n",
@@ -586,8 +593,15 @@ def test_diff_stats(diff_fixture):
     assert exc_info.value.code() == grpc.StatusCode.FAILED_PRECONDITION
 
 
+def sub_dict(d, *keys):
+    """Sub dict with given keys, after encoding to bytes."""
+    return {k.encode('ascii'): d[k.encode('ascii')]
+            for k in keys}
+
+
 def test_find_changed_paths(diff_fixture):
     wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
 
     (wrapper.path / 'sub').mkdir()
     (wrapper.path / 'sub/foo').write_text('foo content')
@@ -599,8 +613,7 @@ def test_find_changed_paths(diff_fixture):
     (wrapper.path / 'too').chmod(0o755)
     (wrapper.path / 'sub/foo').write_text('foo content modified')
     (wrapper.path / 'bar').unlink()
-    wrapper.command(b'cp', wrapper.repo.root + b'/zoo',
-                    wrapper.repo.root + b'/zaz')
+    wrapper.command('cp', repo.root + b'/zoo', repo.root + b'/zaz')
     ctx1 = wrapper.commit(rel_paths=['sub/foo', 'bar', 'zaz', 'too'],
                           add_remove=True)
 
@@ -635,6 +648,15 @@ def test_find_changed_paths(diff_fixture):
     assert diff_fixture.find_changed_paths_commits(
         [ctx1.hex(), ctx2.hex()]) == resp_dict
 
+    # diff_filters
+    def fcp_filtered(filters):
+        return diff_fixture.find_changed_paths_commits(
+            [ctx1.hex(), ctx2.hex()], diff_filters=filters)
+
+    assert fcp_filtered([DS_ADDED]) == sub_dict(resp_dict, 'too')
+    assert fcp_filtered([DS_MODIFIED]) == sub_dict(resp_dict, 'sub/foo')
+    assert fcp_filtered([DS_COPIED]) == sub_dict(resp_dict, 'zaz')
+
     # Testing by passing "parents" (changesets to compare to)
     ctx3 = wrapper.commit_file("toto")
     assert diff_fixture.find_changed_paths_commits(
@@ -648,7 +670,6 @@ def test_find_changed_paths(diff_fixture):
         }
 
     # Tree requests
-    repo = wrapper.repo
     sub0_oid, sub1_oid = [tree_oid(repo, ctx.hex().decode('ascii'), b'sub')
                           for ctx in (ctx0, ctx1)]
     assert diff_fixture.find_changed_paths_tree(sub0_oid, sub1_oid) == {
@@ -669,17 +690,16 @@ def test_find_changed_paths(diff_fixture):
 
 def test_find_changed_paths_copy_in_tree(diff_fixture):
     wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
 
     (wrapper.path / 'subdir').mkdir()  # avoid all lengths to be 3
     (wrapper.path / 'subdir/bar').write_text('some bar')
     ctx0 = wrapper.commit(rel_paths=['subdir'], add_remove=True)
 
-    wrapper.command(b'cp', wrapper.repo.root + b'/subdir/bar',
-                    wrapper.repo.root + b'/subdir/baz')
+    wrapper.command('cp', repo.root + b'/subdir/bar',
+                    repo.root + b'/subdir/baz')
     ctx1 = wrapper.commit(rel_paths=['subdir'])
 
-    repo = wrapper.repo
-
     sub0_oid, sub1_oid = [tree_oid(repo, ctx.hex().decode('ascii'), b'subdir')
                           for ctx in (ctx0, ctx1)]
     assert diff_fixture.find_changed_paths_tree(sub0_oid, sub1_oid) == {
@@ -689,25 +709,23 @@ def test_find_changed_paths_copy_in_tree(diff_fixture):
 
 def test_find_changed_paths_rename(diff_fixture):
     wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
 
     (wrapper.path / 'subdir').mkdir()  # avoid all lengths to be 3
     (wrapper.path / 'subdir/bar').write_text('some bar')
     ctx0 = wrapper.commit(rel_paths=['subdir'], add_remove=True)
 
-    wrapper.command(b'mv', wrapper.repo.root + b'/subdir/bar',
-                    wrapper.repo.root + b'/subdir/baz')
+    wrapper.command('mv', repo.root + b'/subdir/bar',
+                    repo.root + b'/subdir/baz')
     ctx1 = wrapper.commit(rel_paths=['subdir'])
 
-    repo = wrapper.repo
+    def fcp(**opts):
+        return diff_fixture.find_changed_paths_commits(
+            [ctx1.hex()],
+            compare_to=[ctx0.hex()],
+            **opts)
 
-    sub0_oid, sub1_oid = [tree_oid(repo, ctx.hex().decode('ascii'), b'subdir')
-                          for ctx in (ctx0, ctx1)]
-    ret = diff_fixture.find_changed_paths_commits(
-        [ctx1.hex()],
-        compare_to=[ctx0.hex()],
-        find_renames=False,
-    )
-    assert ret == {
+    expected_no_renames = {
         b'subdir/baz': [(ChangedPaths.Status.ADDED,
                          (OBJECT_MODE_DOES_NOT_EXIST,
                           OBJECT_MODE_NON_EXECUTABLE),
@@ -718,17 +736,50 @@ def test_find_changed_paths_rename(diff_fixture):
                          )],
     }
 
-    ret = diff_fixture.find_changed_paths_commits(
-        [ctx1.hex()],
-        compare_to=[ctx0.hex()],
-        find_renames=True,
-    )
-    assert ret == {
+    assert fcp(find_renames=False) == expected_no_renames
+    assert fcp(find_renames=False,
+               diff_filters=[DS_ADDED],
+               ) == sub_dict(expected_no_renames, 'subdir/baz')
+    assert fcp(find_renames=False,
+               diff_filters=[DS_DELETED],
+               ) == sub_dict(expected_no_renames, 'subdir/bar')
+
+    expected_renames = {
         b'subdir/baz': [(ChangedPaths.Status.RENAMED, None)],
     }
+    assert fcp(find_renames=True) == expected_renames
+    assert fcp(find_renames=True,
+               diff_filters=[DS_ADDED, DS_MODIFIED, DS_DELETED]
+               ) == {}
+    assert fcp(find_renames=True,
+               diff_filters=[DS_RENAMED]) == expected_renames
+
+
+def test_find_changed_paths_rename_and_copy(diff_fixture):
+    wrapper = diff_fixture.repo_wrapper
+    repo = wrapper.repo
+
+    ctx0 = wrapper.commit_file('foo')
+    wrapper.command('cp', repo.root + b'/foo', repo.root + b'/bar')
+    wrapper.command('mv', repo.root + b'/foo', repo.root + b'/bar2')
+    ctx1 = wrapper.commit(rel_paths=['foo', 'bar', 'bar2'])
+
+    def fcp(find_renames=True, **opts):
+        return diff_fixture.find_changed_paths_commits(
+            [ctx1.hex()],
+            compare_to=[ctx0.hex()],
+            find_renames=find_renames,
+            **opts)
+
+    expected = {
+        b'bar': [(ChangedPaths.Status.COPIED, None)],
+        b'bar2': [(ChangedPaths.Status.RENAMED, None)],
+    }
 
-    # TODO test the case of rename with duplication:
-    # hg cp foo bar; hg mv foo bar2
+    assert fcp() == expected
+    assert fcp(diff_filters=[DS_ADDED]) == {}
+    assert fcp(diff_filters=[DS_RENAMED]) == sub_dict(expected, 'bar2')
+    assert fcp(diff_filters=[DS_COPIED]) == sub_dict(expected, 'bar')
 
 
 def test_get_patch_id(diff_fixture):

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/service/tests/test_operations.py

@@ -24,6 +24,7 @@ from hgext3rd.heptapod.branch import (
     gitlab_branches,
 )
 
+from hgitaly.revision import ZERO_SHA_STR
 from hgitaly.stub.operations_pb2 import (
     OperationBranchUpdate,
     UserCommitFilesAction,
@@ -832,3 +833,49 @@ def test_user_commit_files(operations_fixture, tmpdir):
             UserCommitFilesRequest(action=UserCommitFilesAction())
         ])
     assert exc_info.value.code() == StatusCode.INVALID_ARGUMENT
+
+
+def test_user_commit_files_null_old_oid(operations_fixture, tmpdir):
+    fixture = operations_fixture
+    commit_files = fixture.user_commit_files
+    ActionType = UserCommitFilesActionHeader.ActionType
+
+    fixture.hg_native = True  # TODO just remove hg-git now
+    fixture.heptapod_permission = 'publish'
+    wrapper = fixture.repo_wrapper
+    with open(wrapper.path / '.hg/hgrc', 'a') as hgrcf:
+        # this is part of the normally included `required.hgrc` of
+        # py-heptapod
+        hgrcf.write('\n'.join((
+            "[experimental]",
+            "topic.publish-bare-branch = yes"
+            ""
+        )))
+
+    gl_topic = b'topic/default/zetop'
+    gl_branch = b'branch/default'
+
+    wrapper.commit_file('foo')  # first commit on `branch/default`
+
+    # now let's start a topic, passing explicitely old_oid indicating
+    # that is does not exist yet
+    two_lines = b"zz\nsecond proto message"
+    resp = commit_files(
+        branch_name=gl_topic,
+        start_branch_name=gl_branch,
+        commit_message=b'New topic',
+        expected_old_oid=ZERO_SHA_STR,
+        actions=(dict(action=ActionType.CREATE,
+                      file_path=b'intop',
+                      content=two_lines,
+                      ),
+                 )
+    )
+    hex1 = resp.branch_update.commit_id.encode()
+
+    wrapper.reload()
+    ctx1 = wrapper.repo[hex1]
+
+    assert ctx1.description() == b'New topic'
+    assert ctx1.branch() == b'default'
+    assert ctx1.topic() == b'zetop'

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/testing/bundle.py

@@ -19,6 +19,14 @@ from mercurial_testhelpers import (
 )
 
 
+def delta_node(delta):  # pragma no cover (coverage_mercurial not ready for v7)
+    """Compatibility wrapper for changes in Mercurial 7.1"""
+    if isinstance(delta, tuple):  # hg<7.1
+        return delta[0]
+    else:  # hg>7.0
+        return delta.node
+
+
 def list_bundle_contents(path):
     """Simple utility to list the contents.
 
@@ -35,5 +43,6 @@ def list_bundle_contents(path):
                 version = part.params.get(b'version', b'01')
                 cg = changegroup.getunbundler(version, part, b'UN')
                 cg.changelogheader()
-                nodes.extend(node_hex(delta[0]) for delta in cg.deltaiter())
+                nodes.extend(node_hex(delta_node(delta))
+                             for delta in cg.deltaiter())
     return dict(nodes=nodes)

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/testing/grpc.py

@@ -1,8 +1,30 @@
+import grpc
+from grpc_health.v1.health_pb2 import (
+    HealthCheckRequest,
+    HealthCheckResponse,
+)
+from grpc_health.v1.health_pb2_grpc import HealthStub
+
 from hgitaly.stub.repository_pb2 import RepositoryExistsRequest
 from hgitaly.stub.shared_pb2 import Repository
 from hgitaly.stub.repository_pb2_grpc import RepositoryServiceStub
 
 
+def wait_health_check(gitaly_channel):
+    health_stub = HealthStub(gitaly_channel)
+    req = HealthCheckRequest()
+    attempts = 0
+    while attempts < 3:
+        try:
+            resp = health_stub.Check(req, timeout=5)
+            assert resp.status == HealthCheckResponse.SERVING
+            break
+        except (AssertionError, grpc.RpcError):  # pragma no cover
+            attempts += 1
+            if attempts >= 3:
+                raise
+
+
 def wait_server_accepts_connection(gitaly_channel, timeout=5):
     """Wait for a server using the Gitaly protocol to accept connections.
 

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly/tests/test_errors.py

@@ -94,7 +94,10 @@ def test_operation_error_treatment():
     context = FakeContext()  # making sure test does not pass by coincidence
     with pytest.raises(RuntimeError):
         with operation_error_treatment(context, PublishChangesetError, logger):
-            raise GitLabPreReceiveError("again protected")
+            # we have to force the message to `str`
+            err = GitLabPreReceiveError("converted by parent to bytes")
+            err.message = 'again protected'
+            raise err
 
     assert context.code() == StatusCode.PERMISSION_DENIED
     trailing = context.trailing_metadata()

{hgitaly-18.3.0a1 → hgitaly-18.3.2/hgitaly.egg-info}/PKG-INFO

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

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/hgitaly.egg-info/SOURCES.txt

@@ -45,7 +45,6 @@ hgitaly.egg-info/dependency_links.txt
 hgitaly.egg-info/entry_points.txt
 hgitaly.egg-info/requires.txt
 hgitaly.egg-info/top_level.txt
-hgitaly/linguist/languages.json
 hgitaly/server/__init__.py
 hgitaly/server/address.py
 hgitaly/server/mono.py

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/tests_with_gitaly/comparison.py

@@ -43,6 +43,7 @@ from hgitaly.gitlab_ref import (
 )
 from hgitaly.servicer import SKIP_HOOKS_MD_KEY
 from hgitaly.stub.shared_pb2 import Repository
+from hgitaly.testing.grpc import wait_health_check
 from hgitaly.testing.storage import (
     DEFAULT_STORAGE_NAME,
     storage_path,
@@ -489,15 +490,21 @@ class RpcHelper(BaseRpcHelper):
         self.chunked_fields_remover = chunked_fields_remover
         self.chunks_concatenator = chunks_concatenator
 
-    def init_stubs(self):
-        comparison, stub_cls = self.comparison, self.stub_cls
+    def channel(self, vcs):
+        if vcs == 'git':
+            return self.comparison.gitaly_channel
 
         if self.hg_server == 'rhgitaly':
-            hg_channel = comparison.rhgitaly_channel
+            return self.comparison.rhgitaly_channel
         else:
-            hg_channel = comparison.hgitaly_channel
-        self.stubs = dict(git=stub_cls(comparison.gitaly_channel),
-                          hg=stub_cls(hg_channel))
+            return self.comparison.hgitaly_channel
+
+    def wait_health_check(self, vcs):
+        wait_health_check(self.channel(vcs))
+
+    def init_stubs(self):
+        self.stubs = {vcs: self.stub_cls(self.channel(vcs))
+                      for vcs in ('hg', 'git')}
 
     def hg2git(self, hg_sha):
         """Convert a Mercurial hex SHA to its counterpart SHA in Git repo.

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/tests_with_gitaly/rhgitaly.py

@@ -42,6 +42,15 @@ class RHGitalyServer:
     @contextmanager
     def running(self):
         env = dict(os.environ)
+        # As side effect of mercurial_testhelpers.ui.make_ui() (part of
+        # RepoWrapper init), HGRCPATH can have been set to the empty string
+        # by previous test modules, but this makes RHGitaly run without
+        # evolve and topic, leading to surprises in the hg processes it
+        # spawns, so we need to prevent that.
+        # TODO try and fix mercurial_testhelpers, it should be possible
+        # for it to set HGRCPATH in `repo.ui.environ` only
+        if env.get('HGRCPATH') == '':
+            del env['HGRCPATH']
         env['GITALY_TESTING_NO_GIT_HOOKS'] = "1"  # will be eventually useful
         timeout = int(env.pop('RHGITALY_STARTUP_TIMEOUT', '30').strip())
 

{hgitaly-18.3.0a1 → hgitaly-18.3.2}/tests_with_gitaly/test_commit.py

@@ -531,6 +531,8 @@ def test_compare_count_find_commits(gitaly_rhgitaly_comparison, hg_server):
         normalizer=normalizer,
         )
     rpc_helper.sorted = False
+    # if with RHGitaly, ensure that the sidecar is ready:
+    rpc_helper.wait_health_check('hg')
 
     @contextmanager
     def sorted_comparison():
@@ -581,6 +583,11 @@ def test_compare_count_find_commits(gitaly_rhgitaly_comparison, hg_server):
                 for r2 in all_revs:
                     assert_compare(revision=r1 + range_str + r2)
 
+    # with message_regex
+    rx = 'FOO.*zoO'  # tests case insensitivity
+    assert_compare(revision=ctx4.hex(), message_regex=rx)
+    assert_compare(all=True, message_regex=rx)
+
     # when `revision` is provided as a ref to a single commit
     refs = [b'', ctx0.hex(), b'topic/default/sampletop', ctx2.hex(),
             b'branch/stable', b'branch/default', b'HEAD']