gitaly 14.8.0 → 14.9.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2181a44837b132e1c264399f94dfc14b176ba728d02d03a6efcae88a1499e3ac
-  data.tar.gz: e2dd080416cb5e21aaa3b8b5c6c30d2eb9adf4b5aa52256ee988dd7ceda7f9bf
+  metadata.gz: fc1cef4aa11ae58532423a633aeedb6b6637bcebb564ce94a73bd4fbda1ee9d4
+  data.tar.gz: 5dba9ccc9680856018093bbfab334fd7001ab7bb33324b978446623e661ee48f
 SHA512:
-  metadata.gz: dcffecc004bac1cec63b968bdfd6d238b1638d93d3ff3996f006e14319df92bb0e43b2e9ba6ec397301d4d1f11bc86a3b36e5463656548d7d3c96900ec67ec57
-  data.tar.gz: bbe7d0bee3afc44a49694be21b46984d3c6e57b9452f9e217e0537e83fb331b5fcc984c30879163beffaf8abcf467a67a83bf652b803c08343bd1d61d0179a4e
+  metadata.gz: 2d77bb48de22f01f09d7e7b7ba81a1a79bd0987a603b3c80e26a449ec1b6b3e801d25fcd0e445c340c3840266d0c0244ed8e631e7048f1ffaed7722f85ce1482
+  data.tar.gz: e8496922c6501b90149720a07b0753c5eaf000206efcae6d755bffa415b1da6a8ed0063a87727348d877790410efdc8ed94be1f22850c5c6a3c02ecc80ebdb87

data/ruby/proto/gitaly/errors_pb.rb

@@ -11,15 +11,23 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :user_id, :string, 3
       optional :changes, :bytes, 4
     end
+    add_message "gitaly.MergeConflictError" do
+      repeated :conflicting_files, :bytes, 1
+    end
     add_message "gitaly.ReferenceUpdateError" do
       optional :reference_name, :bytes, 1
       optional :old_oid, :string, 2
       optional :new_oid, :string, 3
     end
+    add_message "gitaly.ResolveRevisionError" do
+      optional :revision, :bytes, 1
+    end
   end
 end
 
 module Gitaly
   AccessCheckError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.AccessCheckError").msgclass
+  MergeConflictError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.MergeConflictError").msgclass
   ReferenceUpdateError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ReferenceUpdateError").msgclass
+  ResolveRevisionError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ResolveRevisionError").msgclass
 end

data/ruby/proto/gitaly/operations_pb.rb

@@ -228,7 +228,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_message "gitaly.UserSquashRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :user, :message, 2, "gitaly.User"
-      optional :squash_id, :string, 3
       optional :start_sha, :string, 5
       optional :end_sha, :string, 6
       optional :author, :message, 7, "gitaly.User"
@@ -239,6 +238,12 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :squash_sha, :string, 1
       optional :git_error, :string, 3
     end
+    add_message "gitaly.UserSquashError" do
+      oneof :error do
+        optional :resolve_revision, :message, 1, "gitaly.ResolveRevisionError"
+        optional :rebase_conflict, :message, 2, "gitaly.MergeConflictError"
+      end
+    end
     add_message "gitaly.UserApplyPatchRequest" do
       oneof :user_apply_patch_request_payload do
         optional :header, :message, 1, "gitaly.UserApplyPatchRequest.Header"
@@ -307,6 +312,7 @@ module Gitaly
   UserRebaseConfirmableResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRebaseConfirmableResponse").msgclass
   UserSquashRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserSquashRequest").msgclass
   UserSquashResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserSquashResponse").msgclass
+  UserSquashError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserSquashError").msgclass
   UserApplyPatchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserApplyPatchRequest").msgclass
   UserApplyPatchRequest::Header = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserApplyPatchRequest.Header").msgclass
   UserApplyPatchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserApplyPatchResponse").msgclass

data/ruby/proto/gitaly/operations_services_pb.rb

@@ -63,7 +63,11 @@ module Gitaly
       rpc :UserRebaseConfirmable, stream(::Gitaly::UserRebaseConfirmableRequest), stream(::Gitaly::UserRebaseConfirmableResponse)
       # UserRevert tries to perform a revert of a given commit onto a branch.
       rpc :UserRevert, ::Gitaly::UserRevertRequest, ::Gitaly::UserRevertResponse
-      # UserSquash squashes a range of commits into a single commit.
+      # UserSquash squashes a range of commits into a single commit. If
+      # successful, it returns the object ID of the newly created squash commit.
+      # On error, it returns a gRPC error. Some specific errors will have an
+      # embedded UserSquashError such that clients can deduce what exactly has
+      # failed.
       rpc :UserSquash, ::Gitaly::UserSquashRequest, ::Gitaly::UserSquashResponse
       # UserApplyPatch applies patches to a given branch.
       rpc :UserApplyPatch, stream(::Gitaly::UserApplyPatchRequest), ::Gitaly::UserApplyPatchResponse

data/ruby/proto/gitaly/ref_services_pb.rb

@@ -37,6 +37,7 @@ module Gitaly
       # which has no signature, but its unsigned contents will still be returned.
       rpc :GetTagSignatures, ::Gitaly::GetTagSignaturesRequest, stream(::Gitaly::GetTagSignaturesResponse)
       rpc :GetTagMessages, ::Gitaly::GetTagMessagesRequest, stream(::Gitaly::GetTagMessagesResponse)
+      # PackRefs is deprecated in favor of OptimizeRepository.
       rpc :PackRefs, ::Gitaly::PackRefsRequest, ::Gitaly::PackRefsResponse
       # ListRefs returns a stream of all references in the repository. By default, pseudo-revisions like HEAD
       # will not be returned by this RPC. Any symbolic references will be resolved to the object ID it is

data/ruby/proto/gitaly/repository-service_pb.rb

@@ -85,6 +85,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_message "gitaly.CreateRepositoryRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
+      optional :default_branch, :bytes, 2
     end
     add_message "gitaly.CreateRepositoryResponse" do
     end
@@ -154,6 +155,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :url, :string, 2
       optional :http_host, :string, 3
+      optional :http_authorization_header, :string, 4
     end
     add_message "gitaly.CreateRepositoryFromURLResponse" do
     end

data/ruby/proto/gitaly/repository-service_services_pb.rb

@@ -15,10 +15,15 @@ module Gitaly
       self.service_name = 'gitaly.RepositoryService'
 
       rpc :RepositoryExists, ::Gitaly::RepositoryExistsRequest, ::Gitaly::RepositoryExistsResponse
+      # RepackIncremental is deprecated in favor of OptimizeRepository.
       rpc :RepackIncremental, ::Gitaly::RepackIncrementalRequest, ::Gitaly::RepackIncrementalResponse
+      # RepackFull is deprecated in favor of OptimizeRepository.
       rpc :RepackFull, ::Gitaly::RepackFullRequest, ::Gitaly::RepackFullResponse
+      # MidxRepack is deprecated in favor of OptimizeRepository.
       rpc :MidxRepack, ::Gitaly::MidxRepackRequest, ::Gitaly::MidxRepackResponse
+      # GarbageCollect is deprecated in favor of OptimizeRepository.
       rpc :GarbageCollect, ::Gitaly::GarbageCollectRequest, ::Gitaly::GarbageCollectResponse
+      # WriteCommitGraph is deprecated in favor of OptimizeRepository.
       rpc :WriteCommitGraph, ::Gitaly::WriteCommitGraphRequest, ::Gitaly::WriteCommitGraphResponse
       rpc :RepositorySize, ::Gitaly::RepositorySizeRequest, ::Gitaly::RepositorySizeResponse
       rpc :ApplyGitattributes, ::Gitaly::ApplyGitattributesRequest, ::Gitaly::ApplyGitattributesResponse
@@ -52,6 +57,7 @@ module Gitaly
       rpc :FindLicense, ::Gitaly::FindLicenseRequest, ::Gitaly::FindLicenseResponse
       rpc :GetInfoAttributes, ::Gitaly::GetInfoAttributesRequest, stream(::Gitaly::GetInfoAttributesResponse)
       rpc :CalculateChecksum, ::Gitaly::CalculateChecksumRequest, ::Gitaly::CalculateChecksumResponse
+      # Cleanup is deprecated in favor of OptimizeRepository.
       rpc :Cleanup, ::Gitaly::CleanupRequest, ::Gitaly::CleanupResponse
       rpc :GetSnapshot, ::Gitaly::GetSnapshotRequest, stream(::Gitaly::GetSnapshotResponse)
       rpc :CreateRepositoryFromSnapshot, ::Gitaly::CreateRepositoryFromSnapshotRequest, ::Gitaly::CreateRepositoryFromSnapshotResponse
@@ -67,8 +73,14 @@ module Gitaly
       rpc :RemoveRepository, ::Gitaly::RemoveRepositoryRequest, ::Gitaly::RemoveRepositoryResponse
       rpc :RenameRepository, ::Gitaly::RenameRepositoryRequest, ::Gitaly::RenameRepositoryResponse
       rpc :ReplicateRepository, ::Gitaly::ReplicateRepositoryRequest, ::Gitaly::ReplicateRepositoryResponse
+      # OptimizeRepository performs all maintenance tasks in a repository to keep
+      # it in an efficient state. It cleans up stale data, repacks objects,
+      # updates auxiliary caches like commit-graphs and packs references. The
+      # optimizations performed are based on heuristics and will adapt to the
+      # repository's size. This RPC call is designed as a black-box such that
+      # Gitaly has complete control of the on-disk state of repositories.
       rpc :OptimizeRepository, ::Gitaly::OptimizeRepositoryRequest, ::Gitaly::OptimizeRepositoryResponse
-      # PruneUnreachableObjetcs will prune all objects which aren't reachable from
+      # PruneUnreachableObjects will prune all objects which aren't reachable from
       # the repository's current set of references. Because pruning can only
       # happen for objects which aren't packed, you are required to first run
       # OptimizeRepository to explode any unreachable objects into loose objects.

data/ruby/proto/gitaly/version.rb

@@ -2,5 +2,5 @@
 # (https://gitlab.com/gitlab-org/release-tools/), and should not be
 # modified.
 module Gitaly
-  VERSION = '14.8.0'
+  VERSION = '14.9.0-rc3'
 end

data/ruby/proto/gitaly/wiki_pb.rb

@@ -54,6 +54,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :title, :bytes, 2
       optional :revision, :bytes, 3
       optional :directory, :bytes, 4
+      optional :skip_content, :bool, 5
     end
     add_message "gitaly.WikiFindPageResponse" do
       optional :page, :message, 1, "gitaly.WikiPage"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitaly
 version: !ruby/object:Gem::Version
-  version: 14.8.0
+  version: 14.9.0.pre.rc3
 platform: ruby
 authors:
 - Jacob Vosmaer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -90,9 +90,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: