gitaly-proto 0.59.0 → 0.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c612f980a6025a49dee2792501805d7aeda88a
-  data.tar.gz: c9b50090ae84337378d9a0a9e06d53196f6489aa
+  metadata.gz: 17ec05a1527213d563c7b83d5f988a99ed3d4084
+  data.tar.gz: 6d3ec3fdb9bcd72babef9d92a223f494352f6261
 SHA512:
-  metadata.gz: 994eaea36f5a0023f47f4e18b805b8595745f87de7d69c346229aad708296230e8ad2bad2c16f03ff4c90cdaa067688192b473804ebd8f5719c826542672aff7
-  data.tar.gz: 237b93f5fed96cf88f69a348ef0d33a9a3d3f91fa478fcd56b9edf4a3b7e974987e8bb21802b0221e3133bf5fd8650f5a52ff1dd6b5ff66cde7e9d1eda8e35d3
+  metadata.gz: 846d2853646617d13500d8a7d0761497282814312c9351ba1868acb898b81ab397ddb7c9704da1fbb490e710ef1d44c98f0527361cea3aea8370ee3f328c613e
+  data.tar.gz: d77cbaac7c4e306e4e43ecd0a550ffb01898dbdbc621e35e0731ace29aaf8c64be5c9d39d84433b60d68477eb0d6f3048fc5bc79fb8f8eb345b1eee0b869f1c4

data/ruby/lib/gitaly.rb

@@ -7,6 +7,8 @@ require 'gitaly/blob_services_pb'
 
 require 'gitaly/commit_services_pb'
 
+require 'gitaly/conflicts_services_pb'
+
 require 'gitaly/deprecated-services_services_pb'
 
 require 'gitaly/diff_services_pb'

data/ruby/lib/gitaly/conflicts_pb.rb

@@ -0,0 +1,59 @@
+# 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 :target_repository, :message, 3, "gitaly.Repository"
+    optional :their_commit_oid, :string, 4
+  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

data/ruby/lib/gitaly/conflicts_services_pb.rb

@@ -0,0 +1,23 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: conflicts.proto for package 'gitaly'
+
+require 'grpc'
+require 'conflicts_pb'
+
+module Gitaly
+  module ConflictsService
+    class Service
+
+      include GRPC::GenericService
+
+      self.marshal_class_method = :encode
+      self.unmarshal_class_method = :decode
+      self.service_name = 'gitaly.ConflictsService'
+
+      rpc :ListConflictFiles, ListConflictFilesRequest, stream(ListConflictFilesResponse)
+      rpc :ResolveConflicts, stream(ResolveConflictsRequest), ResolveConflictsResponse
+    end
+
+    Stub = Service.rpc_stub_class
+  end
+end

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

@@ -108,6 +108,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :repository, :message, 1, "gitaly.Repository"
     optional :ref, :bytes, 2
     optional :revision, :bytes, 3
+    optional :force, :bool, 4
   end
   add_message "gitaly.WriteRefResponse" do
     optional :error, :bytes, 1

data/ruby/lib/gitaly/version.rb

@@ -1,4 +1,4 @@
 # This file was auto-generated by _support/release
 module Gitaly
-  VERSION = "0.59.0"
+  VERSION = "0.60.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitaly-proto
 version: !ruby/object:Gem::Version
-  version: 0.59.0
+  version: 0.60.0
 platform: ruby
 authors:
 - Jacob Vosmaer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -53,6 +53,8 @@ files:
 - ruby/lib/gitaly/blob_services_pb.rb
 - ruby/lib/gitaly/commit_pb.rb
 - ruby/lib/gitaly/commit_services_pb.rb
+- ruby/lib/gitaly/conflicts_pb.rb
+- ruby/lib/gitaly/conflicts_services_pb.rb
 - ruby/lib/gitaly/deprecated-services_pb.rb
 - ruby/lib/gitaly/deprecated-services_services_pb.rb
 - ruby/lib/gitaly/diff_pb.rb
@@ -95,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Auto-generated gRPC client for gitaly