hgitaly 18.6.0.dev1__tar.gz → 18.7.0__tar.gz

{hgitaly-18.6.0.dev1/hgitaly.egg-info → hgitaly-18.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.6.0.dev1
+Version: 18.7.0
 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.5.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.0.dev1 → hgitaly-18.7.0}/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.0.dev1/tests_with_gitaly → hgitaly-18.7.0/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.0.dev1/tests_with_gitaly → hgitaly-18.7.0/functional_tests}/test_blob_tree.py

@@ -108,9 +108,9 @@ def oid_normalizer(oid2git):
     return normalizer
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_tree_entry_request(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_tree_entry_request(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
 
     wrapper = fixture.hg_repo_wrapper
     wrapper.write_commit('foo', message="Some foo")
@@ -302,10 +302,9 @@ def test_compare_tree_entry_request(gitaly_rhgitaly_comparison, hg_server):
                        )
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_get_tree_entries_pagination(gitaly_rhgitaly_comparison,
-                                             hg_server):
+def test_compare_get_tree_entries_pagination(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
 
     wrapper = fixture.hg_repo_wrapper
     wrapper.write_commit('foo', message="Some foo")

{hgitaly-18.6.0.dev1/tests_with_gitaly → hgitaly-18.7.0/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'],
@@ -407,8 +406,7 @@ def test_compare_list_files(gitaly_comparison):
         rpc_helper.assert_compare(revision=rev)
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_find_commit(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_find_commit(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     wrapper = fixture.hg_repo_wrapper
 
@@ -417,7 +415,7 @@ def test_compare_find_commit(gitaly_rhgitaly_comparison, hg_server):
             normalize_commit_message(response.commit)
 
     rpc_helper = fixture.rpc_helper(
-        hg_server=hg_server,
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='FindCommit',
         request_cls=FindCommitRequest,
@@ -722,7 +720,7 @@ def test_compare_list_commits(gitaly_comparison):
     #
     #   @    4 (branch/default) merge with stable
     #   |\
-    #   | o  3 creates 'animal' (branch/stable)
+    #   | o  3 creates 'animals' (branch/stable)
     #   | |
     #   o |  2 rename 'foo' to 'zoo' (user: testuser)
     #   |/
@@ -763,7 +761,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,6 +811,18 @@ 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
@@ -910,8 +921,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
 
@@ -932,7 +942,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,
@@ -968,9 +978,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
 
@@ -984,7 +992,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.0.dev1/tests_with_gitaly → hgitaly-18.7.0/functional_tests}/test_diff.py

@@ -545,6 +545,11 @@ def test_compare_find_changed_paths(gitaly_comparison):
                           add_remove=True)
     git_sha1 = git_repo.branches()[gl_branch]['sha']
 
+    def hg2git(hg_sha):
+        # TODO duplicated from RpcHelper
+        git_sha = fixture.hg_git.map_git_get(as_bytes(hg_sha))
+        return hg_sha if git_sha is None else git_sha.decode()
+
     diff_stubs = dict(
         git=DiffServiceStub(fixture.gitaly_channel),
         hg=DiffServiceStub(fixture.hgitaly_channel)
@@ -576,6 +581,8 @@ def test_compare_find_changed_paths(gitaly_comparison):
                         path.old_blob_id = oid_to_git[path.old_blob_id]
                     if path.new_blob_id:
                         path.new_blob_id = oid_to_git[path.new_blob_id]
+                    if path.commit_id:
+                        path.commit_id = hg2git(path.commit_id)
         return final
 
     def do_rpc_depr(vcs, commits):

{hgitaly-18.6.0.dev1/tests_with_gitaly → hgitaly-18.7.0/functional_tests}/test_ref.py

@@ -122,6 +122,7 @@ def test_update_references(gitaly_rhgitaly_comparison,
             normalize_commit_message(response.commit)
 
     find_commit_helper = fixture.rpc_helper(
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='FindCommit',
         request_cls=FindCommitRequest,
@@ -490,15 +491,12 @@ def test_find_tag(gitaly_rhgitaly_comparison, hg_server):
 
     def normalize_response(rpc_helper, resp, **kw):
         normalize_commit_message(resp.tag.target_commit)
-        # no tag ids in Mercurial until we can assign a tagging changeset
-        # (requires a long-term core change)
-        resp.tag.id = ''
 
     rpc_helper = fixture.rpc_helper(
         hg_server=hg_server,
         stub_cls=RefServiceStub,
         method_name='FindTag',
-        response_sha_attrs=['tag.target_commit.id'],
+        response_sha_attrs=['tag.target_commit.id', 'tag.id'],
         request_cls=FindTagRequest,
         normalizer=normalize_response,
     )

{hgitaly-18.6.0.dev1/tests_with_gitaly → hgitaly-18.7.0/functional_tests}/test_repository_service.py

@@ -77,8 +77,7 @@ TESTS_DATA_DIR = Path(__file__).parent / 'data'
 TIP_TAG_NAME = b'tip'
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_compare_find_merge_base(gitaly_rhgitaly_comparison, hg_server):
+def test_compare_find_merge_base(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
     gitaly_repo = fixture.gitaly_repo
     git_repo = fixture.git_repo
@@ -112,10 +111,7 @@ def test_compare_find_merge_base(gitaly_rhgitaly_comparison, hg_server):
                                parent=node_mod.nullid).hex()
     git_shas[sha4] = git_repo.branches()[b'branch/other']['sha']
 
-    if hg_server == 'rhgitaly':
-        hgitaly_channel = fixture.rhgitaly_channel
-    else:
-        hgitaly_channel = fixture.hgitaly_channel
+    hgitaly_channel = fixture.rhgitaly_channel
     diff_stubs = dict(
         git=RepositoryServiceStub(fixture.gitaly_channel),
         hg=RepositoryServiceStub(hgitaly_channel),
@@ -365,11 +361,10 @@ def test_repository_size(gitaly_comparison,
                                                 relative_path='/some/path'))
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
 def test_has_local_branches(gitaly_rhgitaly_comparison,
-                            server_repos_root,
-                            hg_server):
+                            server_repos_root):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
     grpc_repo = fixture.gitaly_repo
     rpc_helper = fixture.rpc_helper(
         hg_server=hg_server,
@@ -382,6 +377,11 @@ def test_has_local_branches(gitaly_rhgitaly_comparison,
 
     assert_compare(repository=grpc_repo)
 
+    wrapper = fixture.hg_repo_wrapper
+    wrapper.commit_file('foo')
+    wrapper.command('gitlab-mirror')
+    assert_compare(repository=grpc_repo)
+
     # repo does not exist
     assert_compare_errors(
         same_details=False,
@@ -657,9 +657,9 @@ def test_create_bundle_from_ref_list(
         assert not target_repo_path(vcs, 'broken-bundle').exists()
 
 
-@parametrize('hg_server', ('hgitaly', 'rhgitaly'))
-def test_search_files_by_name(gitaly_rhgitaly_comparison, hg_server):
+def test_search_files_by_name(gitaly_rhgitaly_comparison):
     fixture = gitaly_rhgitaly_comparison
+    hg_server = 'rhgitaly'
 
     wrapper = fixture.hg_repo_wrapper
     ctx0 = wrapper.write_commit('afoo', message="Some foo")
@@ -841,6 +841,7 @@ def test_write_ref(gitaly_rhgitaly_comparison, server_repos_root, hg_server):
             normalize_commit_message(response.commit)
 
     find_commit_helper = fixture.rpc_helper(
+        hg_server='rhgitaly',
         stub_cls=CommitServiceStub,
         method_name='FindCommit',
         request_cls=FindCommitRequest,

{hgitaly-18.6.0.dev1 → hgitaly-18.7.0}/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.0.dev1 → hgitaly-18.7.0}/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.0/hgitaly/VERSION

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

{hgitaly-18.6.0.dev1 → hgitaly-18.7.0}/hgitaly/diff.py

@@ -17,6 +17,7 @@ from mercurial import (
     match as matchmod,
     patch as patchmod,
 )
+from mercurial.node import hex as nodehex
 
 from .file_context import git_perms
 from .git import (
@@ -78,7 +79,9 @@ def changed_paths(repo, from_ctx, to_ctx, base_path,
     if base_path is None:
         matcher = None
         path_trim_at = 0
+        include_commit_id = True
     else:
+        include_commit_id = False
         # scmutil's match is more geared towards the CLI
         # `hg log` etc and its include patterns would
         # force us to convert everything to absolute paths
@@ -101,6 +104,7 @@ def changed_paths(repo, from_ctx, to_ctx, base_path,
     yield from status_changed_paths(from_ctx, to_ctx, status, copy_info,
                                     diff_filters=diff_filters,
                                     find_renames=find_renames,
+                                    include_commit_id=include_commit_id,
                                     trim_at=path_trim_at)
     if filtered_out('copied', diff_filters):
         return
@@ -119,6 +123,7 @@ def filtered_out(status_type, diff_filters):
 
 def status_changed_paths(from_ctx, to_ctx, status, copy_info,
                          diff_filters=(),
+                         include_commit_id=True,
                          find_renames=False, trim_at=0):
     rcopy_info = {v: k for k, v in copy_info.items()}
     """Return ChangedPaths from Mercurial status object"""
@@ -165,6 +170,11 @@ def status_changed_paths(from_ctx, to_ctx, status, copy_info,
                 new_mode = git_perms(to_ctx.filectx(path))
                 new_blob_id = ctx_blob_oid(to_ctx, path)
 
+            if include_commit_id:
+                commit_id = nodehex(to_ctx.node()).decode('ascii')
+            else:
+                commit_id = None
+
             yield ChangedPaths(
                 path=path[trim_at:],
                 old_mode=old_mode,
@@ -172,6 +182,7 @@ def status_changed_paths(from_ctx, to_ctx, status, copy_info,
                 old_blob_id=old_blob_id,
                 new_blob_id=new_blob_id,
                 old_path=old_path,
+                commit_id=commit_id,
                 status=Status_Type_Map[stype]
             )
 

hgitaly-18.7.0/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.0.dev1 → hgitaly-18.7.0}/hgitaly/gitlab_ref.py

@@ -13,7 +13,6 @@ 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
@@ -23,8 +22,6 @@ from hgext3rd.heptapod.branch import (
     get_default_gitlab_branch,
 )
 from hgext3rd.heptapod.tag import gitlab_tags
-from hgext3rd.heptapod import ensure_gitlab_special_refs
-from hgext3rd.heptapod import ensure_gitlab_keep_arounds
 from hgext3rd.heptapod.special_ref import (
     GITLAB_TYPED_REFS_MISSING,
     parse_special_ref,
@@ -40,33 +37,6 @@ from hgext3rd.heptapod.keep_around import (
 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.
 
@@ -135,8 +105,6 @@ def iter_gitlab_special_refs_as_refs(repo, deref=True, patterns=None):
     """
     all_special_refs = special_refs(repo)
     if all_special_refs is GITLAB_TYPED_REFS_MISSING:
-        # transitional while we still have an inner Git repo
-        # would still be the best we can do near the end of HGitaly2 milestone
         all_special_refs = ensure_special_refs(repo)
 
     for sref, sha in all_special_refs.items():
@@ -147,22 +115,18 @@ def iter_gitlab_special_refs_as_refs(repo, deref=True, patterns=None):
 
 
 def ensure_special_refs(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.
+    """Ensure keep around file by creating it if needed
 
     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
+    responsibility is handed to the caller, that 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:
+    if init_empty:
         init_keep_arounds(repo, ())
 
 

{hgitaly-18.6.0.dev1 → hgitaly-18.7.0}/hgitaly/manifest.py

@@ -234,19 +234,6 @@ class ManifestMiner:
                    prefix + b'/'.join(flat_path) if flat_path else dir_path
                    )
 
-    def file_names_by_regexp(self, rx, subdir=b''):
-        manifest = self.changeset.manifest()
-        subdir_prefix = subdir + b'/' if subdir else b''
-
-        for file_path in manifest.iterkeys():
-            if not file_path.startswith(subdir_prefix):
-                continue
-
-            if rx is not None and rx.search(file_path) is None:
-                continue
-
-            yield file_path
-
     def iter_files_with_content(self, exclude_binary=False):
         manifest = self.changeset.manifest()
         repo = self.changeset.repo().unfiltered()