operations_pb.rb in gitaly-15.0.0.pre.rc2

- old
+ new

@@ -1,12 +1,12 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: operations.proto
 
-require 'lint_pb'
-require 'shared_pb'
 require 'errors_pb'
 require 'google/protobuf/timestamp_pb'
+require 'lint_pb'
+require 'shared_pb'
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("operations.proto", :syntax => :proto3) do
     add_message "gitaly.UserCreateBranchRequest" do
@@ -129,10 +129,18 @@
     add_enum "gitaly.UserCherryPickResponse.CreateTreeError" do
       value :NONE, 0
       value :EMPTY, 1
       value :CONFLICT, 2
     end
+    add_message "gitaly.UserCherryPickError" do
+      oneof :error do
+        optional :cherry_pick_conflict, :message, 1, "gitaly.MergeConflictError"
+        optional :target_branch_diverged, :message, 2, "gitaly.NotAncestorError"
+        optional :changes_already_applied, :message, 3, "gitaly.ChangesAlreadyAppliedError"
+        optional :access_check, :message, 4, "gitaly.AccessCheckError"
+      end
+    end
     add_message "gitaly.UserRevertRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :user, :message, 2, "gitaly.User"
       optional :commit, :message, 3, "gitaly.GitCommit"
       optional :branch_name, :bytes, 4
@@ -302,9 +310,10 @@
   UserFFBranchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserFFBranchRequest").msgclass
   UserFFBranchResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserFFBranchResponse").msgclass
   UserCherryPickRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickRequest").msgclass
   UserCherryPickResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickResponse").msgclass
   UserCherryPickResponse::CreateTreeError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickResponse.CreateTreeError").enummodule
+  UserCherryPickError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCherryPickError").msgclass
   UserRevertRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRevertRequest").msgclass
   UserRevertResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRevertResponse").msgclass
   UserRevertResponse::CreateTreeError = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserRevertResponse.CreateTreeError").enummodule
   UserCommitFilesActionHeader = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCommitFilesActionHeader").msgclass
   UserCommitFilesActionHeader::ActionType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.UserCommitFilesActionHeader.ActionType").enummodule