conflicts_pb.rb in gitaly-16.1.0.pre.rc1

- old
+ new
@@ -1,57 +1,41 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: conflicts.proto
 
+require 'google/protobuf'
+
 require 'google/protobuf/timestamp_pb'
 require 'lint_pb'
 require 'shared_pb'
-require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("conflicts.proto", :syntax => :proto3) do
-    add_message "gitaly.ListConflictFilesRequest" do
-      optional :repository, :message, 1, "gitaly.Repository"
-      optional :our_commit_oid, :string, 2
-      optional :their_commit_oid, :string, 3
-      optional :allow_tree_conflicts, :bool, 4
+
+descriptor_data = "\n\x0f\x63onflicts.proto\x12\x06gitaly\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\nlint.proto\x1a\x0cshared.proto\"\x98\x01\n\x18ListConflictFilesRequest\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eour_commit_oid\x18\x02 \x01(\t\x12\x18\n\x10their_commit_oid\x18\x03 \x01(\t\x12\x1c\n\x14\x61llow_tree_conflicts\x18\x04 \x01(\x08\"}\n\x12\x43onflictFileHeader\x12\x12\n\ncommit_oid\x18\x02 \x01(\t\x12\x12\n\ntheir_path\x18\x03 \x01(\x0c\x12\x10\n\x08our_path\x18\x04 \x01(\x0c\x12\x10\n\x08our_mode\x18\x05 \x01(\x05\x12\x15\n\rancestor_path\x18\x06 \x01(\x0cJ\x04\x08\x01\x10\x02\"h\n\x0c\x43onflictFile\x12,\n\x06header\x18\x01 \x01(\x0b\x32\x1a.gitaly.ConflictFileHeaderH\x00\x12\x11\n\x07\x63ontent\x18\x02 \x01(\x0cH\x00\x42\x17\n\x15\x63onflict_file_payload\"@\n\x19ListConflictFilesResponse\x12#\n\x05\x66iles\x18\x01 \x03(\x0b\x32\x14.gitaly.ConflictFile\"\xbf\x02\n\x1dResolveConflictsRequestHeader\x12,\n\nrepository\x18\x01 \x01(\x0b\x32\x12.gitaly.RepositoryB\x04\x98\xc6,\x01\x12\x16\n\x0eour_commit_oid\x18\x02 \x01(\t\x12-\n\x11target_repository\x18\x03 \x01(\x0b\x32\x12.gitaly.Repository\x12\x18\n\x10their_commit_oid\x18\x04 \x01(\t\x12\x15\n\rsource_branch\x18\x05 \x01(\x0c\x12\x15\n\rtarget_branch\x18\x06 \x01(\x0c\x12\x16\n\x0e\x63ommit_message\x18\x07 \x01(\x0c\x12\x1a\n\x04user\x18\x08 \x01(\x0b\x32\x0c.gitaly.User\x12-\n\ttimestamp\x18\t \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\x8d\x01\n\x17ResolveConflictsRequest\x12\x37\n\x06header\x18\x01 \x01(\x0b\x32%.gitaly.ResolveConflictsRequestHeaderH\x00\x12\x14\n\nfiles_json\x18\x02 \x01(\x0cH\x00\x42#\n!resolve_conflicts_request_payload\"4\n\x18ResolveConflictsResponse\x12\x18\n\x10resolution_error\x18\x01 \x01(\t2\xd7\x01\n\x10\x43onflictsService\x12\x62\n\x11ListConflictFiles\x12 .gitaly.ListConflictFilesRequest\x1a!.gitaly.ListConflictFilesResponse\"\x06\xfa\x97(\x02\x08\x02\x30\x01\x12_\n\x10ResolveConflicts\x12\x1f.gitaly.ResolveConflictsRequest\x1a .gitaly.ResolveConflictsResponse\"\x06\xfa\x97(\x02\x08\x01(\x01\x42\x34Z2gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypbb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["gitaly.Repository", "shared.proto"],
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
-    add_message "gitaly.ConflictFileHeader" do
-      optional :commit_oid, :string, 2
-      optional :their_path, :bytes, 3
-      optional :our_path, :bytes, 4
-      optional :our_mode, :int32, 5
-      optional :ancestor_path, :bytes, 6
-    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"
-      optional :timestamp, :message, 9, "google.protobuf.Timestamp"
-    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
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Gitaly
   ListConflictFilesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListConflictFilesRequest").msgclass
   ConflictFileHeader = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ConflictFileHeader").msgclass