aboutsummaryrefslogtreecommitdiff
path: root/devel/gitaly/files/patch-4108.patch
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gitaly/files/patch-4108.patch')
-rw-r--r--devel/gitaly/files/patch-4108.patch84
1 files changed, 41 insertions, 43 deletions
diff --git a/devel/gitaly/files/patch-4108.patch b/devel/gitaly/files/patch-4108.patch
index 90551051d743..14a063e657f8 100644
--- a/devel/gitaly/files/patch-4108.patch
+++ b/devel/gitaly/files/patch-4108.patch
@@ -1,4 +1,4 @@
---- ruby/proto/gitaly/blob_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/blob_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/blob_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -13,7 +13,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("blob.proto", :syntax => :proto3) do
add_message "gitaly.GetBlobRequest" do
---- ruby/proto/gitaly/blob_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/blob_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/blob_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module BlobService
@@ -61,7 +61,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/cleanup_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/cleanup_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/cleanup_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -76,7 +76,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("cleanup.proto", :syntax => :proto3) do
add_message "gitaly.ApplyBfgObjectMapStreamRequest" do
---- ruby/proto/gitaly/cleanup_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/cleanup_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/cleanup_services_pb.rb
@@ -8,13 +8,13 @@ module Gitaly
module CleanupService
@@ -94,7 +94,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/commit_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/commit_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/commit_pb.rb
@@ -1,11 +1,11 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -110,7 +110,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("commit.proto", :syntax => :proto3) do
add_message "gitaly.ListCommitsRequest" do
---- ruby/proto/gitaly/commit_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/commit_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/commit_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module CommitService
@@ -121,7 +121,7 @@
self.marshal_class_method = :encode
self.unmarshal_class_method = :decode
---- ruby/proto/gitaly/conflicts_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/conflicts_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/conflicts_pb.rb
@@ -1,11 +1,11 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -137,7 +137,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("conflicts.proto", :syntax => :proto3) do
add_message "gitaly.ListConflictFilesRequest" do
---- ruby/proto/gitaly/conflicts_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/conflicts_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/conflicts_services_pb.rb
@@ -8,17 +8,17 @@ module Gitaly
module ConflictsService
@@ -160,7 +160,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/diff_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/diff_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/diff_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -175,7 +175,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("diff.proto", :syntax => :proto3) do
add_message "gitaly.CommitDiffRequest" do
---- ruby/proto/gitaly/diff_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/diff_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/diff_services_pb.rb
@@ -8,21 +8,21 @@ module Gitaly
module DiffService
@@ -206,7 +206,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/hook_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/hook_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/hook_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -221,9 +221,9 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("hook.proto", :syntax => :proto3) do
add_message "gitaly.PreReceiveHookRequest" do
---- ruby/proto/gitaly/hook_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/hook_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/hook_services_pb.rb
-@@ -8,23 +8,23 @@ module Gitaly
+@@ -8,21 +8,21 @@ module Gitaly
module HookService
class Service
@@ -242,9 +242,7 @@
+ rpc :PostReceiveHook, stream(::Gitaly::PostReceiveHookRequest), stream(::Gitaly::PostReceiveHookResponse)
+ rpc :UpdateHook, ::Gitaly::UpdateHookRequest, stream(::Gitaly::UpdateHookResponse)
+ rpc :ReferenceTransactionHook, stream(::Gitaly::ReferenceTransactionHookRequest), stream(::Gitaly::ReferenceTransactionHookResponse)
- # PackObjectsHook is meant to be called by git-upload-pack via the
- # uploadpack.packObjectsHook mechanism. It generates a stream of packed
- # Git objects.
+ # PackObjectsHook has been replaced by PackObjectsHookWithSidechannel. Remove in 15.0.
- rpc :PackObjectsHook, stream(Gitaly::PackObjectsHookRequest), stream(Gitaly::PackObjectsHookResponse)
+ rpc :PackObjectsHook, stream(::Gitaly::PackObjectsHookRequest), stream(::Gitaly::PackObjectsHookResponse)
# PackObjectsHookWithSidechannel is an optimized version of PackObjectsHook that uses
@@ -254,7 +252,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/internal_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/internal_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/internal_pb.rb
@@ -1,9 +1,9 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -267,7 +265,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("internal.proto", :syntax => :proto3) do
add_message "gitaly.WalkReposRequest" do
---- ruby/proto/gitaly/internal_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/internal_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/internal_services_pb.rb
@@ -10,7 +10,7 @@ module Gitaly
# only reachable by Praefect or other Gitalies
@@ -287,7 +285,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/lint_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/lint_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/lint_pb.rb
@@ -1,6 +1,7 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -297,7 +295,7 @@
require 'google/protobuf'
Google::Protobuf::DescriptorPool.generated_pool.build do
---- ruby/proto/gitaly/namespace_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/namespace_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/namespace_pb.rb
@@ -1,9 +1,9 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -310,7 +308,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("namespace.proto", :syntax => :proto3) do
add_message "gitaly.AddNamespaceRequest" do
---- ruby/proto/gitaly/namespace_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/namespace_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/namespace_services_pb.rb
@@ -8,16 +8,16 @@ module Gitaly
module NamespaceService
@@ -334,7 +332,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/objectpool_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/objectpool_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/objectpool_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -349,7 +347,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("objectpool.proto", :syntax => :proto3) do
add_message "gitaly.CreateObjectPoolRequest" do
---- ruby/proto/gitaly/operations_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/operations_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/operations_pb.rb
@@ -1,12 +1,12 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -366,7 +364,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("operations.proto", :syntax => :proto3) do
add_message "gitaly.UserCreateBranchRequest" do
---- ruby/proto/gitaly/operations_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/operations_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/operations_services_pb.rb
@@ -12,23 +12,23 @@ module Gitaly
# '/allowed' endpoint.
@@ -445,7 +443,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/praefect_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/praefect_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/praefect_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -459,8 +457,8 @@
+
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("praefect.proto", :syntax => :proto3) do
- add_message "gitaly.SetReplicationFactorRequest" do
---- ruby/proto/gitaly/praefect_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+ add_message "gitaly.GetRepositoryMetadataRequest" do
+--- ruby/proto/gitaly/praefect_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/praefect_services_pb.rb
@@ -8,19 +8,19 @@ module Gitaly
module PraefectInfoService
@@ -492,10 +490,10 @@
# factor of repositories assigned to a storage node removed from the cluster is effectively decreased.
- rpc :SetReplicationFactor, Gitaly::SetReplicationFactorRequest, Gitaly::SetReplicationFactorResponse
+ rpc :SetReplicationFactor, ::Gitaly::SetReplicationFactorRequest, ::Gitaly::SetReplicationFactorResponse
+ # GetRepositoryMetadata returns the cluster metadata for a repository. Returns NotFound if the repository does not exist.
+ rpc :GetRepositoryMetadata, Gitaly::GetRepositoryMetadataRequest, Gitaly::GetRepositoryMetadataResponse
end
-
- Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/remote_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/remote_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/remote_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -510,7 +508,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("remote.proto", :syntax => :proto3) do
add_message "gitaly.UpdateRemoteMirrorRequest" do
---- ruby/proto/gitaly/remote_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/remote_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/remote_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module RemoteService
@@ -539,7 +537,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/repository-service_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/repository-service_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/repository-service_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -554,7 +552,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("repository-service.proto", :syntax => :proto3) do
add_message "gitaly.RepositoryExistsRequest" do
---- ruby/proto/gitaly/server_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/server_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/server_pb.rb
@@ -1,9 +1,9 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -567,7 +565,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("server.proto", :syntax => :proto3) do
add_message "gitaly.ServerInfoRequest" do
---- ruby/proto/gitaly/server_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/server_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/server_services_pb.rb
@@ -8,14 +8,14 @@ module Gitaly
module ServerService
@@ -587,7 +585,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/shared_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/shared_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/shared_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -602,7 +600,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("shared.proto", :syntax => :proto3) do
add_message "gitaly.Repository" do
---- ruby/proto/gitaly/smarthttp_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/smarthttp_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/smarthttp_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -617,7 +615,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("smarthttp.proto", :syntax => :proto3) do
add_message "gitaly.InfoRefsRequest" do
---- ruby/proto/gitaly/smarthttp_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/smarthttp_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/smarthttp_services_pb.rb
@@ -8,7 +8,7 @@ module Gitaly
module SmartHTTPService
@@ -651,7 +649,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/ssh_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/ssh_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/ssh_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -666,7 +664,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("ssh.proto", :syntax => :proto3) do
add_message "gitaly.SSHUploadPackRequest" do
---- ruby/proto/gitaly/ssh_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/ssh_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/ssh_services_pb.rb
@@ -8,18 +8,18 @@ module Gitaly
module SSHService
@@ -691,7 +689,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/transaction_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/transaction_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/transaction_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -706,7 +704,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("transaction.proto", :syntax => :proto3) do
add_message "gitaly.VoteTransactionRequest" do
---- ruby/proto/gitaly/transaction_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/transaction_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/transaction_services_pb.rb
@@ -8,14 +8,14 @@ module Gitaly
module RefTransaction
@@ -726,7 +724,7 @@
end
Stub = Service.rpc_stub_class
---- ruby/proto/gitaly/wiki_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/wiki_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/wiki_pb.rb
@@ -1,10 +1,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
@@ -741,7 +739,7 @@
Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("wiki.proto", :syntax => :proto3) do
add_message "gitaly.WikiCommitDetails" do
---- ruby/proto/gitaly/wiki_services_pb.rb.orig 2021-11-08 11:56:42 UTC
+--- ruby/proto/gitaly/wiki_services_pb.rb.orig 2021-12-21 14:02:19 UTC
+++ ruby/proto/gitaly/wiki_services_pb.rb
@@ -8,18 +8,18 @@ module Gitaly
module WikiService