gitaly 0.30.0 → 1.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43fe82ac99c00859d088fb4bdc5dc511985e6c30
-  data.tar.gz: 06f24711cbc7dc40b21346e95f2910d5dbd10c36
+SHA256:
+  metadata.gz: ee50e8b5402afb89007110a6e059ce5a496419304a168934ecb4f878d68df66c
+  data.tar.gz: 5427d18d0dc1595ef4c988351071e4bfe21d680b00a2befa44d771e14db0879e
 SHA512:
-  metadata.gz: a762cb523aa4e8970595618bdcd0e27dfd1dbb78954ff6ecb04b7dd6283e2b25a6a5a9d95162d8bf4823ba13c4d6e1c6ef6dfb0d5c55ed8042ca410eca89b985
-  data.tar.gz: c3511907183a5f384d1657a81a0f26d65a5b603ff414a51113aa43821a55eb060c2ab9059ce7c9ac6ee950707564a401c3cd61b36b77a6aef0b3d25754b1406b
+  metadata.gz: 4d273d5b6ade411bee28788e0a66b71ed5d327d587017cbac8135692c2958a447563df0d723e2f5c4ee102fc152607d0bcd42cfa26d4bf5c9d175c4298a77c2f
+  data.tar.gz: 171c3a89fd206bbcde086302a1c7cecca9e994612c46ac843b9e14de862b06dc6e58082f06fe80f67bde261bfd3dedeb9ba23035ce5ff88ebab5bbf06e40f55a

data/ruby/proto/README.md

@@ -0,0 +1,5 @@
+# Gitaly-proto ruby stubs
+
+We are moving gitaly-proto inside the Gitaly repository. These stubs are not yet in use. Please use the `gitaly-proto` gem from Rubygems instead of this.
+
+https://gitlab.com/gitlab-org/gitaly/issues/1761

data/ruby/proto/gitaly.rb

@@ -0,0 +1,37 @@
+# This file is generated by generate-proto-ruby. Do not edit.
+$:.unshift(File.expand_path('../gitaly', __FILE__))
+
+require 'gitaly/version'
+
+require 'gitaly/blob_services_pb'
+
+require 'gitaly/cleanup_services_pb'
+
+require 'gitaly/commit_services_pb'
+
+require 'gitaly/conflicts_services_pb'
+
+require 'gitaly/diff_services_pb'
+
+require 'gitaly/namespace_services_pb'
+
+require 'gitaly/objectpool_services_pb'
+
+require 'gitaly/operations_services_pb'
+
+require 'gitaly/ref_services_pb'
+
+require 'gitaly/remote_services_pb'
+
+require 'gitaly/repository-service_services_pb'
+
+require 'gitaly/server_services_pb'
+
+require 'gitaly/smarthttp_services_pb'
+
+require 'gitaly/ssh_services_pb'
+
+require 'gitaly/storage_services_pb'
+
+require 'gitaly/wiki_services_pb'
+

data/ruby/proto/gitaly/blob_pb.rb

@@ -0,0 +1,86 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: blob.proto
+
+require 'google/protobuf'
+
+require 'shared_pb'
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message "gitaly.GetBlobRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :oid, :string, 2
+    optional :limit, :int64, 3
+  end
+  add_message "gitaly.GetBlobResponse" do
+    optional :size, :int64, 1
+    optional :data, :bytes, 2
+    optional :oid, :string, 3
+  end
+  add_message "gitaly.GetBlobsRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :revision_paths, :message, 2, "gitaly.GetBlobsRequest.RevisionPath"
+    optional :limit, :int64, 3
+  end
+  add_message "gitaly.GetBlobsRequest.RevisionPath" do
+    optional :revision, :string, 1
+    optional :path, :bytes, 2
+  end
+  add_message "gitaly.GetBlobsResponse" do
+    optional :size, :int64, 1
+    optional :data, :bytes, 2
+    optional :oid, :string, 3
+    optional :is_submodule, :bool, 4
+    optional :mode, :int32, 5
+    optional :revision, :string, 6
+    optional :path, :bytes, 7
+  end
+  add_message "gitaly.LFSPointer" do
+    optional :size, :int64, 1
+    optional :data, :bytes, 2
+    optional :oid, :string, 3
+  end
+  add_message "gitaly.NewBlobObject" do
+    optional :size, :int64, 1
+    optional :oid, :string, 2
+    optional :path, :bytes, 3
+  end
+  add_message "gitaly.GetLFSPointersRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :blob_ids, :string, 2
+  end
+  add_message "gitaly.GetLFSPointersResponse" do
+    repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"
+  end
+  add_message "gitaly.GetNewLFSPointersRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :revision, :bytes, 2
+    optional :limit, :int32, 3
+    optional :not_in_all, :bool, 4
+    repeated :not_in_refs, :bytes, 5
+  end
+  add_message "gitaly.GetNewLFSPointersResponse" do
+    repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"
+  end
+  add_message "gitaly.GetAllLFSPointersRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :revision, :bytes, 2
+  end
+  add_message "gitaly.GetAllLFSPointersResponse" do
+    repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer"
+  end
+end
+
+module Gitaly
+  GetBlobRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetBlobRequest").msgclass
+  GetBlobResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetBlobResponse").msgclass
+  GetBlobsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetBlobsRequest").msgclass
+  GetBlobsRequest::RevisionPath = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetBlobsRequest.RevisionPath").msgclass
+  GetBlobsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetBlobsResponse").msgclass
+  LFSPointer = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LFSPointer").msgclass
+  NewBlobObject = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.NewBlobObject").msgclass
+  GetLFSPointersRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetLFSPointersRequest").msgclass
+  GetLFSPointersResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetLFSPointersResponse").msgclass
+  GetNewLFSPointersRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetNewLFSPointersRequest").msgclass
+  GetNewLFSPointersResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetNewLFSPointersResponse").msgclass
+  GetAllLFSPointersRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetAllLFSPointersRequest").msgclass
+  GetAllLFSPointersResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetAllLFSPointersResponse").msgclass
+end

data/ruby/{lib → proto}/gitaly/blob_services_pb.rb

@@ -18,6 +18,10 @@ module Gitaly
       # ID. We use a stream to return a chunked arbitrarily large binary
       # response
       rpc :GetBlob, GetBlobRequest, stream(GetBlobResponse)
+      rpc :GetBlobs, GetBlobsRequest, stream(GetBlobsResponse)
+      rpc :GetLFSPointers, GetLFSPointersRequest, stream(GetLFSPointersResponse)
+      rpc :GetNewLFSPointers, GetNewLFSPointersRequest, stream(GetNewLFSPointersResponse)
+      rpc :GetAllLFSPointers, GetAllLFSPointersRequest, stream(GetAllLFSPointersResponse)
     end
 
     Stub = Service.rpc_stub_class

data/ruby/proto/gitaly/cleanup_pb.rb

@@ -0,0 +1,41 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: cleanup.proto
+
+require 'google/protobuf'
+
+require 'shared_pb'
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message "gitaly.ApplyBfgObjectMapRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :object_map, :bytes, 2
+  end
+  add_message "gitaly.ApplyBfgObjectMapResponse" do
+  end
+  add_message "gitaly.ApplyBfgObjectMapStreamRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :object_map, :bytes, 2
+  end
+  add_message "gitaly.ApplyBfgObjectMapStreamResponse" do
+    repeated :entries, :message, 1, "gitaly.ApplyBfgObjectMapStreamResponse.Entry"
+  end
+  add_message "gitaly.ApplyBfgObjectMapStreamResponse.Entry" do
+    optional :type, :enum, 1, "gitaly.ObjectType"
+    optional :old_oid, :string, 2
+    optional :new_oid, :string, 3
+  end
+  add_message "gitaly.CloseSessionRequest" do
+    optional :session_id, :string, 1
+  end
+  add_message "gitaly.CloseSessionResponse" do
+  end
+end
+
+module Gitaly
+  ApplyBfgObjectMapRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapRequest").msgclass
+  ApplyBfgObjectMapResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapResponse").msgclass
+  ApplyBfgObjectMapStreamRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapStreamRequest").msgclass
+  ApplyBfgObjectMapStreamResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapStreamResponse").msgclass
+  ApplyBfgObjectMapStreamResponse::Entry = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapStreamResponse.Entry").msgclass
+  CloseSessionRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CloseSessionRequest").msgclass
+  CloseSessionResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CloseSessionResponse").msgclass
+end

data/ruby/proto/gitaly/cleanup_services_pb.rb

@@ -0,0 +1,25 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: cleanup.proto for package 'gitaly'
+
+require 'grpc'
+require 'cleanup_pb'
+
+module Gitaly
+  module CleanupService
+    class Service
+
+      include GRPC::GenericService
+
+      self.marshal_class_method = :encode
+      self.unmarshal_class_method = :decode
+      self.service_name = 'gitaly.CleanupService'
+
+      # Deprecated in favour of ApplyBfgObjectMapStream
+      rpc :ApplyBfgObjectMap, stream(ApplyBfgObjectMapRequest), ApplyBfgObjectMapResponse
+      rpc :ApplyBfgObjectMapStream, stream(ApplyBfgObjectMapStreamRequest), stream(ApplyBfgObjectMapStreamResponse)
+      rpc :CloseSession, CloseSessionRequest, CloseSessionResponse
+    end
+
+    Stub = Service.rpc_stub_class
+  end
+end

data/ruby/{lib → proto}/gitaly/commit_pb.rb

@@ -56,10 +56,22 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :after, :message, 3, "google.protobuf.Timestamp"
     optional :before, :message, 4, "google.protobuf.Timestamp"
     optional :path, :bytes, 5
+    optional :max_count, :int32, 6
+    optional :all, :bool, 7
   end
   add_message "gitaly.CountCommitsResponse" do
     optional :count, :int32, 1
   end
+  add_message "gitaly.CountDivergingCommitsRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :from, :bytes, 2
+    optional :to, :bytes, 3
+    optional :max_count, :int32, 7
+  end
+  add_message "gitaly.CountDivergingCommitsResponse" do
+    optional :left_count, :int32, 1
+    optional :right_count, :int32, 2
+  end
   add_message "gitaly.TreeEntry" do
     optional :oid, :string, 1
     optional :root_oid, :string, 2
@@ -67,6 +79,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :type, :enum, 4, "gitaly.TreeEntry.EntryType"
     optional :mode, :int32, 5
     optional :commit_oid, :string, 6
+    optional :flat_path, :bytes, 7
   end
   add_enum "gitaly.TreeEntry.EntryType" do
     value :BLOB, 0
@@ -77,6 +90,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :repository, :message, 1, "gitaly.Repository"
     optional :revision, :bytes, 2
     optional :path, :bytes, 3
+    optional :recursive, :bool, 4
   end
   add_message "gitaly.GetTreeEntriesResponse" do
     repeated :entries, :message, 1, "gitaly.TreeEntry"
@@ -95,6 +109,20 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "gitaly.FindCommitResponse" do
     optional :commit, :message, 1, "gitaly.GitCommit"
   end
+  add_message "gitaly.ListCommitsByOidRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :oid, :string, 2
+  end
+  add_message "gitaly.ListCommitsByOidResponse" do
+    repeated :commits, :message, 1, "gitaly.GitCommit"
+  end
+  add_message "gitaly.ListCommitsByRefNameRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :ref_names, :bytes, 2
+  end
+  add_message "gitaly.ListCommitsByRefNameResponse" do
+    repeated :commits, :message, 1, "gitaly.GitCommit"
+  end
   add_message "gitaly.FindAllCommitsRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
     optional :revision, :bytes, 2
@@ -121,6 +149,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :disable_walk, :bool, 8
     optional :after, :message, 9, "google.protobuf.Timestamp"
     optional :before, :message, 10, "google.protobuf.Timestamp"
+    optional :all, :bool, 11
   end
   add_message "gitaly.FindCommitsResponse" do
     repeated :commits, :message, 1, "gitaly.GitCommit"
@@ -153,6 +182,20 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "gitaly.LastCommitForPathResponse" do
     optional :commit, :message, 1, "gitaly.GitCommit"
   end
+  add_message "gitaly.ListLastCommitsForTreeRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :revision, :string, 2
+    optional :path, :bytes, 3
+    optional :limit, :int32, 4
+    optional :offset, :int32, 5
+  end
+  add_message "gitaly.ListLastCommitsForTreeResponse" do
+    repeated :commits, :message, 1, "gitaly.ListLastCommitsForTreeResponse.CommitForTree"
+  end
+  add_message "gitaly.ListLastCommitsForTreeResponse.CommitForTree" do
+    optional :commit, :message, 2, "gitaly.GitCommit"
+    optional :path_bytes, :bytes, 4
+  end
   add_message "gitaly.CommitsByMessageRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
     optional :revision, :bytes, 2
@@ -164,6 +207,38 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "gitaly.CommitsByMessageResponse" do
     repeated :commits, :message, 1, "gitaly.GitCommit"
   end
+  add_message "gitaly.FilterShasWithSignaturesRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :shas, :bytes, 2
+  end
+  add_message "gitaly.FilterShasWithSignaturesResponse" do
+    repeated :shas, :bytes, 1
+  end
+  add_message "gitaly.ExtractCommitSignatureRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :commit_id, :string, 2
+  end
+  add_message "gitaly.ExtractCommitSignatureResponse" do
+    optional :signature, :bytes, 1
+    optional :signed_text, :bytes, 2
+  end
+  add_message "gitaly.GetCommitSignaturesRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :commit_ids, :string, 2
+  end
+  add_message "gitaly.GetCommitSignaturesResponse" do
+    optional :commit_id, :string, 1
+    optional :signature, :bytes, 2
+    optional :signed_text, :bytes, 3
+  end
+  add_message "gitaly.GetCommitMessagesRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    repeated :commit_ids, :string, 2
+  end
+  add_message "gitaly.GetCommitMessagesResponse" do
+    optional :commit_id, :string, 1
+    optional :message, :bytes, 2
+  end
 end
 
 module Gitaly
@@ -178,6 +253,8 @@ module Gitaly
   CommitsBetweenResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitsBetweenResponse").msgclass
   CountCommitsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CountCommitsRequest").msgclass
   CountCommitsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CountCommitsResponse").msgclass
+  CountDivergingCommitsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CountDivergingCommitsRequest").msgclass
+  CountDivergingCommitsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CountDivergingCommitsResponse").msgclass
   TreeEntry = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.TreeEntry").msgclass
   TreeEntry::EntryType = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.TreeEntry.EntryType").enummodule
   GetTreeEntriesRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetTreeEntriesRequest").msgclass
@@ -186,6 +263,10 @@ module Gitaly
   ListFilesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListFilesResponse").msgclass
   FindCommitRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindCommitRequest").msgclass
   FindCommitResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindCommitResponse").msgclass
+  ListCommitsByOidRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListCommitsByOidRequest").msgclass
+  ListCommitsByOidResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListCommitsByOidResponse").msgclass
+  ListCommitsByRefNameRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListCommitsByRefNameRequest").msgclass
+  ListCommitsByRefNameResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListCommitsByRefNameResponse").msgclass
   FindAllCommitsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindAllCommitsRequest").msgclass
   FindAllCommitsRequest::Order = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindAllCommitsRequest.Order").enummodule
   FindAllCommitsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FindAllCommitsResponse").msgclass
@@ -198,6 +279,17 @@ module Gitaly
   RawBlameResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.RawBlameResponse").msgclass
   LastCommitForPathRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LastCommitForPathRequest").msgclass
   LastCommitForPathResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.LastCommitForPathResponse").msgclass
+  ListLastCommitsForTreeRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLastCommitsForTreeRequest").msgclass
+  ListLastCommitsForTreeResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLastCommitsForTreeResponse").msgclass
+  ListLastCommitsForTreeResponse::CommitForTree = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLastCommitsForTreeResponse.CommitForTree").msgclass
   CommitsByMessageRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitsByMessageRequest").msgclass
   CommitsByMessageResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.CommitsByMessageResponse").msgclass
+  FilterShasWithSignaturesRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FilterShasWithSignaturesRequest").msgclass
+  FilterShasWithSignaturesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.FilterShasWithSignaturesResponse").msgclass
+  ExtractCommitSignatureRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ExtractCommitSignatureRequest").msgclass
+  ExtractCommitSignatureResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ExtractCommitSignatureResponse").msgclass
+  GetCommitSignaturesRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetCommitSignaturesRequest").msgclass
+  GetCommitSignaturesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetCommitSignaturesResponse").msgclass
+  GetCommitMessagesRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetCommitMessagesRequest").msgclass
+  GetCommitMessagesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetCommitMessagesResponse").msgclass
 end

data/ruby/{lib → proto}/gitaly/commit_services_pb.rb

@@ -18,6 +18,7 @@ module Gitaly
       rpc :TreeEntry, TreeEntryRequest, stream(TreeEntryResponse)
       rpc :CommitsBetween, CommitsBetweenRequest, stream(CommitsBetweenResponse)
       rpc :CountCommits, CountCommitsRequest, CountCommitsResponse
+      rpc :CountDivergingCommits, CountDivergingCommitsRequest, CountDivergingCommitsResponse
       rpc :GetTreeEntries, GetTreeEntriesRequest, stream(GetTreeEntriesResponse)
       rpc :ListFiles, ListFilesRequest, stream(ListFilesResponse)
       rpc :FindCommit, FindCommitRequest, FindCommitResponse
@@ -28,7 +29,17 @@ module Gitaly
       rpc :CommitLanguages, CommitLanguagesRequest, CommitLanguagesResponse
       rpc :RawBlame, RawBlameRequest, stream(RawBlameResponse)
       rpc :LastCommitForPath, LastCommitForPathRequest, LastCommitForPathResponse
+      rpc :ListLastCommitsForTree, ListLastCommitsForTreeRequest, stream(ListLastCommitsForTreeResponse)
       rpc :CommitsByMessage, CommitsByMessageRequest, stream(CommitsByMessageResponse)
+      rpc :ListCommitsByOid, ListCommitsByOidRequest, stream(ListCommitsByOidResponse)
+      rpc :ListCommitsByRefName, ListCommitsByRefNameRequest, stream(ListCommitsByRefNameResponse)
+      rpc :FilterShasWithSignatures, stream(FilterShasWithSignaturesRequest), stream(FilterShasWithSignaturesResponse)
+      # ExtractCommitSignature returns a stream because the signed text may be
+      # arbitrarily large and signature verification is impossible without the
+      # full text.
+      rpc :ExtractCommitSignature, ExtractCommitSignatureRequest, stream(ExtractCommitSignatureResponse)
+      rpc :GetCommitSignatures, GetCommitSignaturesRequest, stream(GetCommitSignaturesResponse)
+      rpc :GetCommitMessages, GetCommitMessagesRequest, stream(GetCommitMessagesResponse)
     end
 
     Stub = Service.rpc_stub_class

data/ruby/proto/gitaly/conflicts_pb.rb

@@ -0,0 +1,58 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: conflicts.proto
+
+require 'google/protobuf'
+
+require 'shared_pb'
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_message "gitaly.ListConflictFilesRequest" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :our_commit_oid, :string, 2
+    optional :their_commit_oid, :string, 3
+  end
+  add_message "gitaly.ConflictFileHeader" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :commit_oid, :string, 2
+    optional :their_path, :bytes, 3
+    optional :our_path, :bytes, 4
+    optional :our_mode, :int32, 5
+  end
+  add_message "gitaly.ConflictFile" do
+    oneof :conflict_file_payload do
+      optional :header, :message, 1, "gitaly.ConflictFileHeader"
+      optional :content, :bytes, 2
+    end
+  end
+  add_message "gitaly.ListConflictFilesResponse" do
+    repeated :files, :message, 1, "gitaly.ConflictFile"
+  end
+  add_message "gitaly.ResolveConflictsRequestHeader" do
+    optional :repository, :message, 1, "gitaly.Repository"
+    optional :our_commit_oid, :string, 2
+    optional :target_repository, :message, 3, "gitaly.Repository"
+    optional :their_commit_oid, :string, 4
+    optional :source_branch, :bytes, 5
+    optional :target_branch, :bytes, 6
+    optional :commit_message, :bytes, 7
+    optional :user, :message, 8, "gitaly.User"
+  end
+  add_message "gitaly.ResolveConflictsRequest" do
+    oneof :resolve_conflicts_request_payload do
+      optional :header, :message, 1, "gitaly.ResolveConflictsRequestHeader"
+      optional :files_json, :bytes, 2
+    end
+  end
+  add_message "gitaly.ResolveConflictsResponse" do
+    optional :resolution_error, :string, 1
+  end
+end
+
+module Gitaly
+  ListConflictFilesRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListConflictFilesRequest").msgclass
+  ConflictFileHeader = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ConflictFileHeader").msgclass
+  ConflictFile = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ConflictFile").msgclass
+  ListConflictFilesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListConflictFilesResponse").msgclass
+  ResolveConflictsRequestHeader = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ResolveConflictsRequestHeader").msgclass
+  ResolveConflictsRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ResolveConflictsRequest").msgclass
+  ResolveConflictsResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ResolveConflictsResponse").msgclass
+end