hgitaly 18.0.0a0__tar.gz → 18.0.1__tar.gz

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.0.0a0
+Version: 18.0.1
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -34,9 +34,11 @@ It comes in two overlapping variants:
 - RHGitaly is a high-performance partial implementation written in Rust, and
   based on the [`tonic`](https://crates.io/crates/tonic) gRPC framework.
 
-  As of this writing, RHGitaly implements a strict subset of the methods
-  implemented in HGitaly, but it is possible that some methods would be
-  implemented in RHGitaly only in the future.
+  As of Heptapod 18.0, RHGitaly is able to treat all requests, sometimes by
+  deferring to HGitaly. All clients should be configured to target RHGitaly,
+  but a HGitaly service must still exist, and RHGitaly must be configured
+  with the address of the HGitaly server. We have [plans](hgitaly#235)
+  to make HGitaly become a sidecar of RHGitaly.
 
 ## Installation
 
@@ -101,10 +103,12 @@ We distribute a self-contained source tarball. It includes the appropriate
 
    [Service]
    User=hgitaly
-   # HGRCPATH not needed yet but probably will be at some point
    Environment=HGRCPATH=/etc/heptapod/heptapod.hgrc
    Environment=RHGITALY_LISTEN_URL=unix:/run/heptapod/rhgitaly.socket
    Environment=RHGITALY_REPOSITORIES_ROOT=/home/hg/repositories
+   Environment=RHGITALY_HG_EXECUTABLE=/usr/local/bin/hg
+   Environment=RHGITALY_SIDECAR_ADDRESS=http://127.0.0.1:9237
+   Environment=RHGITALY_CONFIG_DIRECTORY=/home/hg/repositories/+hgitaly
    ExecStartPre=rm -f /run/heptapod/rhgitaly.socket
    ExecStart=/user/local/bin/rhgitaly
    Restart=on-failure
@@ -123,9 +127,14 @@ each executable can be configured.
 
 #### Tokei
 
+As of Heptapod 18.0, the `tokei` executable is no longer necessary, as
+RHGitaly provides a direct implementation, using `tokei` as a library (hence
+an internal dependency, resolved at compilation).
+
 [Tokei](https://crates.io/crates/tokei) is a programming languages analysis
 tool written in Rust. It is used by the [CommitLanguages](protos/commit.proto)
-method.
+method of HGitaly (python), which should now be in use only in Comparison
+Tests.
 
 Tokei is available in several Linux distributions.
 
@@ -145,12 +154,20 @@ This is for example the case of [GetPatchID](protos/diff.proto): the
 `git patch-id` command does not access any repository. Instead it computes any
 patch into an identifier.
 
+RHGitaly spawns Git subprocesses for operations on the auxiliary Git repository
+used for mirroring to Git. For instance, this is how the `git push` part of
+the mirroring is implemented.
+
+The path to the `git` executable can be configured with the
+`RHGITALY_GIT_EXECUTABLE` enviroment variable (defaulting to just `git`).
+
 #### Mercurial
 
-In forthcoming versions, it is probable that HGitaly and/or RHGitaly will
-invoke Mercurial subprocesses.
+RHGitaly can invoke Mercurial subprocesses for various operations that
+are better accomodated this way.
 
-This is not yet the case as of this writing (HGitaly 1.1 / Heptapod 1.1).
+The Mercurial executable is configured by the mandatory
+`RHGITALY_HG_EXECUTABLE` environment variable.
 
 ### Configuration
 
@@ -421,6 +438,38 @@ The virtualenv has to be activated
 
 5. perform necessary `hg add` after close inspection of `hg status`
 
+### Feature flags
+
+GitLab uses special feature flags to control Gitaly. They are transmitted
+to the Gitaly server by means of invocation metadata (part of the gRPC
+protocol, actually implemented as HTTP/2 headers).
+This is documented in Gitaly's `doc/` subdirectory.
+
+Gitaly feature flags have become important in HGitaly development since
+every request now goes to RHGitaly first. We used before that to introduce
+ordinary feature flags in GitLab Rails to control which requests would go
+to HGitaly (Python) and which would go to RHGitaly. This was instrumental
+in the progressive reimplementation in Rust of many gRPC methods, and has
+obviously to be replaced by the use of Gitaly feature flags.
+
+GitLab's development workflow is heavily centered around "chatops", they make
+it a rule that feature flags should start as being disabled by default, then
+gradually rolled out by percentage chatops commands. On the other hand,
+Heptapod often feature flag to provide an opt-out option, with many starting
+as enabled by default.
+
+An important property of Gitaly feature flags is that nothing is passed at
+all if the feature flag has not been set in the Rails application. In other
+words, the default value is implemented by the Gitaly server and meaningless
+in the Rails app.
+
+As a consequence, creating a Gitaly feature flag defaulting to `true` does
+nothing unless (R)HGitaly itself interprets the absence of the value as `true`.
+
+TL;DR: for opt-out by a feature flag seen as `gitaly_my_feature` by Rails,
+just use `rhgitaly::metadata::is_feature_enabled?("my-feature", true)` in the RHGitaly
+code.
+
 ### Updating the HGitaly specific gRPC protocol
 
 This package defines and implements an additional gRPC protocol, with

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/README.md

@@ -12,9 +12,11 @@ It comes in two overlapping variants:
 - RHGitaly is a high-performance partial implementation written in Rust, and
   based on the [`tonic`](https://crates.io/crates/tonic) gRPC framework.
 
-  As of this writing, RHGitaly implements a strict subset of the methods
-  implemented in HGitaly, but it is possible that some methods would be
-  implemented in RHGitaly only in the future.
+  As of Heptapod 18.0, RHGitaly is able to treat all requests, sometimes by
+  deferring to HGitaly. All clients should be configured to target RHGitaly,
+  but a HGitaly service must still exist, and RHGitaly must be configured
+  with the address of the HGitaly server. We have [plans](hgitaly#235)
+  to make HGitaly become a sidecar of RHGitaly.
 
 ## Installation
 
@@ -79,10 +81,12 @@ We distribute a self-contained source tarball. It includes the appropriate
 
    [Service]
    User=hgitaly
-   # HGRCPATH not needed yet but probably will be at some point
    Environment=HGRCPATH=/etc/heptapod/heptapod.hgrc
    Environment=RHGITALY_LISTEN_URL=unix:/run/heptapod/rhgitaly.socket
    Environment=RHGITALY_REPOSITORIES_ROOT=/home/hg/repositories
+   Environment=RHGITALY_HG_EXECUTABLE=/usr/local/bin/hg
+   Environment=RHGITALY_SIDECAR_ADDRESS=http://127.0.0.1:9237
+   Environment=RHGITALY_CONFIG_DIRECTORY=/home/hg/repositories/+hgitaly
    ExecStartPre=rm -f /run/heptapod/rhgitaly.socket
    ExecStart=/user/local/bin/rhgitaly
    Restart=on-failure
@@ -101,9 +105,14 @@ each executable can be configured.
 
 #### Tokei
 
+As of Heptapod 18.0, the `tokei` executable is no longer necessary, as
+RHGitaly provides a direct implementation, using `tokei` as a library (hence
+an internal dependency, resolved at compilation).
+
 [Tokei](https://crates.io/crates/tokei) is a programming languages analysis
 tool written in Rust. It is used by the [CommitLanguages](protos/commit.proto)
-method.
+method of HGitaly (python), which should now be in use only in Comparison
+Tests.
 
 Tokei is available in several Linux distributions.
 
@@ -123,12 +132,20 @@ This is for example the case of [GetPatchID](protos/diff.proto): the
 `git patch-id` command does not access any repository. Instead it computes any
 patch into an identifier.
 
+RHGitaly spawns Git subprocesses for operations on the auxiliary Git repository
+used for mirroring to Git. For instance, this is how the `git push` part of
+the mirroring is implemented.
+
+The path to the `git` executable can be configured with the
+`RHGITALY_GIT_EXECUTABLE` enviroment variable (defaulting to just `git`).
+
 #### Mercurial
 
-In forthcoming versions, it is probable that HGitaly and/or RHGitaly will
-invoke Mercurial subprocesses.
+RHGitaly can invoke Mercurial subprocesses for various operations that
+are better accomodated this way.
 
-This is not yet the case as of this writing (HGitaly 1.1 / Heptapod 1.1).
+The Mercurial executable is configured by the mandatory
+`RHGITALY_HG_EXECUTABLE` environment variable.
 
 ### Configuration
 
@@ -399,6 +416,38 @@ The virtualenv has to be activated
 
 5. perform necessary `hg add` after close inspection of `hg status`
 
+### Feature flags
+
+GitLab uses special feature flags to control Gitaly. They are transmitted
+to the Gitaly server by means of invocation metadata (part of the gRPC
+protocol, actually implemented as HTTP/2 headers).
+This is documented in Gitaly's `doc/` subdirectory.
+
+Gitaly feature flags have become important in HGitaly development since
+every request now goes to RHGitaly first. We used before that to introduce
+ordinary feature flags in GitLab Rails to control which requests would go
+to HGitaly (Python) and which would go to RHGitaly. This was instrumental
+in the progressive reimplementation in Rust of many gRPC methods, and has
+obviously to be replaced by the use of Gitaly feature flags.
+
+GitLab's development workflow is heavily centered around "chatops", they make
+it a rule that feature flags should start as being disabled by default, then
+gradually rolled out by percentage chatops commands. On the other hand,
+Heptapod often feature flag to provide an opt-out option, with many starting
+as enabled by default.
+
+An important property of Gitaly feature flags is that nothing is passed at
+all if the feature flag has not been set in the Rails application. In other
+words, the default value is implemented by the Gitaly server and meaningless
+in the Rails app.
+
+As a consequence, creating a Gitaly feature flag defaulting to `true` does
+nothing unless (R)HGitaly itself interprets the absence of the value as `true`.
+
+TL;DR: for opt-out by a feature flag seen as `gitaly_my_feature` by Rails,
+just use `rhgitaly::metadata::is_feature_enabled?("my-feature", true)` in the RHGitaly
+code.
+
 ### Updating the HGitaly specific gRPC protocol
 
 This package defines and implements an additional gRPC protocol, with

hgitaly-18.0.1/hgitaly/VERSION

@@ -0,0 +1 @@
+18.0.1

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/license_detector/__init__.py

@@ -54,7 +54,7 @@ COMMON_LICENSE_FILES = ('LICENSE', 'COPYING')
 def license_content(name):
     """Return the full test content of one of the licenses we ship.
 
-    Intendend for gRPC tests and Gitaly comparison tests.
+    Intended for gRPC tests and Gitaly comparison tests.
     """
     return (DATA_DIR / (name + '.sample')).read_text()
 

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/scripts.py

@@ -159,6 +159,7 @@ def stats():  # pragma no cover
                                               'timing:median',
                                               'timing:worst_decile',
                                               'timing:worst_centile',
+                                              'timing:total',
                                               ),
                         default='calls')
 
@@ -210,6 +211,7 @@ def stats():  # pragma no cover
             timing = req_stats['completion_stats_ms'] = dict(
                 mean=statistics.mean(succ),
                 median=statistics.median(succ),
+                total=sum(s for s in succ),
             )
             if nb_succ > 1:
                 timing['standard_deviation'] = statistics.pstdev(succ)

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/service/commit.py

@@ -903,6 +903,8 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             context.abort(StatusCode.INTERNAL,
                           "Revision %r could not be resolved" % exc.args[0])
 
+        walk = not request.disable_walk
+
         if positive is VISIBLE_CHANGESETS:
             # do not switch to unfiltered view!
             if negative:
@@ -916,8 +918,10 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             repo = repo.unfiltered()
             if negative:
                 revset = b'only(%ls, %ls)'
-            else:
+            elif walk:
                 revset = b'::%ls'
+            else:
+                revset = b'%ls'
 
         msg_patterns = request.commit_message_patterns
         ignore_case = request.ignore_case
@@ -930,6 +934,21 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
             else:
                 revset += b' and ' + greps[0]
 
+        after = request.after.ToSeconds()
+        before = request.before.ToSeconds()
+        date = getdate(after, before)
+        if date is not None:
+            revset += b" and date('%s')" % date.encode('ascii')
+
+        author = request.author
+        if author:
+            revset += b" and user(r're:%s')" % author
+
+        # no octopuses in Mercurial, hence max_parents > 1 does not filter
+        # anything
+        if request.max_parents == 1:
+            revset += b" and not merge()"
+
         Order = ListCommitsRequest.Order
         reverse = request.reverse
 

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/service/repository.py

@@ -501,13 +501,20 @@ class RepositoryServicer(RepositoryServiceServicer, HGitalyServicer):
                 match_data.seek(0)
 
     def set_custom_hooks(self, request, context):
-        def load_repo(req, context):
-            return self.load_repo(req.repository, context)
+        logger = LoggerAdapter(base_logger, context)
 
         with streaming_request_tempfile_extract(
                 request, context,
-                first_request_handler=load_repo
-        ) as (repo, tmpf):
+                first_request_handler=lambda req, _context: req.repository
+        ) as (grpc_repo, tmpf):
+            if self.is_repo_aux_git(grpc_repo):
+                logger.warning(
+                    "Heptapod does not currently use custom hooks "
+                    "on auxiliary Git repositories. Nothing to do"
+                )
+                return
+
+            repo = self.load_repo(grpc_repo, context)
             tmpf.flush()
             try:
                 restore_additional(repo.ui, repo,

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/service/tests/test_commit.py

@@ -1337,7 +1337,7 @@ def test_list_commits(commit_fixture_empty_repo):
     wrapper.update(ctx0.rev())
     wrapper.command(b'mv', wrapper.repo.root + b'/foo',
                     wrapper.repo.root + b'/zoo')
-    ts = int(time.time())
+    ts = int(time.time() - 50)
     sha2 = wrapper.commit([b'foo', b'zoo'],
                           message=b"rename foo to zoo",
                           utc_timestamp=ts - 10,).hex()
@@ -1346,7 +1346,9 @@ def test_list_commits(commit_fixture_empty_repo):
                                user='testuser <testuser@heptapod.test')
     sha3 = ctx3.hex()
     wrapper.update(2)
-    ctx4 = wrapper.merge_commit(ctx3, message=b'merge with stable')
+    ctx4 = wrapper.merge_commit(ctx3, message=b'merge with stable',
+                                utc_timestamp=ts+20)
+
     sha4 = ctx4.hex()
 
     def caret(ctx):
@@ -1365,11 +1367,15 @@ def test_list_commits(commit_fixture_empty_repo):
     # orderings
     Order = ListCommitsRequest.Order
     assert list_commits(sha4, order=Order.TOPO) == [sha4, sha3, sha2, sha0]
-    assert list_commits(sha4, order=Order.DATE) == [sha2, sha0, sha4, sha3]
+    # having no explicit date, ctx0 looks to be the most recent one.
+    assert list_commits(sha4, order=Order.DATE) == [sha2, sha3, sha4, sha0]
 
     # no result
     assert list_commits(sha4, caret(ctx4)) == []
 
+    # disable walk
+    assert list_commits(sha4, disable_walk=True) == [sha4]
+
     # message patterns
     assert list_commits(sha4, commit_message_patterns=[b'foo']) == [sha2]
     assert set(
@@ -1379,6 +1385,26 @@ def test_list_commits(commit_fixture_empty_repo):
                         commit_message_patterns=[b'FOO'],
                         ignore_case=True) == [sha2]
 
+    # max_parents
+    assert list_commits(sha4, max_parents=2) == list_commits(sha4)
+    assert list_commits(sha4, max_parents=3) == list_commits(sha4)
+    assert list_commits(sha4, max_parents=1) == [sha3, sha2, sha0]
+
+    # dates
+    date, date2 = Timestamp(), Timestamp()
+    date.FromSeconds(ts+10)
+    assert list_commits(sha4, before=date) == [sha3, sha2]
+    assert list_commits(sha4, after=date) == [sha4, sha3, sha0]
+    # gracinet: given that before is < and after is > I didn't expect
+    # after=before to return anything, but `hg help dates` says that
+    # the `to` range specifier is inclusive.
+    assert list_commits(sha4, after=date, before=date) == [sha3]
+    date2.FromSeconds(ts+40)
+    assert list_commits(sha4, after=date, before=date2) == [sha4, sha3]
+
+    # author regexp
+    assert list_commits(sha4, author=b't.stuser') == [sha3]
+
     # unknown revision, including special cases:
     for unknown in ('branch/unknown',
                     'f' * 39,  # wdir node id, prefix

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/service/tests/test_repository_service.py

@@ -38,6 +38,7 @@ from hgitaly.revision import ZERO_SHA
 from hgitaly.stream import WRITE_BUFFER_SIZE
 from hgitaly.testing import TEST_DATA_DIR
 from hgitaly.testing.bundle import list_bundle_contents
+from hgitaly.testing.storage import GIT_REPOS_STOWED_AWAY_PATH
 from hgitaly.workdir import (
     ROSTER_FILE_NAME as WDS_ROSTER_FILE_NAME,
     working_directory,
@@ -349,6 +350,19 @@ def test_repository_exists(fixture_with_repo):
     assert exc_info.value.code() == INVALID_ARGUMENT
 
 
+def test_vcs_qualified_storage(fixture_with_repo):
+    fixture = fixture_with_repo
+
+    fixture.grpc_repo.storage_name = 'hg:default'
+    assert fixture.exists()
+
+    fixture.grpc_repo.storage_name = 'rhg:default'
+    assert fixture.exists()
+
+    fixture.grpc_repo.relative_path = 'no/such/path'
+    assert not fixture.exists()
+
+
 def test_repository_size(fixture_with_repo):
     fixture = fixture_with_repo
     size = fixture.size()
@@ -854,6 +868,14 @@ def test_set_custom_hooks(fixture_with_repo, tmpdir, rpc_name):
         meth(invalid_tarball_path)
     assert exc_info.value.code() == INTERNAL
 
+    # case of Aux Git repository (nothing to be done, no error even if
+    # repository does not exist)
+    meth(tarball_path,
+         Repository(
+             storage_name=fixture.grpc_repo.storage_name,
+             relative_path=str(GIT_REPOS_STOWED_AWAY_PATH / 'some.git'),
+         ))
+
 
 @parametrize('rpc_name', ['backup', 'get'])
 def test_backup_custom_hooks(fixture_with_repo, tmpdir, rpc_name):

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/servicer.py

@@ -32,6 +32,7 @@ from .stub.shared_pb2 import (
 
 GARBAGE_COLLECTING_RATE_GEN2 = 250
 GARBAGE_COLLECTING_RATE_GEN1 = 20
+AUX_GIT_REPOS_RELATIVE_DIR = "+hgitaly/hg-git"
 HG_GIT_MIRRORING_MD_KEY = 'x-heptapod-hg-git-mirroring'
 NATIVE_PROJECT_MD_KEY = 'x-heptapod-hg-native'
 # TODO check if there is a GitLab MD for this, it should:
@@ -129,6 +130,11 @@ class HGitalyServicer:
         #   (typically ignoring some settings that can be critical to
         #   operation)
 
+    def is_repo_aux_git(self, repository: Repository):
+        if repository is None:
+            return False
+        return repository.relative_path.startswith(AUX_GIT_REPOS_RELATIVE_DIR)
+
     def load_repo(self, repository: Repository, context,
                   for_mutation_by=None,
                   ):
@@ -288,7 +294,7 @@ class HGitalyServicer:
             # in request, without having the request object itself
             raise ValueError('repository not set')
 
-        root_dir = self.storages.get(storage_name)
+        root_dir = self.storages.get(storage_name.rsplit(':', 1)[-1])
         if root_dir is None:
             raise KeyError('storage', storage_name)
         return root_dir

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/stub/diff_pb2.py

@@ -16,7 +16,7 @@ from . import lint_pb2 as lint__pb2
 from . import shared_pb2 as shared__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\ndiff.proto\x12\x06gitaly\x1a\nlint.proto\x1a\x0cshared.proto\"\xd8\x06\n\x11\x43ommitDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\x12\r\n\x05paths\x18\x05 \x03(\x0c\x12\x16\n\x0e\x63ollapse_diffs\x18\x06 \x01(\x08\x12\x16\n\x0e\x65nforce_limits\x18\x07 \x01(\x08\x12\x11\n\tmax_files\x18\x08 \x01(\x05\x12\x11\n\tmax_lines\x18\t \x01(\x05\x12\x11\n\tmax_bytes\x18\n \x01(\x05\x12\x17\n\x0fmax_patch_bytes\x18\x0e \x01(\x05\x12\x16\n\x0esafe_max_files\x18\x0b \x01(\x05\x12\x16\n\x0esafe_max_lines\x18\x0c \x01(\x05\x12\x16\n\x0esafe_max_bytes\x18\r \x01(\x05\x12\x35\n\tdiff_mode\x18\x0f \x01(\x0e\x32\".gitaly.CommitDiffRequest.DiffMode\x12h\n\"max_patch_bytes_for_file_extension\x18\x10 \x03(\x0b\x32<.gitaly.CommitDiffRequest.MaxPatchBytesForFileExtensionEntry\x12G\n\x12whitespace_changes\x18\x11 \x01(\x0e\x32+.gitaly.CommitDiffRequest.WhitespaceChanges\x12\x19\n\x11\x63ollect_all_paths\x18\x12 \x01(\x08\x1a\x44\n\"MaxPatchBytesForFileExtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"%\n\x08\x44iffMode\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0c\n\x08WORDDIFF\x10\x01\"y\n\x11WhitespaceChanges\x12\"\n\x1eWHITESPACE_CHANGES_UNSPECIFIED\x10\x00\x12\x1d\n\x19WHITESPACE_CHANGES_IGNORE\x10\x01\x12!\n\x1dWHITESPACE_CHANGES_IGNORE_ALL\x10\x02J\x04\x08\x04\x10\x05R\x18ignore_whitespace_change\"\xff\x01\n\x12\x43ommitDiffResponse\x12\x11\n\tfrom_path\x18\x01 \x01(\x0c\x12\x0f\n\x07to_path\x18\x02 \x01(\x0c\x12\x0f\n\x07\x66rom_id\x18\x03 \x01(\t\x12\r\n\x05to_id\x18\x04 \x01(\t\x12\x10\n\x08old_mode\x18\x05 \x01(\x05\x12\x10\n\x08new_mode\x18\x06 \x01(\x05\x12\x0e\n\x06\x62inary\x18\x07 \x01(\x08\x12\x16\n\x0eraw_patch_data\x18\t \x01(\x0c\x12\x14\n\x0c\x65nd_of_patch\x18\n \x01(\x08\x12\x17\n\x0foverflow_marker\x18\x0b \x01(\x08\x12\x11\n\tcollapsed\x18\x0c \x01(\x08\x12\x11\n\ttoo_large\x18\r \x01(\x08J\x04\x08\x08\x10\t\"\x82\x01\n\x12\x43ommitDeltaRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\x12\r\n\x05paths\x18\x04 \x03(\x0c\"u\n\x0b\x43ommitDelta\x12\x11\n\tfrom_path\x18\x01 \x01(\x0c\x12\x0f\n\x07to_path\x18\x02 \x01(\x0c\x12\x0f\n\x07\x66rom_id\x18\x03 \x01(\t\x12\r\n\x05to_id\x18\x04 \x01(\t\x12\x10\n\x08old_mode\x18\x05 \x01(\x05\x12\x10\n\x08new_mode\x18\x06 \x01(\x05\":\n\x13\x43ommitDeltaResponse\x12#\n\x06\x64\x65ltas\x18\x01 \x03(\x0b\x32\x13.gitaly.CommitDelta\"o\n\x0eRawDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\"\x1f\n\x0fRawDiffResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"p\n\x0fRawPatchRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\" \n\x10RawPatchResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"q\n\x10\x44iffStatsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\"Q\n\tDiffStats\x12\x0c\n\x04path\x18\x01 \x01(\x0c\x12\x11\n\tadditions\x18\x02 \x01(\x05\x12\x11\n\tdeletions\x18\x03 \x01(\x05\x12\x10\n\x08old_path\x18\x04 \x01(\x0c\"5\n\x11\x44iffStatsResponse\x12 \n\x05stats\x18\x01 \x03(\x0b\x32\x11.gitaly.DiffStats\"\xda\x05\n\x17\x46indChangedPathsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x13\n\x07\x63ommits\x18\x02 \x03(\tB\x02\x18\x01\x12\x39\n\x08requests\x18\x03 \x03(\x0b\x32\'.gitaly.FindChangedPathsRequest.Request\x12S\n\x16merge_commit_diff_mode\x18\x04 \x01(\x0e\x32\x33.gitaly.FindChangedPathsRequest.MergeCommitDiffMode\x12\x14\n\x0c\x66ind_renames\x18\x05 \x01(\x08\x1a\xc2\x02\n\x07Request\x12K\n\x0ctree_request\x18\x01 \x01(\x0b\x32\x33.gitaly.FindChangedPathsRequest.Request.TreeRequestH\x00\x12O\n\x0e\x63ommit_request\x18\x02 \x01(\x0b\x32\x35.gitaly.FindChangedPathsRequest.Request.CommitRequestH\x00\x1a\x46\n\x0bTreeRequest\x12\x1a\n\x12left_tree_revision\x18\x01 \x01(\t\x12\x1b\n\x13right_tree_revision\x18\x02 \x01(\t\x1aI\n\rCommitRequest\x12\x17\n\x0f\x63ommit_revision\x18\x01 \x01(\t\x12\x1f\n\x17parent_commit_revisions\x18\x02 \x03(\tB\x06\n\x04type\"\x90\x01\n\x13MergeCommitDiffMode\x12&\n\"MERGE_COMMIT_DIFF_MODE_UNSPECIFIED\x10\x00\x12)\n%MERGE_COMMIT_DIFF_MODE_INCLUDE_MERGES\x10\x01\x12&\n\"MERGE_COMMIT_DIFF_MODE_ALL_PARENTS\x10\x02\"?\n\x18\x46indChangedPathsResponse\x12#\n\x05paths\x18\x01 \x03(\x0b\x32\x14.gitaly.ChangedPaths\"\x83\x02\n\x0c\x43hangedPaths\x12\x0c\n\x04path\x18\x01 \x01(\x0c\x12+\n\x06status\x18\x02 \x01(\x0e\x32\x1b.gitaly.ChangedPaths.Status\x12\x10\n\x08old_mode\x18\x03 \x01(\x05\x12\x10\n\x08new_mode\x18\x04 \x01(\x05\x12\x13\n\x0bold_blob_id\x18\x05 \x01(\t\x12\x13\n\x0bnew_blob_id\x18\x06 \x01(\t\x12\x10\n\x08old_path\x18\x07 \x01(\x0c\"X\n\x06Status\x12\t\n\x05\x41\x44\x44\x45\x44\x10\x00\x12\x0c\n\x08MODIFIED\x10\x01\x12\x0b\n\x07\x44\x45LETED\x10\x02\x12\x0f\n\x0bTYPE_CHANGE\x10\x03\x12\n\n\x06\x43OPIED\x10\x04\x12\x0b\n\x07RENAMED\x10\x05\"m\n\x11GetPatchIDRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x14\n\x0cold_revision\x18\x02 \x01(\x0c\x12\x14\n\x0cnew_revision\x18\x03 \x01(\x0c\"&\n\x12GetPatchIDResponse\x12\x10\n\x08patch_id\x18\x01 \x01(\t\"+\n\tRangePair\x12\x0e\n\x06range1\x18\x01 \x01(\t\x12\x0e\n\x06range2\x18\x02 \x01(\t\"+\n\rRevisionRange\x12\x0c\n\x04rev1\x18\x01 \x01(\t\x12\x0c\n\x04rev2\x18\x02 \x01(\t\"=\n\x11\x42\x61seWithRevisions\x12\x0c\n\x04\x62\x61se\x18\x01 \x01(\t\x12\x0c\n\x04rev1\x18\x02 \x01(\t\x12\x0c\n\x04rev2\x18\x03 \x01(\t\"\xe5\x01\n\x13RawRangeDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\'\n\nrange_pair\x18\x02 \x01(\x0b\x32\x11.gitaly.RangePairH\x00\x12/\n\x0erevision_range\x18\x03 \x01(\x0b\x32\x15.gitaly.RevisionRangeH\x00\x12\x38\n\x13\x62\x61se_with_revisions\x18\x04 \x01(\x0b\x32\x19.gitaly.BaseWithRevisionsH\x00\x42\x0c\n\nrange_spec\"$\n\x14RawRangeDiffResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"\xe2\x01\n\x10RangeDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\'\n\nrange_pair\x18\x02 \x01(\x0b\x32\x11.gitaly.RangePairH\x00\x12/\n\x0erevision_range\x18\x03 \x01(\x0b\x32\x15.gitaly.RevisionRangeH\x00\x12\x38\n\x13\x62\x61se_with_revisions\x18\x04 \x01(\x0b\x32\x19.gitaly.BaseWithRevisionsH\x00\x42\x0c\n\nrange_spec\"\xc4\x02\n\x11RangeDiffResponse\x12\x16\n\x0e\x66rom_commit_id\x18\x01 \x01(\t\x12\x14\n\x0cto_commit_id\x18\x02 \x01(\t\x12\x38\n\ncomparison\x18\x03 \x01(\x0e\x32$.gitaly.RangeDiffResponse.Comparator\x12\x1c\n\x14\x63ommit_message_title\x18\x07 \x01(\t\x12\x12\n\npatch_data\x18\x08 \x01(\x0c\x12\x14\n\x0c\x65nd_of_patch\x18\t \x01(\x08\"\x7f\n\nComparator\x12 \n\x1c\x43OMPARATOR_EQUAL_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x43OMPARATOR_GREATER_THAN\x10\x01\x12\x18\n\x14\x43OMPARATOR_LESS_THAN\x10\x02\x12\x18\n\x14\x43OMPARATOR_NOT_EQUAL\x10\x03\"\xf9\x03\n\x10\x44iffBlobsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x35\n\nblob_pairs\x18\x02 \x03(\x0b\x32!.gitaly.DiffBlobsRequest.BlobPair\x12\x34\n\tdiff_mode\x18\x03 \x01(\x0e\x32!.gitaly.DiffBlobsRequest.DiffMode\x12\x46\n\x12whitespace_changes\x18\x04 \x01(\x0e\x32*.gitaly.DiffBlobsRequest.WhitespaceChanges\x12\x19\n\x11patch_bytes_limit\x18\x05 \x01(\x05\x1a\x31\n\x08\x42lobPair\x12\x11\n\tleft_blob\x18\x01 \x01(\x0c\x12\x12\n\nright_blob\x18\x02 \x01(\x0c\"9\n\x08\x44iffMode\x12\x19\n\x15\x44IFF_MODE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x44IFF_MODE_WORD\x10\x01\"y\n\x11WhitespaceChanges\x12\"\n\x1eWHITESPACE_CHANGES_UNSPECIFIED\x10\x00\x12\x1d\n\x19WHITESPACE_CHANGES_IGNORE\x10\x01\x12!\n\x1dWHITESPACE_CHANGES_IGNORE_ALL\x10\x02\"\xff\x01\n\x11\x44iffBlobsResponse\x12\x14\n\x0cleft_blob_id\x18\x01 \x01(\t\x12\x15\n\rright_blob_id\x18\x02 \x01(\t\x12\r\n\x05patch\x18\x03 \x01(\x0c\x12\x30\n\x06status\x18\x04 \x01(\x0e\x32 .gitaly.DiffBlobsResponse.Status\x12\x0e\n\x06\x62inary\x18\x05 \x01(\x08\x12\x1e\n\x16over_patch_bytes_limit\x18\x06 \x01(\x08\x12\x12\n\npatch_size\x18\x07 \x01(\x05\"8\n\x06Status\x12\x15\n\x11STATUS_INCOMPLETE\x10\x00\x12\x17\n\x13STATUS_END_OF_PATCH\x10\x01\x32\xa4\x06\n\x0b\x44iffService\x12M\n\nCommitDiff\x12\x19.gitaly.CommitDiffRequest\x1a\x1a.gitaly.CommitDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12P\n\x0b\x43ommitDelta\x12\x1a.gitaly.CommitDeltaRequest\x1a\x1b.gitaly.CommitDeltaResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12\x44\n\x07RawDiff\x12\x16.gitaly.RawDiffRequest\x1a\x17.gitaly.RawDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12G\n\x08RawPatch\x12\x17.gitaly.RawPatchRequest\x1a\x18.gitaly.RawPatchResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12J\n\tDiffStats\x12\x18.gitaly.DiffStatsRequest\x1a\x19.gitaly.DiffStatsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12_\n\x10\x46indChangedPaths\x12\x1f.gitaly.FindChangedPathsRequest\x1a .gitaly.FindChangedPathsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12K\n\nGetPatchID\x12\x19.gitaly.GetPatchIDRequest\x1a\x1a.gitaly.GetPatchIDResponse\"\x06\xfa\x97(\x02\x08\x02\x12S\n\x0cRawRangeDiff\x12\x1b.gitaly.RawRangeDiffRequest\x1a\x1c.gitaly.RawRangeDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12J\n\tRangeDiff\x12\x18.gitaly.RangeDiffRequest\x1a\x19.gitaly.RangeDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12J\n\tDiffBlobs\x12\x18.gitaly.DiffBlobsRequest\x1a\x19.gitaly.DiffBlobsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\ndiff.proto\x12\x06gitaly\x1a\nlint.proto\x1a\x0cshared.proto\"\xd8\x06\n\x11\x43ommitDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\x12\r\n\x05paths\x18\x05 \x03(\x0c\x12\x16\n\x0e\x63ollapse_diffs\x18\x06 \x01(\x08\x12\x16\n\x0e\x65nforce_limits\x18\x07 \x01(\x08\x12\x11\n\tmax_files\x18\x08 \x01(\x05\x12\x11\n\tmax_lines\x18\t \x01(\x05\x12\x11\n\tmax_bytes\x18\n \x01(\x05\x12\x17\n\x0fmax_patch_bytes\x18\x0e \x01(\x05\x12\x16\n\x0esafe_max_files\x18\x0b \x01(\x05\x12\x16\n\x0esafe_max_lines\x18\x0c \x01(\x05\x12\x16\n\x0esafe_max_bytes\x18\r \x01(\x05\x12\x35\n\tdiff_mode\x18\x0f \x01(\x0e\x32\".gitaly.CommitDiffRequest.DiffMode\x12h\n\"max_patch_bytes_for_file_extension\x18\x10 \x03(\x0b\x32<.gitaly.CommitDiffRequest.MaxPatchBytesForFileExtensionEntry\x12G\n\x12whitespace_changes\x18\x11 \x01(\x0e\x32+.gitaly.CommitDiffRequest.WhitespaceChanges\x12\x19\n\x11\x63ollect_all_paths\x18\x12 \x01(\x08\x1a\x44\n\"MaxPatchBytesForFileExtensionEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x05:\x02\x38\x01\"%\n\x08\x44iffMode\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0c\n\x08WORDDIFF\x10\x01\"y\n\x11WhitespaceChanges\x12\"\n\x1eWHITESPACE_CHANGES_UNSPECIFIED\x10\x00\x12\x1d\n\x19WHITESPACE_CHANGES_IGNORE\x10\x01\x12!\n\x1dWHITESPACE_CHANGES_IGNORE_ALL\x10\x02J\x04\x08\x04\x10\x05R\x18ignore_whitespace_change\"\xff\x01\n\x12\x43ommitDiffResponse\x12\x11\n\tfrom_path\x18\x01 \x01(\x0c\x12\x0f\n\x07to_path\x18\x02 \x01(\x0c\x12\x0f\n\x07\x66rom_id\x18\x03 \x01(\t\x12\r\n\x05to_id\x18\x04 \x01(\t\x12\x10\n\x08old_mode\x18\x05 \x01(\x05\x12\x10\n\x08new_mode\x18\x06 \x01(\x05\x12\x0e\n\x06\x62inary\x18\x07 \x01(\x08\x12\x16\n\x0eraw_patch_data\x18\t \x01(\x0c\x12\x14\n\x0c\x65nd_of_patch\x18\n \x01(\x08\x12\x17\n\x0foverflow_marker\x18\x0b \x01(\x08\x12\x11\n\tcollapsed\x18\x0c \x01(\x08\x12\x11\n\ttoo_large\x18\r \x01(\x08J\x04\x08\x08\x10\t\"\x82\x01\n\x12\x43ommitDeltaRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\x12\r\n\x05paths\x18\x04 \x03(\x0c\"u\n\x0b\x43ommitDelta\x12\x11\n\tfrom_path\x18\x01 \x01(\x0c\x12\x0f\n\x07to_path\x18\x02 \x01(\x0c\x12\x0f\n\x07\x66rom_id\x18\x03 \x01(\t\x12\r\n\x05to_id\x18\x04 \x01(\t\x12\x10\n\x08old_mode\x18\x05 \x01(\x05\x12\x10\n\x08new_mode\x18\x06 \x01(\x05\":\n\x13\x43ommitDeltaResponse\x12#\n\x06\x64\x65ltas\x18\x01 \x03(\x0b\x32\x13.gitaly.CommitDelta\"o\n\x0eRawDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\"\x1f\n\x0fRawDiffResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"p\n\x0fRawPatchRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\" \n\x10RawPatchResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"q\n\x10\x44iffStatsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eleft_commit_id\x18\x02 \x01(\t\x12\x17\n\x0fright_commit_id\x18\x03 \x01(\t\"Q\n\tDiffStats\x12\x0c\n\x04path\x18\x01 \x01(\x0c\x12\x11\n\tadditions\x18\x02 \x01(\x05\x12\x11\n\tdeletions\x18\x03 \x01(\x05\x12\x10\n\x08old_path\x18\x04 \x01(\x0c\"5\n\x11\x44iffStatsResponse\x12 \n\x05stats\x18\x01 \x03(\x0b\x32\x11.gitaly.DiffStats\"\xda\x05\n\x17\x46indChangedPathsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x13\n\x07\x63ommits\x18\x02 \x03(\tB\x02\x18\x01\x12\x39\n\x08requests\x18\x03 \x03(\x0b\x32\'.gitaly.FindChangedPathsRequest.Request\x12S\n\x16merge_commit_diff_mode\x18\x04 \x01(\x0e\x32\x33.gitaly.FindChangedPathsRequest.MergeCommitDiffMode\x12\x14\n\x0c\x66ind_renames\x18\x05 \x01(\x08\x1a\xc2\x02\n\x07Request\x12K\n\x0ctree_request\x18\x01 \x01(\x0b\x32\x33.gitaly.FindChangedPathsRequest.Request.TreeRequestH\x00\x12O\n\x0e\x63ommit_request\x18\x02 \x01(\x0b\x32\x35.gitaly.FindChangedPathsRequest.Request.CommitRequestH\x00\x1a\x46\n\x0bTreeRequest\x12\x1a\n\x12left_tree_revision\x18\x01 \x01(\t\x12\x1b\n\x13right_tree_revision\x18\x02 \x01(\t\x1aI\n\rCommitRequest\x12\x17\n\x0f\x63ommit_revision\x18\x01 \x01(\t\x12\x1f\n\x17parent_commit_revisions\x18\x02 \x03(\tB\x06\n\x04type\"\x90\x01\n\x13MergeCommitDiffMode\x12&\n\"MERGE_COMMIT_DIFF_MODE_UNSPECIFIED\x10\x00\x12)\n%MERGE_COMMIT_DIFF_MODE_INCLUDE_MERGES\x10\x01\x12&\n\"MERGE_COMMIT_DIFF_MODE_ALL_PARENTS\x10\x02\"?\n\x18\x46indChangedPathsResponse\x12#\n\x05paths\x18\x01 \x03(\x0b\x32\x14.gitaly.ChangedPaths\"\x92\x02\n\x0c\x43hangedPaths\x12\x0c\n\x04path\x18\x01 \x01(\x0c\x12+\n\x06status\x18\x02 \x01(\x0e\x32\x1b.gitaly.ChangedPaths.Status\x12\x10\n\x08old_mode\x18\x03 \x01(\x05\x12\x10\n\x08new_mode\x18\x04 \x01(\x05\x12\x13\n\x0bold_blob_id\x18\x05 \x01(\t\x12\x13\n\x0bnew_blob_id\x18\x06 \x01(\t\x12\x10\n\x08old_path\x18\x07 \x01(\x0c\x12\r\n\x05score\x18\x08 \x01(\x05\"X\n\x06Status\x12\t\n\x05\x41\x44\x44\x45\x44\x10\x00\x12\x0c\n\x08MODIFIED\x10\x01\x12\x0b\n\x07\x44\x45LETED\x10\x02\x12\x0f\n\x0bTYPE_CHANGE\x10\x03\x12\n\n\x06\x43OPIED\x10\x04\x12\x0b\n\x07RENAMED\x10\x05\"m\n\x11GetPatchIDRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x14\n\x0cold_revision\x18\x02 \x01(\x0c\x12\x14\n\x0cnew_revision\x18\x03 \x01(\x0c\"&\n\x12GetPatchIDResponse\x12\x10\n\x08patch_id\x18\x01 \x01(\t\"+\n\tRangePair\x12\x0e\n\x06range1\x18\x01 \x01(\t\x12\x0e\n\x06range2\x18\x02 \x01(\t\"+\n\rRevisionRange\x12\x0c\n\x04rev1\x18\x01 \x01(\t\x12\x0c\n\x04rev2\x18\x02 \x01(\t\"=\n\x11\x42\x61seWithRevisions\x12\x0c\n\x04\x62\x61se\x18\x01 \x01(\t\x12\x0c\n\x04rev1\x18\x02 \x01(\t\x12\x0c\n\x04rev2\x18\x03 \x01(\t\"\xe5\x01\n\x13RawRangeDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\'\n\nrange_pair\x18\x02 \x01(\x0b\x32\x11.gitaly.RangePairH\x00\x12/\n\x0erevision_range\x18\x03 \x01(\x0b\x32\x15.gitaly.RevisionRangeH\x00\x12\x38\n\x13\x62\x61se_with_revisions\x18\x04 \x01(\x0b\x32\x19.gitaly.BaseWithRevisionsH\x00\x42\x0c\n\nrange_spec\"$\n\x14RawRangeDiffResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"\xe2\x01\n\x10RangeDiffRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\'\n\nrange_pair\x18\x02 \x01(\x0b\x32\x11.gitaly.RangePairH\x00\x12/\n\x0erevision_range\x18\x03 \x01(\x0b\x32\x15.gitaly.RevisionRangeH\x00\x12\x38\n\x13\x62\x61se_with_revisions\x18\x04 \x01(\x0b\x32\x19.gitaly.BaseWithRevisionsH\x00\x42\x0c\n\nrange_spec\"\xc4\x02\n\x11RangeDiffResponse\x12\x16\n\x0e\x66rom_commit_id\x18\x01 \x01(\t\x12\x14\n\x0cto_commit_id\x18\x02 \x01(\t\x12\x38\n\ncomparison\x18\x03 \x01(\x0e\x32$.gitaly.RangeDiffResponse.Comparator\x12\x1c\n\x14\x63ommit_message_title\x18\x07 \x01(\t\x12\x12\n\npatch_data\x18\x08 \x01(\x0c\x12\x14\n\x0c\x65nd_of_patch\x18\t \x01(\x08\"\x7f\n\nComparator\x12 \n\x1c\x43OMPARATOR_EQUAL_UNSPECIFIED\x10\x00\x12\x1b\n\x17\x43OMPARATOR_GREATER_THAN\x10\x01\x12\x18\n\x14\x43OMPARATOR_LESS_THAN\x10\x02\x12\x18\n\x14\x43OMPARATOR_NOT_EQUAL\x10\x03\"\xa1\x04\n\x10\x44iffBlobsRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x35\n\nblob_pairs\x18\x02 \x03(\x0b\x32!.gitaly.DiffBlobsRequest.BlobPair\x12\x34\n\tdiff_mode\x18\x03 \x01(\x0e\x32!.gitaly.DiffBlobsRequest.DiffMode\x12\x46\n\x12whitespace_changes\x18\x04 \x01(\x0e\x32*.gitaly.DiffBlobsRequest.WhitespaceChanges\x12\x19\n\x11patch_bytes_limit\x18\x05 \x01(\x05\x12&\n\x08raw_info\x18\x06 \x03(\x0b\x32\x14.gitaly.ChangedPaths\x1a\x31\n\x08\x42lobPair\x12\x11\n\tleft_blob\x18\x01 \x01(\x0c\x12\x12\n\nright_blob\x18\x02 \x01(\x0c\"9\n\x08\x44iffMode\x12\x19\n\x15\x44IFF_MODE_UNSPECIFIED\x10\x00\x12\x12\n\x0e\x44IFF_MODE_WORD\x10\x01\"y\n\x11WhitespaceChanges\x12\"\n\x1eWHITESPACE_CHANGES_UNSPECIFIED\x10\x00\x12\x1d\n\x19WHITESPACE_CHANGES_IGNORE\x10\x01\x12!\n\x1dWHITESPACE_CHANGES_IGNORE_ALL\x10\x02\"\xff\x01\n\x11\x44iffBlobsResponse\x12\x14\n\x0cleft_blob_id\x18\x01 \x01(\t\x12\x15\n\rright_blob_id\x18\x02 \x01(\t\x12\r\n\x05patch\x18\x03 \x01(\x0c\x12\x30\n\x06status\x18\x04 \x01(\x0e\x32 .gitaly.DiffBlobsResponse.Status\x12\x0e\n\x06\x62inary\x18\x05 \x01(\x08\x12\x1e\n\x16over_patch_bytes_limit\x18\x06 \x01(\x08\x12\x12\n\npatch_size\x18\x07 \x01(\x05\"8\n\x06Status\x12\x15\n\x11STATUS_INCOMPLETE\x10\x00\x12\x17\n\x13STATUS_END_OF_PATCH\x10\x01\x32\xa4\x06\n\x0b\x44iffService\x12M\n\nCommitDiff\x12\x19.gitaly.CommitDiffRequest\x1a\x1a.gitaly.CommitDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12P\n\x0b\x43ommitDelta\x12\x1a.gitaly.CommitDeltaRequest\x1a\x1b.gitaly.CommitDeltaResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12\x44\n\x07RawDiff\x12\x16.gitaly.RawDiffRequest\x1a\x17.gitaly.RawDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12G\n\x08RawPatch\x12\x17.gitaly.RawPatchRequest\x1a\x18.gitaly.RawPatchResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12J\n\tDiffStats\x12\x18.gitaly.DiffStatsRequest\x1a\x19.gitaly.DiffStatsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12_\n\x10\x46indChangedPaths\x12\x1f.gitaly.FindChangedPathsRequest\x1a .gitaly.FindChangedPathsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12K\n\nGetPatchID\x12\x19.gitaly.GetPatchIDRequest\x1a\x1a.gitaly.GetPatchIDResponse\"\x06\xfa\x97(\x02\x08\x02\x12S\n\x0cRawRangeDiff\x12\x1b.gitaly.RawRangeDiffRequest\x1a\x1c.gitaly.RawRangeDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12J\n\tRangeDiff\x12\x18.gitaly.RangeDiffRequest\x1a\x19.gitaly.RangeDiffResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12J\n\tDiffBlobs\x12\x18.gitaly.DiffBlobsRequest\x1a\x19.gitaly.DiffBlobsResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -111,41 +111,41 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_FINDCHANGEDPATHSRESPONSE']._serialized_start=2757
   _globals['_FINDCHANGEDPATHSRESPONSE']._serialized_end=2820
   _globals['_CHANGEDPATHS']._serialized_start=2823
-  _globals['_CHANGEDPATHS']._serialized_end=3082
-  _globals['_CHANGEDPATHS_STATUS']._serialized_start=2994
-  _globals['_CHANGEDPATHS_STATUS']._serialized_end=3082
-  _globals['_GETPATCHIDREQUEST']._serialized_start=3084
-  _globals['_GETPATCHIDREQUEST']._serialized_end=3193
-  _globals['_GETPATCHIDRESPONSE']._serialized_start=3195
-  _globals['_GETPATCHIDRESPONSE']._serialized_end=3233
-  _globals['_RANGEPAIR']._serialized_start=3235
-  _globals['_RANGEPAIR']._serialized_end=3278
-  _globals['_REVISIONRANGE']._serialized_start=3280
-  _globals['_REVISIONRANGE']._serialized_end=3323
-  _globals['_BASEWITHREVISIONS']._serialized_start=3325
-  _globals['_BASEWITHREVISIONS']._serialized_end=3386
-  _globals['_RAWRANGEDIFFREQUEST']._serialized_start=3389
-  _globals['_RAWRANGEDIFFREQUEST']._serialized_end=3618
-  _globals['_RAWRANGEDIFFRESPONSE']._serialized_start=3620
-  _globals['_RAWRANGEDIFFRESPONSE']._serialized_end=3656
-  _globals['_RANGEDIFFREQUEST']._serialized_start=3659
-  _globals['_RANGEDIFFREQUEST']._serialized_end=3885
-  _globals['_RANGEDIFFRESPONSE']._serialized_start=3888
-  _globals['_RANGEDIFFRESPONSE']._serialized_end=4212
-  _globals['_RANGEDIFFRESPONSE_COMPARATOR']._serialized_start=4085
-  _globals['_RANGEDIFFRESPONSE_COMPARATOR']._serialized_end=4212
-  _globals['_DIFFBLOBSREQUEST']._serialized_start=4215
-  _globals['_DIFFBLOBSREQUEST']._serialized_end=4720
-  _globals['_DIFFBLOBSREQUEST_BLOBPAIR']._serialized_start=4489
-  _globals['_DIFFBLOBSREQUEST_BLOBPAIR']._serialized_end=4538
-  _globals['_DIFFBLOBSREQUEST_DIFFMODE']._serialized_start=4540
-  _globals['_DIFFBLOBSREQUEST_DIFFMODE']._serialized_end=4597
+  _globals['_CHANGEDPATHS']._serialized_end=3097
+  _globals['_CHANGEDPATHS_STATUS']._serialized_start=3009
+  _globals['_CHANGEDPATHS_STATUS']._serialized_end=3097
+  _globals['_GETPATCHIDREQUEST']._serialized_start=3099
+  _globals['_GETPATCHIDREQUEST']._serialized_end=3208
+  _globals['_GETPATCHIDRESPONSE']._serialized_start=3210
+  _globals['_GETPATCHIDRESPONSE']._serialized_end=3248
+  _globals['_RANGEPAIR']._serialized_start=3250
+  _globals['_RANGEPAIR']._serialized_end=3293
+  _globals['_REVISIONRANGE']._serialized_start=3295
+  _globals['_REVISIONRANGE']._serialized_end=3338
+  _globals['_BASEWITHREVISIONS']._serialized_start=3340
+  _globals['_BASEWITHREVISIONS']._serialized_end=3401
+  _globals['_RAWRANGEDIFFREQUEST']._serialized_start=3404
+  _globals['_RAWRANGEDIFFREQUEST']._serialized_end=3633
+  _globals['_RAWRANGEDIFFRESPONSE']._serialized_start=3635
+  _globals['_RAWRANGEDIFFRESPONSE']._serialized_end=3671
+  _globals['_RANGEDIFFREQUEST']._serialized_start=3674
+  _globals['_RANGEDIFFREQUEST']._serialized_end=3900
+  _globals['_RANGEDIFFRESPONSE']._serialized_start=3903
+  _globals['_RANGEDIFFRESPONSE']._serialized_end=4227
+  _globals['_RANGEDIFFRESPONSE_COMPARATOR']._serialized_start=4100
+  _globals['_RANGEDIFFRESPONSE_COMPARATOR']._serialized_end=4227
+  _globals['_DIFFBLOBSREQUEST']._serialized_start=4230
+  _globals['_DIFFBLOBSREQUEST']._serialized_end=4775
+  _globals['_DIFFBLOBSREQUEST_BLOBPAIR']._serialized_start=4544
+  _globals['_DIFFBLOBSREQUEST_BLOBPAIR']._serialized_end=4593
+  _globals['_DIFFBLOBSREQUEST_DIFFMODE']._serialized_start=4595
+  _globals['_DIFFBLOBSREQUEST_DIFFMODE']._serialized_end=4652
   _globals['_DIFFBLOBSREQUEST_WHITESPACECHANGES']._serialized_start=752
   _globals['_DIFFBLOBSREQUEST_WHITESPACECHANGES']._serialized_end=873
-  _globals['_DIFFBLOBSRESPONSE']._serialized_start=4723
-  _globals['_DIFFBLOBSRESPONSE']._serialized_end=4978
-  _globals['_DIFFBLOBSRESPONSE_STATUS']._serialized_start=4922
-  _globals['_DIFFBLOBSRESPONSE_STATUS']._serialized_end=4978
-  _globals['_DIFFSERVICE']._serialized_start=4981
-  _globals['_DIFFSERVICE']._serialized_end=5785
+  _globals['_DIFFBLOBSRESPONSE']._serialized_start=4778
+  _globals['_DIFFBLOBSRESPONSE']._serialized_end=5033
+  _globals['_DIFFBLOBSRESPONSE_STATUS']._serialized_start=4977
+  _globals['_DIFFBLOBSRESPONSE_STATUS']._serialized_end=5033
+  _globals['_DIFFSERVICE']._serialized_start=5036
+  _globals['_DIFFSERVICE']._serialized_end=5840
 # @@protoc_insertion_point(module_scope)

{hgitaly-18.0.0a0 → hgitaly-18.0.1}/hgitaly/stub/mercurial_aux_git_pb2.py

@@ -13,11 +13,10 @@ _sym_db = _symbol_database.Default()
 
 
 from . import lint_pb2 as lint__pb2
-from . import shared_pb2 as shared__pb2
 from . import repository_pb2 as repository__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17mercurial-aux-git.proto\x12\x07hgitaly\x1a\nlint.proto\x1a\x0cshared.proto\x1a\x10repository.proto2\xcd\x02\n\x16MercurialAuxGitService\x12Y\n\x12\x41uxGitCreateBundle\x12\x1b.gitaly.CreateBundleRequest\x1a\x1c.gitaly.CreateBundleResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12y\n\x16\x41uxGitCreateFromBundle\x12).gitaly.CreateRepositoryFromBundleRequest\x1a*.gitaly.CreateRepositoryFromBundleResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x12]\n\x14\x41uxGitRepositorySize\x12\x1d.gitaly.RepositorySizeRequest\x1a\x1e.gitaly.RepositorySizeResponse\"\x06\xfa\x97(\x02\x08\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17mercurial-aux-git.proto\x12\x07hgitaly\x1a\nlint.proto\x1a\x10repository.proto2\xcd\x02\n\x16MercurialAuxGitService\x12Y\n\x12\x41uxGitCreateBundle\x12\x1b.gitaly.CreateBundleRequest\x1a\x1c.gitaly.CreateBundleResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12y\n\x16\x41uxGitCreateFromBundle\x12).gitaly.CreateRepositoryFromBundleRequest\x1a*.gitaly.CreateRepositoryFromBundleResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x12]\n\x14\x41uxGitRepositorySize\x12\x1d.gitaly.RepositorySizeRequest\x1a\x1e.gitaly.RepositorySizeResponse\"\x06\xfa\x97(\x02\x08\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -30,6 +29,6 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitCreateFromBundle']._serialized_options = b'\372\227(\002\010\001'
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitRepositorySize']._loaded_options = None
   _globals['_MERCURIALAUXGITSERVICE'].methods_by_name['AuxGitRepositorySize']._serialized_options = b'\372\227(\002\010\001'
-  _globals['_MERCURIALAUXGITSERVICE']._serialized_start=81
-  _globals['_MERCURIALAUXGITSERVICE']._serialized_end=414
+  _globals['_MERCURIALAUXGITSERVICE']._serialized_start=67
+  _globals['_MERCURIALAUXGITSERVICE']._serialized_end=400
 # @@protoc_insertion_point(module_scope)