From 86e1bbb7790e872878e9b9813675070d1b1e6833 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Wed, 19 Dec 2018 11:05:19 -0200 Subject: [PATCH] Add Override attribute to RenameNamespaceRequest --- go/gitalypb/namespace.pb.go | 49 +++++++++++++++++++-------------- namespace.proto | 1 + ruby/lib/gitaly/namespace_pb.rb | 1 + 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/go/gitalypb/namespace.pb.go b/go/gitalypb/namespace.pb.go index 3976a4ce..c0a70175 100644 --- a/go/gitalypb/namespace.pb.go +++ b/go/gitalypb/namespace.pb.go @@ -69,6 +69,7 @@ type RenameNamespaceRequest struct { StorageName string `protobuf:"bytes,1,opt,name=storage_name,json=storageName" json:"storage_name,omitempty"` From string `protobuf:"bytes,2,opt,name=from" json:"from,omitempty"` To string `protobuf:"bytes,3,opt,name=to" json:"to,omitempty"` + Override bool `protobuf:"varint,4,opt,name=override" json:"override,omitempty"` } func (m *RenameNamespaceRequest) Reset() { *m = RenameNamespaceRequest{} } @@ -97,6 +98,13 @@ func (m *RenameNamespaceRequest) GetTo() string { return "" } +func (m *RenameNamespaceRequest) GetOverride() bool { + if m != nil { + return m.Override + } + return false +} + type NamespaceExistsRequest struct { StorageName string `protobuf:"bytes,1,opt,name=storage_name,json=storageName" json:"storage_name,omitempty"` Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` @@ -346,24 +354,25 @@ var _NamespaceService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("namespace.proto", fileDescriptor5) } var fileDescriptor5 = []byte{ - // 291 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcf, 0x4b, 0xcc, 0x4d, - 0x2d, 0x2e, 0x48, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x4b, 0xcf, 0x2c, - 0x49, 0xcc, 0xa9, 0x54, 0xf2, 0xe1, 0x12, 0x76, 0x4c, 0x49, 0xf1, 0x83, 0xc9, 0x06, 0xa5, 0x16, - 0x96, 0xa6, 0x16, 0x97, 0x08, 0x29, 0x72, 0xf1, 0x14, 0x97, 0xe4, 0x17, 0x25, 0xa6, 0xa7, 0xc6, - 0x83, 0x74, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x71, 0x43, 0xc5, 0x40, 0xca, 0x85, 0x84, - 0xb8, 0x58, 0xc0, 0x52, 0x4c, 0x60, 0x29, 0x30, 0x5b, 0xc9, 0x9f, 0x4b, 0x2c, 0x28, 0x35, 0x37, - 0xbf, 0x2c, 0x95, 0x5a, 0x06, 0xc6, 0x83, 0x0c, 0x04, 0xb1, 0xc8, 0x34, 0x30, 0xad, 0x28, 0x3f, - 0x17, 0x66, 0x20, 0x88, 0x2d, 0xc4, 0xc7, 0xc5, 0x54, 0x92, 0x2f, 0xc1, 0x0c, 0x16, 0x61, 0x2a, - 0xc9, 0x07, 0xb9, 0x18, 0x6e, 0xb4, 0x6b, 0x45, 0x66, 0x71, 0x49, 0x31, 0x85, 0x2e, 0x36, 0xe4, - 0x12, 0xc7, 0x30, 0xb0, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x55, 0x48, 0x8c, 0x8b, 0x2d, 0x15, 0x2c, - 0x02, 0x36, 0x8b, 0x23, 0x08, 0xca, 0x53, 0x12, 0xe3, 0x12, 0x41, 0x8d, 0x03, 0x88, 0x7a, 0x25, - 0x49, 0x2e, 0x71, 0x8c, 0xd0, 0x44, 0x96, 0x42, 0x0b, 0x17, 0x88, 0x94, 0xd1, 0x43, 0x26, 0x2e, - 0x01, 0xb8, 0x68, 0x70, 0x6a, 0x51, 0x59, 0x66, 0x72, 0xaa, 0x90, 0x37, 0x17, 0x0f, 0xb2, 0x15, - 0x42, 0xd2, 0x7a, 0x90, 0xf8, 0xd7, 0xc3, 0x12, 0xf9, 0x52, 0x32, 0xd8, 0x25, 0xa1, 0x56, 0x33, - 0x08, 0x85, 0x70, 0xf1, 0xa3, 0xb9, 0x4b, 0x48, 0x0e, 0xa6, 0x05, 0x7b, 0xf4, 0x4b, 0xc9, 0xe3, - 0x94, 0x47, 0x35, 0x15, 0xc5, 0x4b, 0xc8, 0xa6, 0x62, 0x4b, 0x03, 0xc8, 0xa6, 0x62, 0x0d, 0x0b, - 0x88, 0xa9, 0x68, 0xd1, 0x81, 0x30, 0x15, 0x7b, 0xc4, 0x23, 0x4c, 0xc5, 0x11, 0x8f, 0x4a, 0x0c, - 0x49, 0x6c, 0xe0, 0x4c, 0x64, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x36, 0x4b, 0x73, 0x57, - 0x03, 0x00, 0x00, + // 308 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x4e, 0x83, 0x40, + 0x10, 0xc6, 0x5b, 0x6c, 0x1a, 0x1c, 0x1b, 0x6b, 0x46, 0x43, 0x11, 0x8d, 0x56, 0x4e, 0x3d, 0x91, + 0xa8, 0x4f, 0xe0, 0xc1, 0x93, 0x46, 0x13, 0xf4, 0x6e, 0xb0, 0x8c, 0x0d, 0x89, 0x74, 0x71, 0x77, + 0x25, 0x1a, 0x9f, 0xd6, 0x37, 0x31, 0xbb, 0xfc, 0x29, 0xd0, 0xed, 0x45, 0xbd, 0xcd, 0xce, 0xb7, + 0xfb, 0x1b, 0x66, 0xe6, 0x03, 0xc6, 0xcb, 0x28, 0x25, 0x91, 0x45, 0x73, 0x0a, 0x32, 0xce, 0x24, + 0xc3, 0xe1, 0x22, 0x91, 0xd1, 0xeb, 0xa7, 0x7f, 0x0b, 0xfb, 0x57, 0x71, 0x7c, 0x57, 0xa9, 0x21, + 0xbd, 0xbd, 0x93, 0x90, 0x78, 0x06, 0x23, 0x21, 0x19, 0x8f, 0x16, 0xf4, 0xa4, 0x5e, 0xba, 0xfd, + 0x69, 0x7f, 0xb6, 0x1d, 0xee, 0x94, 0x39, 0x75, 0x1d, 0x11, 0x06, 0x5a, 0xb2, 0xb4, 0xa4, 0x63, + 0xff, 0x1e, 0x9c, 0x90, 0x52, 0x96, 0xd3, 0x7f, 0x01, 0xbf, 0x14, 0x50, 0x45, 0xbf, 0x04, 0xbe, + 0x70, 0x96, 0x56, 0x40, 0x15, 0xe3, 0x2e, 0x58, 0x92, 0xb9, 0x5b, 0x3a, 0x63, 0x49, 0x86, 0x1e, + 0xd8, 0x2c, 0x27, 0xce, 0x93, 0x98, 0xdc, 0xc1, 0xb4, 0x3f, 0xb3, 0xc3, 0xfa, 0xac, 0xba, 0xa9, + 0xcb, 0x5e, 0x7f, 0x24, 0x42, 0x8a, 0x3f, 0x76, 0x73, 0x0e, 0x93, 0x35, 0xa0, 0xc8, 0xd8, 0x52, + 0x10, 0x3a, 0x30, 0x24, 0x9d, 0xd1, 0x2c, 0x3b, 0x2c, 0x4f, 0xbe, 0x03, 0x07, 0xed, 0xfd, 0x14, + 0xf7, 0xfd, 0x43, 0x98, 0xac, 0x4d, 0xba, 0x29, 0x75, 0x66, 0x56, 0x48, 0x17, 0xdf, 0x16, 0xec, + 0xd5, 0xd9, 0x07, 0xe2, 0x79, 0x32, 0x27, 0xbc, 0x81, 0x51, 0xb3, 0x04, 0x1e, 0x05, 0x85, 0x37, + 0x02, 0x83, 0x31, 0xbc, 0x63, 0xb3, 0x58, 0x96, 0xee, 0xe1, 0x23, 0x8c, 0x3b, 0xdf, 0x85, 0x27, + 0xd5, 0x13, 0xb3, 0x35, 0xbc, 0xd3, 0x8d, 0x7a, 0x9b, 0xda, 0x6a, 0xa9, 0x49, 0x35, 0xf9, 0xa3, + 0x49, 0x35, 0xce, 0xa2, 0xa0, 0x76, 0xd6, 0xb1, 0xa2, 0x9a, 0x17, 0xbf, 0xa2, 0x6e, 0xd8, 0xa3, + 0xdf, 0x7b, 0x1e, 0xea, 0x1f, 0xec, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x33, 0xf7, 0xac, 0x87, + 0x73, 0x03, 0x00, 0x00, } diff --git a/namespace.proto b/namespace.proto index 8a975e6d..cac22ee4 100644 --- a/namespace.proto +++ b/namespace.proto @@ -23,6 +23,7 @@ message RenameNamespaceRequest { string storage_name = 1; string from = 2; string to = 3; + bool override = 4; } message NamespaceExistsRequest { diff --git a/ruby/lib/gitaly/namespace_pb.rb b/ruby/lib/gitaly/namespace_pb.rb index f91115fc..e8e194d3 100644 --- a/ruby/lib/gitaly/namespace_pb.rb +++ b/ruby/lib/gitaly/namespace_pb.rb @@ -16,6 +16,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :storage_name, :string, 1 optional :from, :string, 2 optional :to, :string, 3 + optional :override, :bool, 4 end add_message "gitaly.NamespaceExistsRequest" do optional :storage_name, :string, 1 -- GitLab