diff options
19 files changed, 519 insertions, 134 deletions
diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index 4970185b3..e2930bab0 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -186,6 +186,14 @@ func (s *Server) ConflictsServiceClient(ctx context.Context) (pb.ConflictsServic return pb.NewConflictsServiceClient(conn), err } +// RemoteServiceClient returns a RemoteServiceClient instance that is +// configured to connect to the running Ruby server. This assumes Start() +// has been called already. +func (s *Server) RemoteServiceClient(ctx context.Context) (pb.RemoteServiceClient, error) { + conn, err := s.getConnection(ctx) + return pb.NewRemoteServiceClient(conn), err +} + func (s *Server) getConnection(ctx context.Context) (*grpc.ClientConn, error) { s.clientConnMu.RLock() conn := s.clientConn diff --git a/internal/service/register.go b/internal/service/register.go index bccb45152..acaa8f014 100644 --- a/internal/service/register.go +++ b/internal/service/register.go @@ -11,6 +11,7 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/service/notifications" "gitlab.com/gitlab-org/gitaly/internal/service/operations" "gitlab.com/gitlab-org/gitaly/internal/service/ref" + "gitlab.com/gitlab-org/gitaly/internal/service/remote" "gitlab.com/gitlab-org/gitaly/internal/service/repository" "gitlab.com/gitlab-org/gitaly/internal/service/smarthttp" "gitlab.com/gitlab-org/gitaly/internal/service/ssh" @@ -36,6 +37,7 @@ func RegisterAll(grpcServer *grpc.Server, rubyServer *rubyserver.Server) { pb.RegisterSmartHTTPServiceServer(grpcServer, smarthttp.NewServer()) pb.RegisterWikiServiceServer(grpcServer, wiki.NewServer(rubyServer)) pb.RegisterConflictsServiceServer(grpcServer, conflicts.NewServer(rubyServer)) + pb.RegisterRemoteServiceServer(grpcServer, remote.NewServer(rubyServer)) healthpb.RegisterHealthServer(grpcServer, health.NewServer()) } diff --git a/internal/service/remote/fetch_internal_remote.go b/internal/service/remote/fetch_internal_remote.go new file mode 100644 index 000000000..0d16d9dfe --- /dev/null +++ b/internal/service/remote/fetch_internal_remote.go @@ -0,0 +1,13 @@ +package remote + +import ( + "golang.org/x/net/context" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/internal/helper" +) + +// FetchInternalRemote fetches another Gitaly repository set as a remote +func (s *server) FetchInternalRemote(context.Context, *pb.FetchInternalRemoteRequest) (*pb.FetchInternalRemoteResponse, error) { + return nil, helper.Unimplemented +} diff --git a/internal/service/remote/remotes.go b/internal/service/remote/remotes.go new file mode 100644 index 000000000..9847ed297 --- /dev/null +++ b/internal/service/remote/remotes.go @@ -0,0 +1,18 @@ +package remote + +import ( + "golang.org/x/net/context" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/internal/helper" +) + +// AddRemote adds a remote to the repository +func (s *server) AddRemote(context.Context, *pb.AddRemoteRequest) (*pb.AddRemoteResponse, error) { + return nil, helper.Unimplemented +} + +// RemoveRemote removes the given remote +func (s *server) RemoveRemote(context.Context, *pb.RemoveRemoteRequest) (*pb.RemoveRemoteResponse, error) { + return nil, helper.Unimplemented +} diff --git a/internal/service/remote/server.go b/internal/service/remote/server.go new file mode 100644 index 000000000..e215b87bb --- /dev/null +++ b/internal/service/remote/server.go @@ -0,0 +1,15 @@ +package remote + +import ( + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/internal/rubyserver" +) + +type server struct { + *rubyserver.Server +} + +// NewServer creates a new instance of a grpc RemoteServiceServer +func NewServer(rs *rubyserver.Server) pb.RemoteServiceServer { + return &server{rs} +} diff --git a/ruby/Gemfile b/ruby/Gemfile index c7e97d6b0..4f4189a03 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' -gem 'gitaly-proto', '~> 0.61.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.62.0', require: 'gitaly' gem 'activesupport' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index f58441829..7237a8917 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -17,7 +17,7 @@ GEM multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (0.61.0) + gitaly-proto (0.62.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -119,7 +119,7 @@ PLATFORMS DEPENDENCIES activesupport - gitaly-proto (~> 0.61.0) + gitaly-proto (~> 0.62.0) github-linguist (~> 4.7.0) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) diff --git a/ruby/lib/gitaly_server.rb b/ruby/lib/gitaly_server.rb index 7b109caa0..838a7a633 100644 --- a/ruby/lib/gitaly_server.rb +++ b/ruby/lib/gitaly_server.rb @@ -11,6 +11,7 @@ require_relative 'gitaly_server/operations_service.rb' require_relative 'gitaly_server/repository_service.rb' require_relative 'gitaly_server/wiki_service.rb' require_relative 'gitaly_server/conflicts_service.rb' +require_relative 'gitaly_server/remote_service.rb' module GitalyServer REPO_PATH_HEADER = 'gitaly-repo-path'.freeze @@ -42,5 +43,6 @@ module GitalyServer server.handle(RepositoryService.new) server.handle(WikiService.new) server.handle(ConflictsService.new) + server.handle(RemoteService.new) end end diff --git a/ruby/lib/gitaly_server/remote_service.rb b/ruby/lib/gitaly_server/remote_service.rb new file mode 100644 index 000000000..3e7e91d9b --- /dev/null +++ b/ruby/lib/gitaly_server/remote_service.rb @@ -0,0 +1,5 @@ +module GitalyServer + class RemoteService < Gitaly::RemoteService::Service + include Utils + end +end diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION index 0b0945503..4d74f3238 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION @@ -1 +1 @@ -0.61.0 +0.62.0 diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go index 223e17e09..9b478afae 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go @@ -14,6 +14,7 @@ It is generated from these files: notifications.proto operations.proto ref.proto + remote.proto repository-service.proto shared.proto smarthttp.proto @@ -129,6 +130,12 @@ It has these top-level messages: FindBranchResponse DeleteRefsRequest DeleteRefsResponse + AddRemoteRequest + AddRemoteResponse + RemoveRemoteRequest + RemoveRemoteResponse + FetchInternalRemoteRequest + FetchInternalRemoteResponse RepositoryExistsRequest RepositoryExistsResponse RepositoryIsEmptyRequest diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go index 00dee9745..a6144ac21 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/conflicts.pb.go @@ -18,10 +18,9 @@ var _ = fmt.Errorf var _ = math.Inf type ListConflictFilesRequest struct { - Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` - OurCommitOid string `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid" json:"our_commit_oid,omitempty"` - TargetRepository *Repository `protobuf:"bytes,3,opt,name=target_repository,json=targetRepository" json:"target_repository,omitempty"` - TheirCommitOid string `protobuf:"bytes,4,opt,name=their_commit_oid,json=theirCommitOid" json:"their_commit_oid,omitempty"` + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + OurCommitOid string `protobuf:"bytes,2,opt,name=our_commit_oid,json=ourCommitOid" json:"our_commit_oid,omitempty"` + TheirCommitOid string `protobuf:"bytes,3,opt,name=their_commit_oid,json=theirCommitOid" json:"their_commit_oid,omitempty"` } func (m *ListConflictFilesRequest) Reset() { *m = ListConflictFilesRequest{} } @@ -43,13 +42,6 @@ func (m *ListConflictFilesRequest) GetOurCommitOid() string { return "" } -func (m *ListConflictFilesRequest) GetTargetRepository() *Repository { - if m != nil { - return m.TargetRepository - } - return nil -} - func (m *ListConflictFilesRequest) GetTheirCommitOid() string { if m != nil { return m.TheirCommitOid @@ -622,41 +614,41 @@ var _ConflictsService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("conflicts.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 573 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xdd, 0x6a, 0x13, 0x41, - 0x18, 0xed, 0xb6, 0xf9, 0x69, 0xbe, 0x6e, 0xd3, 0x74, 0x50, 0xba, 0x0d, 0x84, 0x6e, 0xb7, 0x16, - 0x56, 0x2f, 0x82, 0x44, 0xef, 0x0b, 0x29, 0xd5, 0x20, 0x16, 0x65, 0xc4, 0x0b, 0x41, 0x58, 0xb6, - 0xbb, 0x5f, 0xb3, 0x23, 0x9b, 0x9d, 0x38, 0x33, 0x5b, 0xc8, 0xdb, 0xf8, 0x20, 0xbe, 0x81, 0x0f, - 0xe1, 0x63, 0x78, 0x2b, 0x99, 0xd9, 0xdd, 0xa4, 0x4d, 0x53, 0x41, 0x6f, 0xbc, 0x3d, 0xdf, 0xe1, - 0x3b, 0xe7, 0xcc, 0x77, 0x18, 0xd8, 0x8b, 0x78, 0x76, 0x9d, 0xb2, 0x48, 0xc9, 0xfe, 0x54, 0x70, - 0xc5, 0x49, 0x63, 0xcc, 0x54, 0x98, 0xce, 0xba, 0xb6, 0x4c, 0x42, 0x81, 0xb1, 0x41, 0xbd, 0x9f, - 0x16, 0x38, 0x6f, 0x99, 0x54, 0xe7, 0x05, 0xfb, 0x15, 0x4b, 0x51, 0x52, 0xfc, 0x9a, 0xa3, 0x54, - 0x64, 0x00, 0x20, 0x70, 0xca, 0x25, 0x53, 0x5c, 0xcc, 0x1c, 0xcb, 0xb5, 0xfc, 0x9d, 0x01, 0xe9, - 0x9b, 0x3d, 0x7d, 0x5a, 0x4d, 0xe8, 0x12, 0x8b, 0x3c, 0x81, 0x36, 0xcf, 0x45, 0x10, 0xf1, 0xc9, - 0x84, 0xa9, 0x80, 0xb3, 0xd8, 0xd9, 0x74, 0x2d, 0xbf, 0x45, 0x6d, 0x9e, 0x8b, 0x73, 0x0d, 0xbe, - 0x63, 0x31, 0x39, 0x83, 0x7d, 0x15, 0x8a, 0x31, 0xaa, 0x60, 0x49, 0x60, 0x6b, 0xad, 0x40, 0xc7, - 0x90, 0x17, 0x08, 0xf1, 0xa1, 0xa3, 0x12, 0x64, 0xb7, 0x84, 0x6a, 0x5a, 0xa8, 0xad, 0xf1, 0x4a, - 0xca, 0xfb, 0x6e, 0x01, 0x59, 0x4e, 0x37, 0xc2, 0x30, 0x46, 0xf1, 0x57, 0xd9, 0x7a, 0x00, 0x2b, - 0xb9, 0x5a, 0x51, 0x15, 0xaa, 0x07, 0x60, 0x3c, 0x4d, 0x43, 0x95, 0xe8, 0x34, 0x36, 0x6d, 0x69, - 0xe4, 0x7d, 0xa8, 0x12, 0x72, 0x08, 0xdb, 0xf3, 0x97, 0xd1, 0xc3, 0x9a, 0x1e, 0x36, 0x79, 0x7e, - 0x6b, 0x34, 0xe1, 0x31, 0x3a, 0x75, 0xd7, 0xf2, 0xeb, 0x7a, 0x74, 0xc9, 0x63, 0xf4, 0x66, 0x60, - 0x2f, 0xbb, 0x27, 0x2f, 0xa1, 0x91, 0xe8, 0x04, 0x85, 0xe7, 0x6e, 0xe9, 0x79, 0x35, 0xe3, 0x68, - 0x83, 0x16, 0x5c, 0xd2, 0x85, 0x66, 0xc4, 0x33, 0x85, 0x99, 0xd2, 0xb6, 0xed, 0xd1, 0x06, 0x2d, - 0x81, 0xe1, 0x01, 0x3c, 0x2e, 0xbb, 0x12, 0x5c, 0xb3, 0x14, 0x83, 0x69, 0x38, 0x4b, 0x79, 0x18, - 0x7b, 0xaf, 0xe1, 0xf0, 0x9e, 0x6a, 0xc8, 0x29, 0xcf, 0x24, 0x92, 0x67, 0x50, 0x9f, 0x93, 0xa5, - 0x63, 0xb9, 0x5b, 0xfe, 0xce, 0xe0, 0xd1, 0x7d, 0x36, 0xa8, 0xa1, 0x78, 0xbf, 0x36, 0xa1, 0x47, - 0x51, 0xf2, 0xf4, 0x06, 0xcb, 0x71, 0xd9, 0xb1, 0x7f, 0xb8, 0xc6, 0xff, 0xd6, 0x34, 0x72, 0x02, - 0xbb, 0x92, 0xe7, 0x22, 0xc2, 0xe0, 0x4a, 0x84, 0x59, 0x94, 0xe8, 0x53, 0xda, 0xd4, 0x36, 0xe0, - 0x50, 0x63, 0x73, 0x52, 0xe1, 0xa7, 0x20, 0x35, 0x0c, 0xc9, 0x80, 0x05, 0xe9, 0x14, 0xda, 0x85, - 0xda, 0x04, 0xa5, 0x0c, 0xc7, 0xe8, 0x34, 0x35, 0x6b, 0xd7, 0xa0, 0x97, 0x06, 0x24, 0x2e, 0xd4, - 0x72, 0x89, 0xc2, 0xd9, 0xd6, 0x71, 0xec, 0x32, 0xce, 0x47, 0x89, 0x82, 0xea, 0x89, 0xf7, 0xcd, - 0x82, 0x83, 0x35, 0x2f, 0x4f, 0xce, 0xee, 0x34, 0xe9, 0x74, 0xf1, 0x1c, 0x0f, 0x9c, 0x6a, 0xa9, - 0x54, 0x47, 0x00, 0xfa, 0xbe, 0xc1, 0x17, 0xc9, 0xb3, 0xaa, 0x57, 0x2d, 0x8d, 0xbd, 0x91, 0x3c, - 0x1b, 0x9e, 0xc0, 0xb1, 0x30, 0xbb, 0x82, 0xea, 0x37, 0x0a, 0x84, 0xd9, 0x56, 0xb5, 0xec, 0x02, - 0x9c, 0x55, 0xc1, 0xa2, 0x64, 0x4f, 0xa1, 0xa3, 0x17, 0xe4, 0x8a, 0xf1, 0x2c, 0x40, 0x21, 0xb8, - 0x31, 0xdb, 0xa2, 0x7b, 0x0b, 0xfc, 0x62, 0x0e, 0x0f, 0x7e, 0x58, 0xd0, 0xa9, 0x16, 0x7c, 0x40, - 0x71, 0xc3, 0x22, 0x24, 0x9f, 0x61, 0x7f, 0xa5, 0xc1, 0xc4, 0x2d, 0x73, 0xae, 0xfb, 0xf7, 0xba, - 0xc7, 0x0f, 0x30, 0x8c, 0x33, 0x6f, 0xe3, 0xb9, 0x45, 0x3e, 0x41, 0xe7, 0xae, 0x73, 0x72, 0xf4, - 0x87, 0x47, 0xec, 0xba, 0xeb, 0x09, 0xe5, 0x6a, 0xdf, 0xba, 0x6a, 0xe8, 0xdf, 0xf9, 0xc5, 0xef, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x74, 0x28, 0x6e, 0xc6, 0x05, 0x00, 0x00, + // 575 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xd1, 0x6a, 0x13, 0x41, + 0x14, 0x86, 0xbb, 0x6d, 0x93, 0x34, 0xa7, 0xdb, 0x34, 0x1d, 0x94, 0x6e, 0x03, 0xa1, 0xdb, 0xad, + 0x85, 0xd5, 0x8b, 0x20, 0xd1, 0xfb, 0x42, 0x4a, 0x35, 0x88, 0x45, 0x19, 0xf1, 0x42, 0x10, 0x96, + 0xed, 0xee, 0x69, 0x76, 0x64, 0xb3, 0x13, 0x67, 0x66, 0x0b, 0x79, 0x19, 0xf1, 0x41, 0x7c, 0x03, + 0x1f, 0xc8, 0x5b, 0xc9, 0xcc, 0xee, 0x26, 0x6d, 0x92, 0x2a, 0x7a, 0xfb, 0x9f, 0x8f, 0x73, 0xfe, + 0x33, 0xe7, 0x67, 0x60, 0x3f, 0xe2, 0xd9, 0x4d, 0xca, 0x22, 0x25, 0x7b, 0x13, 0xc1, 0x15, 0x27, + 0xf5, 0x11, 0x53, 0x61, 0x3a, 0xed, 0xd8, 0x32, 0x09, 0x05, 0xc6, 0x46, 0xf5, 0xbe, 0x59, 0xe0, + 0xbc, 0x65, 0x52, 0x5d, 0x14, 0xf4, 0x2b, 0x96, 0xa2, 0xa4, 0xf8, 0x35, 0x47, 0xa9, 0x48, 0x1f, + 0x40, 0xe0, 0x84, 0x4b, 0xa6, 0xb8, 0x98, 0x3a, 0x96, 0x6b, 0xf9, 0xbb, 0x7d, 0xd2, 0x33, 0x7d, + 0x7a, 0xb4, 0xaa, 0xd0, 0x05, 0x8a, 0x3c, 0x81, 0x16, 0xcf, 0x45, 0x10, 0xf1, 0xf1, 0x98, 0xa9, + 0x80, 0xb3, 0xd8, 0xd9, 0x74, 0x2d, 0xbf, 0x49, 0x6d, 0x9e, 0x8b, 0x0b, 0x2d, 0xbe, 0x63, 0x31, + 0xf1, 0xa1, 0xad, 0x12, 0x64, 0x77, 0xb8, 0x2d, 0xcd, 0xb5, 0xb4, 0x5e, 0x91, 0xde, 0x0f, 0x0b, + 0xc8, 0xa2, 0xb9, 0x21, 0x86, 0x31, 0x8a, 0x7f, 0xb2, 0xd6, 0x05, 0x58, 0xb2, 0xd5, 0x8c, 0x2a, + 0x4f, 0x5d, 0x00, 0xe3, 0x69, 0x12, 0xaa, 0x44, 0xbb, 0xb1, 0x69, 0x53, 0x2b, 0xef, 0x43, 0x95, + 0x90, 0x23, 0xd8, 0x99, 0x2d, 0xa6, 0x8b, 0xdb, 0xba, 0xd8, 0xe0, 0xf9, 0x9d, 0xd2, 0x98, 0xc7, + 0xe8, 0xd4, 0x5c, 0xcb, 0xaf, 0xe9, 0xd2, 0x15, 0x8f, 0xd1, 0x9b, 0x82, 0xbd, 0xe8, 0x9e, 0xbc, + 0x84, 0x7a, 0xa2, 0x37, 0x28, 0x3c, 0x77, 0x4a, 0xcf, 0xcb, 0x3b, 0x0e, 0x37, 0x68, 0xc1, 0x92, + 0x0e, 0x34, 0x22, 0x9e, 0x29, 0xcc, 0x94, 0xb6, 0x6d, 0x0f, 0x37, 0x68, 0x29, 0x0c, 0x0e, 0xe1, + 0x71, 0x79, 0xea, 0xe0, 0x86, 0xa5, 0x18, 0x4c, 0xc2, 0x69, 0xca, 0xc3, 0xd8, 0x7b, 0x0d, 0x47, + 0x2b, 0x2e, 0x2b, 0x27, 0x3c, 0x93, 0x48, 0x9e, 0x41, 0x6d, 0x06, 0x4b, 0xc7, 0x72, 0xb7, 0xfc, + 0xdd, 0xfe, 0xa3, 0x55, 0x36, 0xa8, 0x41, 0xbc, 0x5f, 0x9b, 0xd0, 0xa5, 0x28, 0x79, 0x7a, 0x8b, + 0x65, 0xb9, 0x8c, 0xc8, 0x7f, 0x5c, 0xe3, 0xef, 0x82, 0x72, 0x0e, 0x07, 0x2a, 0x14, 0x23, 0x54, + 0xc1, 0xc2, 0x80, 0xad, 0xb5, 0x03, 0xda, 0x06, 0x9e, 0x2b, 0x2b, 0x93, 0xb6, 0xbd, 0x2a, 0x69, + 0xe4, 0x14, 0xf6, 0x24, 0xcf, 0x45, 0x84, 0xc1, 0xb5, 0x08, 0xb3, 0x28, 0xd1, 0xa7, 0xb4, 0xa9, + 0x6d, 0xc4, 0x81, 0xd6, 0x66, 0x50, 0xe1, 0xa7, 0x80, 0xea, 0x06, 0x32, 0x62, 0x01, 0x9d, 0x41, + 0xab, 0x98, 0x36, 0x46, 0x29, 0xc3, 0x11, 0x3a, 0x0d, 0x4d, 0xed, 0x19, 0xf5, 0xca, 0x88, 0xc4, + 0x85, 0xed, 0x5c, 0xa2, 0x70, 0x76, 0xf4, 0x3a, 0x76, 0xb9, 0xce, 0x47, 0x89, 0x82, 0xea, 0x8a, + 0xf7, 0xdd, 0x82, 0xc3, 0x35, 0x2f, 0x4f, 0xce, 0xef, 0x25, 0xe9, 0x6c, 0xfe, 0x1c, 0x0f, 0x9c, + 0x6a, 0x21, 0x54, 0xc7, 0x00, 0xfa, 0xbe, 0xc1, 0x17, 0xc9, 0xb3, 0x2a, 0x57, 0x4d, 0xad, 0xbd, + 0x91, 0x3c, 0x1b, 0x9c, 0xc2, 0x89, 0x30, 0xbd, 0x82, 0xea, 0x33, 0x09, 0x84, 0xe9, 0x56, 0xa5, + 0xec, 0x12, 0x9c, 0xe5, 0x81, 0x45, 0xc8, 0x9e, 0x42, 0x5b, 0x37, 0xc8, 0x15, 0xe3, 0x59, 0x80, + 0x42, 0x70, 0x63, 0xb6, 0x49, 0xf7, 0xe7, 0xfa, 0xe5, 0x4c, 0xee, 0xff, 0xb4, 0xa0, 0x5d, 0x35, + 0xf8, 0x80, 0xe2, 0x96, 0x45, 0x48, 0x3e, 0xc3, 0xc1, 0x52, 0x82, 0x89, 0x5b, 0xee, 0xb9, 0xee, + 0xdb, 0xea, 0x9c, 0x3c, 0x40, 0x18, 0x67, 0xde, 0xc6, 0x73, 0x8b, 0x7c, 0x82, 0xf6, 0x7d, 0xe7, + 0xe4, 0xf8, 0x0f, 0x8f, 0xd8, 0x71, 0xd7, 0x03, 0x65, 0x6b, 0xdf, 0xba, 0xae, 0xeb, 0xcf, 0xf5, + 0xc5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xb1, 0x16, 0xeb, 0x85, 0x05, 0x00, 0x00, } diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/remote.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/remote.pb.go new file mode 100644 index 000000000..82b268a5c --- /dev/null +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/remote.pb.go @@ -0,0 +1,321 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: remote.proto + +package gitaly + +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" + +import ( + context "golang.org/x/net/context" + grpc "google.golang.org/grpc" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +type AddRemoteRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + Url string `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"` + // If set the remote is configured as a mirror with that mapping + MirrorRefmap string `protobuf:"bytes,4,opt,name=mirror_refmap,json=mirrorRefmap" json:"mirror_refmap,omitempty"` +} + +func (m *AddRemoteRequest) Reset() { *m = AddRemoteRequest{} } +func (m *AddRemoteRequest) String() string { return proto.CompactTextString(m) } +func (*AddRemoteRequest) ProtoMessage() {} +func (*AddRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} } + +func (m *AddRemoteRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *AddRemoteRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *AddRemoteRequest) GetUrl() string { + if m != nil { + return m.Url + } + return "" +} + +func (m *AddRemoteRequest) GetMirrorRefmap() string { + if m != nil { + return m.MirrorRefmap + } + return "" +} + +type AddRemoteResponse struct { +} + +func (m *AddRemoteResponse) Reset() { *m = AddRemoteResponse{} } +func (m *AddRemoteResponse) String() string { return proto.CompactTextString(m) } +func (*AddRemoteResponse) ProtoMessage() {} +func (*AddRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{1} } + +type RemoveRemoteRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` +} + +func (m *RemoveRemoteRequest) Reset() { *m = RemoveRemoteRequest{} } +func (m *RemoveRemoteRequest) String() string { return proto.CompactTextString(m) } +func (*RemoveRemoteRequest) ProtoMessage() {} +func (*RemoveRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{2} } + +func (m *RemoveRemoteRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *RemoveRemoteRequest) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +type RemoveRemoteResponse struct { + Result bool `protobuf:"varint,1,opt,name=result" json:"result,omitempty"` +} + +func (m *RemoveRemoteResponse) Reset() { *m = RemoveRemoteResponse{} } +func (m *RemoveRemoteResponse) String() string { return proto.CompactTextString(m) } +func (*RemoveRemoteResponse) ProtoMessage() {} +func (*RemoveRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{3} } + +func (m *RemoveRemoteResponse) GetResult() bool { + if m != nil { + return m.Result + } + return false +} + +type FetchInternalRemoteRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + RemoteRepository *Repository `protobuf:"bytes,2,opt,name=remote_repository,json=remoteRepository" json:"remote_repository,omitempty"` +} + +func (m *FetchInternalRemoteRequest) Reset() { *m = FetchInternalRemoteRequest{} } +func (m *FetchInternalRemoteRequest) String() string { return proto.CompactTextString(m) } +func (*FetchInternalRemoteRequest) ProtoMessage() {} +func (*FetchInternalRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{4} } + +func (m *FetchInternalRemoteRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *FetchInternalRemoteRequest) GetRemoteRepository() *Repository { + if m != nil { + return m.RemoteRepository + } + return nil +} + +type FetchInternalRemoteResponse struct { + Result bool `protobuf:"varint,1,opt,name=result" json:"result,omitempty"` +} + +func (m *FetchInternalRemoteResponse) Reset() { *m = FetchInternalRemoteResponse{} } +func (m *FetchInternalRemoteResponse) String() string { return proto.CompactTextString(m) } +func (*FetchInternalRemoteResponse) ProtoMessage() {} +func (*FetchInternalRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{5} } + +func (m *FetchInternalRemoteResponse) GetResult() bool { + if m != nil { + return m.Result + } + return false +} + +func init() { + proto.RegisterType((*AddRemoteRequest)(nil), "gitaly.AddRemoteRequest") + proto.RegisterType((*AddRemoteResponse)(nil), "gitaly.AddRemoteResponse") + proto.RegisterType((*RemoveRemoteRequest)(nil), "gitaly.RemoveRemoteRequest") + proto.RegisterType((*RemoveRemoteResponse)(nil), "gitaly.RemoveRemoteResponse") + proto.RegisterType((*FetchInternalRemoteRequest)(nil), "gitaly.FetchInternalRemoteRequest") + proto.RegisterType((*FetchInternalRemoteResponse)(nil), "gitaly.FetchInternalRemoteResponse") +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// Client API for RemoteService service + +type RemoteServiceClient interface { + AddRemote(ctx context.Context, in *AddRemoteRequest, opts ...grpc.CallOption) (*AddRemoteResponse, error) + FetchInternalRemote(ctx context.Context, in *FetchInternalRemoteRequest, opts ...grpc.CallOption) (*FetchInternalRemoteResponse, error) + RemoveRemote(ctx context.Context, in *RemoveRemoteRequest, opts ...grpc.CallOption) (*RemoveRemoteResponse, error) +} + +type remoteServiceClient struct { + cc *grpc.ClientConn +} + +func NewRemoteServiceClient(cc *grpc.ClientConn) RemoteServiceClient { + return &remoteServiceClient{cc} +} + +func (c *remoteServiceClient) AddRemote(ctx context.Context, in *AddRemoteRequest, opts ...grpc.CallOption) (*AddRemoteResponse, error) { + out := new(AddRemoteResponse) + err := grpc.Invoke(ctx, "/gitaly.RemoteService/AddRemote", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *remoteServiceClient) FetchInternalRemote(ctx context.Context, in *FetchInternalRemoteRequest, opts ...grpc.CallOption) (*FetchInternalRemoteResponse, error) { + out := new(FetchInternalRemoteResponse) + err := grpc.Invoke(ctx, "/gitaly.RemoteService/FetchInternalRemote", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *remoteServiceClient) RemoveRemote(ctx context.Context, in *RemoveRemoteRequest, opts ...grpc.CallOption) (*RemoveRemoteResponse, error) { + out := new(RemoveRemoteResponse) + err := grpc.Invoke(ctx, "/gitaly.RemoteService/RemoveRemote", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// Server API for RemoteService service + +type RemoteServiceServer interface { + AddRemote(context.Context, *AddRemoteRequest) (*AddRemoteResponse, error) + FetchInternalRemote(context.Context, *FetchInternalRemoteRequest) (*FetchInternalRemoteResponse, error) + RemoveRemote(context.Context, *RemoveRemoteRequest) (*RemoveRemoteResponse, error) +} + +func RegisterRemoteServiceServer(s *grpc.Server, srv RemoteServiceServer) { + s.RegisterService(&_RemoteService_serviceDesc, srv) +} + +func _RemoteService_AddRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AddRemoteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RemoteServiceServer).AddRemote(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RemoteService/AddRemote", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RemoteServiceServer).AddRemote(ctx, req.(*AddRemoteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _RemoteService_FetchInternalRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FetchInternalRemoteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RemoteServiceServer).FetchInternalRemote(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RemoteService/FetchInternalRemote", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RemoteServiceServer).FetchInternalRemote(ctx, req.(*FetchInternalRemoteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _RemoteService_RemoveRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RemoveRemoteRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RemoteServiceServer).RemoveRemote(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RemoteService/RemoveRemote", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RemoteServiceServer).RemoveRemote(ctx, req.(*RemoveRemoteRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _RemoteService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "gitaly.RemoteService", + HandlerType: (*RemoteServiceServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "AddRemote", + Handler: _RemoteService_AddRemote_Handler, + }, + { + MethodName: "FetchInternalRemote", + Handler: _RemoteService_FetchInternalRemote_Handler, + }, + { + MethodName: "RemoveRemote", + Handler: _RemoteService_RemoveRemote_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "remote.proto", +} + +func init() { proto.RegisterFile("remote.proto", fileDescriptor9) } + +var fileDescriptor9 = []byte{ + // 323 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x41, 0x4f, 0xf2, 0x40, + 0x10, 0xfd, 0x0a, 0x84, 0x7c, 0x8c, 0x25, 0x81, 0xc1, 0x98, 0x5a, 0x3c, 0x90, 0x72, 0xe1, 0xd4, + 0x03, 0xc6, 0xb3, 0xd1, 0x83, 0x89, 0xf1, 0xb6, 0x9e, 0x0d, 0x56, 0x18, 0xa5, 0x49, 0xdb, 0xad, + 0xb3, 0x0b, 0x09, 0x57, 0xff, 0x81, 0xff, 0xd8, 0xb0, 0x4b, 0x6b, 0xd5, 0xc2, 0xc5, 0x78, 0xdb, + 0xbe, 0x99, 0x37, 0xef, 0x75, 0xde, 0x2e, 0xb8, 0x4c, 0xa9, 0xd4, 0x14, 0xe6, 0x2c, 0xb5, 0xc4, + 0xf6, 0x4b, 0xac, 0xa3, 0x64, 0xe3, 0xbb, 0x6a, 0x19, 0x31, 0x2d, 0x2c, 0x1a, 0xbc, 0x3b, 0xd0, + 0xbb, 0x5a, 0x2c, 0x84, 0xe9, 0x14, 0xf4, 0xba, 0x22, 0xa5, 0x71, 0x0a, 0xc0, 0x94, 0x4b, 0x15, + 0x6b, 0xc9, 0x1b, 0xcf, 0x19, 0x39, 0x93, 0xa3, 0x29, 0x86, 0x96, 0x1f, 0x8a, 0xb2, 0x22, 0x2a, + 0x5d, 0x88, 0xd0, 0xca, 0xa2, 0x94, 0xbc, 0xc6, 0xc8, 0x99, 0x74, 0x84, 0x39, 0x63, 0x0f, 0x9a, + 0x2b, 0x4e, 0xbc, 0xa6, 0x81, 0xb6, 0x47, 0x1c, 0x43, 0x37, 0x8d, 0x99, 0x25, 0xcf, 0x98, 0x9e, + 0xd3, 0x28, 0xf7, 0x5a, 0xa6, 0xe6, 0x5a, 0x50, 0x18, 0x2c, 0x18, 0x40, 0xbf, 0x62, 0x49, 0xe5, + 0x32, 0x53, 0x14, 0x3c, 0xc0, 0x60, 0x8b, 0xac, 0xe9, 0x4f, 0xac, 0x06, 0x21, 0x1c, 0x7f, 0x1d, + 0x6f, 0x65, 0xf1, 0x04, 0xda, 0x4c, 0x6a, 0x95, 0x68, 0x33, 0xfb, 0xbf, 0xd8, 0x7d, 0x6d, 0xf7, + 0xe6, 0xdf, 0x90, 0x9e, 0x2f, 0x6f, 0x33, 0x4d, 0x9c, 0x45, 0xc9, 0xef, 0x6d, 0x5d, 0x42, 0xdf, + 0x06, 0x36, 0xab, 0x50, 0x1b, 0x7b, 0xa9, 0x3d, 0xde, 0x29, 0x16, 0x48, 0x70, 0x01, 0xc3, 0x5a, + 0x4b, 0x87, 0x7f, 0x65, 0xfa, 0xd6, 0x80, 0xae, 0x6d, 0xbd, 0x27, 0x5e, 0xc7, 0x73, 0xc2, 0x6b, + 0xe8, 0x94, 0x01, 0xa0, 0x57, 0x68, 0x7f, 0xbf, 0x26, 0xfe, 0x69, 0x4d, 0x65, 0x97, 0xd6, 0x3f, + 0x7c, 0x84, 0x41, 0x8d, 0x19, 0x0c, 0x0a, 0xce, 0xfe, 0xe5, 0xf9, 0xe3, 0x83, 0x3d, 0xa5, 0xc2, + 0x1d, 0xb8, 0xd5, 0xc8, 0x70, 0xf8, 0xb9, 0xa4, 0x1f, 0xf7, 0xc4, 0x3f, 0xab, 0x2f, 0x16, 0xc3, + 0x9e, 0xda, 0xe6, 0x39, 0x9c, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0x24, 0x14, 0x1d, 0x67, 0x34, + 0x03, 0x00, 0x00, +} diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go index cbeefde3e..8016e58ef 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go @@ -42,7 +42,9 @@ var GetArchiveRequest_Format_value = map[string]int32{ func (x GetArchiveRequest_Format) String() string { return proto.EnumName(GetArchiveRequest_Format_name, int32(x)) } -func (GetArchiveRequest_Format) EnumDescriptor() ([]byte, []int) { return fileDescriptor9, []int{18, 0} } +func (GetArchiveRequest_Format) EnumDescriptor() ([]byte, []int) { + return fileDescriptor10, []int{18, 0} +} type RepositoryExistsRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -51,7 +53,7 @@ type RepositoryExistsRequest struct { func (m *RepositoryExistsRequest) Reset() { *m = RepositoryExistsRequest{} } func (m *RepositoryExistsRequest) String() string { return proto.CompactTextString(m) } func (*RepositoryExistsRequest) ProtoMessage() {} -func (*RepositoryExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{0} } +func (*RepositoryExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} } func (m *RepositoryExistsRequest) GetRepository() *Repository { if m != nil { @@ -67,7 +69,7 @@ type RepositoryExistsResponse struct { func (m *RepositoryExistsResponse) Reset() { *m = RepositoryExistsResponse{} } func (m *RepositoryExistsResponse) String() string { return proto.CompactTextString(m) } func (*RepositoryExistsResponse) ProtoMessage() {} -func (*RepositoryExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{1} } +func (*RepositoryExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{1} } func (m *RepositoryExistsResponse) GetExists() bool { if m != nil { @@ -83,7 +85,7 @@ type RepositoryIsEmptyRequest struct { func (m *RepositoryIsEmptyRequest) Reset() { *m = RepositoryIsEmptyRequest{} } func (m *RepositoryIsEmptyRequest) String() string { return proto.CompactTextString(m) } func (*RepositoryIsEmptyRequest) ProtoMessage() {} -func (*RepositoryIsEmptyRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{2} } +func (*RepositoryIsEmptyRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{2} } func (m *RepositoryIsEmptyRequest) GetRepository() *Repository { if m != nil { @@ -99,7 +101,7 @@ type RepositoryIsEmptyResponse struct { func (m *RepositoryIsEmptyResponse) Reset() { *m = RepositoryIsEmptyResponse{} } func (m *RepositoryIsEmptyResponse) String() string { return proto.CompactTextString(m) } func (*RepositoryIsEmptyResponse) ProtoMessage() {} -func (*RepositoryIsEmptyResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{3} } +func (*RepositoryIsEmptyResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{3} } func (m *RepositoryIsEmptyResponse) GetIsEmpty() bool { if m != nil { @@ -115,7 +117,7 @@ type RepackIncrementalRequest struct { func (m *RepackIncrementalRequest) Reset() { *m = RepackIncrementalRequest{} } func (m *RepackIncrementalRequest) String() string { return proto.CompactTextString(m) } func (*RepackIncrementalRequest) ProtoMessage() {} -func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{4} } +func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{4} } func (m *RepackIncrementalRequest) GetRepository() *Repository { if m != nil { @@ -130,7 +132,7 @@ type RepackIncrementalResponse struct { func (m *RepackIncrementalResponse) Reset() { *m = RepackIncrementalResponse{} } func (m *RepackIncrementalResponse) String() string { return proto.CompactTextString(m) } func (*RepackIncrementalResponse) ProtoMessage() {} -func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{5} } +func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{5} } type RepackFullRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -140,7 +142,7 @@ type RepackFullRequest struct { func (m *RepackFullRequest) Reset() { *m = RepackFullRequest{} } func (m *RepackFullRequest) String() string { return proto.CompactTextString(m) } func (*RepackFullRequest) ProtoMessage() {} -func (*RepackFullRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{6} } +func (*RepackFullRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{6} } func (m *RepackFullRequest) GetRepository() *Repository { if m != nil { @@ -162,7 +164,7 @@ type RepackFullResponse struct { func (m *RepackFullResponse) Reset() { *m = RepackFullResponse{} } func (m *RepackFullResponse) String() string { return proto.CompactTextString(m) } func (*RepackFullResponse) ProtoMessage() {} -func (*RepackFullResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{7} } +func (*RepackFullResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{7} } type GarbageCollectRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -172,7 +174,7 @@ type GarbageCollectRequest struct { func (m *GarbageCollectRequest) Reset() { *m = GarbageCollectRequest{} } func (m *GarbageCollectRequest) String() string { return proto.CompactTextString(m) } func (*GarbageCollectRequest) ProtoMessage() {} -func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{8} } +func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{8} } func (m *GarbageCollectRequest) GetRepository() *Repository { if m != nil { @@ -194,7 +196,7 @@ type GarbageCollectResponse struct { func (m *GarbageCollectResponse) Reset() { *m = GarbageCollectResponse{} } func (m *GarbageCollectResponse) String() string { return proto.CompactTextString(m) } func (*GarbageCollectResponse) ProtoMessage() {} -func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{9} } +func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{9} } type RepositorySizeRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -203,7 +205,7 @@ type RepositorySizeRequest struct { func (m *RepositorySizeRequest) Reset() { *m = RepositorySizeRequest{} } func (m *RepositorySizeRequest) String() string { return proto.CompactTextString(m) } func (*RepositorySizeRequest) ProtoMessage() {} -func (*RepositorySizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{10} } +func (*RepositorySizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{10} } func (m *RepositorySizeRequest) GetRepository() *Repository { if m != nil { @@ -220,7 +222,7 @@ type RepositorySizeResponse struct { func (m *RepositorySizeResponse) Reset() { *m = RepositorySizeResponse{} } func (m *RepositorySizeResponse) String() string { return proto.CompactTextString(m) } func (*RepositorySizeResponse) ProtoMessage() {} -func (*RepositorySizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{11} } +func (*RepositorySizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{11} } func (m *RepositorySizeResponse) GetSize() int64 { if m != nil { @@ -237,7 +239,7 @@ type ApplyGitattributesRequest struct { func (m *ApplyGitattributesRequest) Reset() { *m = ApplyGitattributesRequest{} } func (m *ApplyGitattributesRequest) String() string { return proto.CompactTextString(m) } func (*ApplyGitattributesRequest) ProtoMessage() {} -func (*ApplyGitattributesRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{12} } +func (*ApplyGitattributesRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{12} } func (m *ApplyGitattributesRequest) GetRepository() *Repository { if m != nil { @@ -259,7 +261,7 @@ type ApplyGitattributesResponse struct { func (m *ApplyGitattributesResponse) Reset() { *m = ApplyGitattributesResponse{} } func (m *ApplyGitattributesResponse) String() string { return proto.CompactTextString(m) } func (*ApplyGitattributesResponse) ProtoMessage() {} -func (*ApplyGitattributesResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{13} } +func (*ApplyGitattributesResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{13} } type FetchRemoteRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -274,7 +276,7 @@ type FetchRemoteRequest struct { func (m *FetchRemoteRequest) Reset() { *m = FetchRemoteRequest{} } func (m *FetchRemoteRequest) String() string { return proto.CompactTextString(m) } func (*FetchRemoteRequest) ProtoMessage() {} -func (*FetchRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{14} } +func (*FetchRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{14} } func (m *FetchRemoteRequest) GetRepository() *Repository { if m != nil { @@ -331,7 +333,7 @@ type FetchRemoteResponse struct { func (m *FetchRemoteResponse) Reset() { *m = FetchRemoteResponse{} } func (m *FetchRemoteResponse) String() string { return proto.CompactTextString(m) } func (*FetchRemoteResponse) ProtoMessage() {} -func (*FetchRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{15} } +func (*FetchRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{15} } type CreateRepositoryRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -340,7 +342,7 @@ type CreateRepositoryRequest struct { func (m *CreateRepositoryRequest) Reset() { *m = CreateRepositoryRequest{} } func (m *CreateRepositoryRequest) String() string { return proto.CompactTextString(m) } func (*CreateRepositoryRequest) ProtoMessage() {} -func (*CreateRepositoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{16} } +func (*CreateRepositoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{16} } func (m *CreateRepositoryRequest) GetRepository() *Repository { if m != nil { @@ -355,7 +357,7 @@ type CreateRepositoryResponse struct { func (m *CreateRepositoryResponse) Reset() { *m = CreateRepositoryResponse{} } func (m *CreateRepositoryResponse) String() string { return proto.CompactTextString(m) } func (*CreateRepositoryResponse) ProtoMessage() {} -func (*CreateRepositoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{17} } +func (*CreateRepositoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{17} } type GetArchiveRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -367,7 +369,7 @@ type GetArchiveRequest struct { func (m *GetArchiveRequest) Reset() { *m = GetArchiveRequest{} } func (m *GetArchiveRequest) String() string { return proto.CompactTextString(m) } func (*GetArchiveRequest) ProtoMessage() {} -func (*GetArchiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{18} } +func (*GetArchiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{18} } func (m *GetArchiveRequest) GetRepository() *Repository { if m != nil { @@ -404,7 +406,7 @@ type GetArchiveResponse struct { func (m *GetArchiveResponse) Reset() { *m = GetArchiveResponse{} } func (m *GetArchiveResponse) String() string { return proto.CompactTextString(m) } func (*GetArchiveResponse) ProtoMessage() {} -func (*GetArchiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{19} } +func (*GetArchiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{19} } func (m *GetArchiveResponse) GetData() []byte { if m != nil { @@ -420,7 +422,7 @@ type HasLocalBranchesRequest struct { func (m *HasLocalBranchesRequest) Reset() { *m = HasLocalBranchesRequest{} } func (m *HasLocalBranchesRequest) String() string { return proto.CompactTextString(m) } func (*HasLocalBranchesRequest) ProtoMessage() {} -func (*HasLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{20} } +func (*HasLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{20} } func (m *HasLocalBranchesRequest) GetRepository() *Repository { if m != nil { @@ -436,7 +438,7 @@ type HasLocalBranchesResponse struct { func (m *HasLocalBranchesResponse) Reset() { *m = HasLocalBranchesResponse{} } func (m *HasLocalBranchesResponse) String() string { return proto.CompactTextString(m) } func (*HasLocalBranchesResponse) ProtoMessage() {} -func (*HasLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{21} } +func (*HasLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{21} } func (m *HasLocalBranchesResponse) GetValue() bool { if m != nil { @@ -453,7 +455,7 @@ type ChangeStorageRequest struct { func (m *ChangeStorageRequest) Reset() { *m = ChangeStorageRequest{} } func (m *ChangeStorageRequest) String() string { return proto.CompactTextString(m) } func (*ChangeStorageRequest) ProtoMessage() {} -func (*ChangeStorageRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{22} } +func (*ChangeStorageRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{22} } func (m *ChangeStorageRequest) GetRepository() *Repository { if m != nil { @@ -475,7 +477,7 @@ type ChangeStorageResponse struct { func (m *ChangeStorageResponse) Reset() { *m = ChangeStorageResponse{} } func (m *ChangeStorageResponse) String() string { return proto.CompactTextString(m) } func (*ChangeStorageResponse) ProtoMessage() {} -func (*ChangeStorageResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{23} } +func (*ChangeStorageResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{23} } type FetchSourceBranchRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -487,7 +489,7 @@ type FetchSourceBranchRequest struct { func (m *FetchSourceBranchRequest) Reset() { *m = FetchSourceBranchRequest{} } func (m *FetchSourceBranchRequest) String() string { return proto.CompactTextString(m) } func (*FetchSourceBranchRequest) ProtoMessage() {} -func (*FetchSourceBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{24} } +func (*FetchSourceBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{24} } func (m *FetchSourceBranchRequest) GetRepository() *Repository { if m != nil { @@ -524,7 +526,7 @@ type FetchSourceBranchResponse struct { func (m *FetchSourceBranchResponse) Reset() { *m = FetchSourceBranchResponse{} } func (m *FetchSourceBranchResponse) String() string { return proto.CompactTextString(m) } func (*FetchSourceBranchResponse) ProtoMessage() {} -func (*FetchSourceBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{25} } +func (*FetchSourceBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{25} } func (m *FetchSourceBranchResponse) GetResult() bool { if m != nil { @@ -540,7 +542,7 @@ type FsckRequest struct { func (m *FsckRequest) Reset() { *m = FsckRequest{} } func (m *FsckRequest) String() string { return proto.CompactTextString(m) } func (*FsckRequest) ProtoMessage() {} -func (*FsckRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{26} } +func (*FsckRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{26} } func (m *FsckRequest) GetRepository() *Repository { if m != nil { @@ -556,7 +558,7 @@ type FsckResponse struct { func (m *FsckResponse) Reset() { *m = FsckResponse{} } func (m *FsckResponse) String() string { return proto.CompactTextString(m) } func (*FsckResponse) ProtoMessage() {} -func (*FsckResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{27} } +func (*FsckResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{27} } func (m *FsckResponse) GetError() []byte { if m != nil { @@ -575,7 +577,7 @@ type WriteRefRequest struct { func (m *WriteRefRequest) Reset() { *m = WriteRefRequest{} } func (m *WriteRefRequest) String() string { return proto.CompactTextString(m) } func (*WriteRefRequest) ProtoMessage() {} -func (*WriteRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{28} } +func (*WriteRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{28} } func (m *WriteRefRequest) GetRepository() *Repository { if m != nil { @@ -612,7 +614,7 @@ type WriteRefResponse struct { func (m *WriteRefResponse) Reset() { *m = WriteRefResponse{} } func (m *WriteRefResponse) String() string { return proto.CompactTextString(m) } func (*WriteRefResponse) ProtoMessage() {} -func (*WriteRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{29} } +func (*WriteRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{29} } func (m *WriteRefResponse) GetError() []byte { if m != nil { @@ -632,7 +634,7 @@ type FindMergeBaseRequest struct { func (m *FindMergeBaseRequest) Reset() { *m = FindMergeBaseRequest{} } func (m *FindMergeBaseRequest) String() string { return proto.CompactTextString(m) } func (*FindMergeBaseRequest) ProtoMessage() {} -func (*FindMergeBaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{30} } +func (*FindMergeBaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{30} } func (m *FindMergeBaseRequest) GetRepository() *Repository { if m != nil { @@ -655,7 +657,7 @@ type FindMergeBaseResponse struct { func (m *FindMergeBaseResponse) Reset() { *m = FindMergeBaseResponse{} } func (m *FindMergeBaseResponse) String() string { return proto.CompactTextString(m) } func (*FindMergeBaseResponse) ProtoMessage() {} -func (*FindMergeBaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor9, []int{31} } +func (*FindMergeBaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{31} } func (m *FindMergeBaseResponse) GetBase() string { if m != nil { @@ -1295,9 +1297,9 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ Metadata: "repository-service.proto", } -func init() { proto.RegisterFile("repository-service.proto", fileDescriptor9) } +func init() { proto.RegisterFile("repository-service.proto", fileDescriptor10) } -var fileDescriptor9 = []byte{ +var fileDescriptor10 = []byte{ // 1137 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x4e, 0xe3, 0x46, 0x14, 0x4e, 0x08, 0x24, 0xe4, 0x90, 0xdd, 0x86, 0xd9, 0x00, 0xc6, 0x40, 0x97, 0x4e, 0x7b, 0x81, diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go index 7b3888ed3..9f9539c09 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/shared.pb.go @@ -30,7 +30,7 @@ type Repository struct { func (m *Repository) Reset() { *m = Repository{} } func (m *Repository) String() string { return proto.CompactTextString(m) } func (*Repository) ProtoMessage() {} -func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{0} } +func (*Repository) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} } func (m *Repository) GetStorageName() string { if m != nil { @@ -80,7 +80,7 @@ type GitCommit struct { func (m *GitCommit) Reset() { *m = GitCommit{} } func (m *GitCommit) String() string { return proto.CompactTextString(m) } func (*GitCommit) ProtoMessage() {} -func (*GitCommit) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{1} } +func (*GitCommit) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{1} } func (m *GitCommit) GetId() string { if m != nil { @@ -133,7 +133,7 @@ type CommitAuthor struct { func (m *CommitAuthor) Reset() { *m = CommitAuthor{} } func (m *CommitAuthor) String() string { return proto.CompactTextString(m) } func (*CommitAuthor) ProtoMessage() {} -func (*CommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{2} } +func (*CommitAuthor) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{2} } func (m *CommitAuthor) GetName() []byte { if m != nil { @@ -163,7 +163,7 @@ type ExitStatus struct { func (m *ExitStatus) Reset() { *m = ExitStatus{} } func (m *ExitStatus) String() string { return proto.CompactTextString(m) } func (*ExitStatus) ProtoMessage() {} -func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{3} } +func (*ExitStatus) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{3} } func (m *ExitStatus) GetValue() int32 { if m != nil { @@ -181,7 +181,7 @@ type Branch struct { func (m *Branch) Reset() { *m = Branch{} } func (m *Branch) String() string { return proto.CompactTextString(m) } func (*Branch) ProtoMessage() {} -func (*Branch) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{4} } +func (*Branch) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{4} } func (m *Branch) GetName() []byte { if m != nil { @@ -207,7 +207,7 @@ type Tag struct { func (m *Tag) Reset() { *m = Tag{} } func (m *Tag) String() string { return proto.CompactTextString(m) } func (*Tag) ProtoMessage() {} -func (*Tag) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{5} } +func (*Tag) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{5} } func (m *Tag) GetName() []byte { if m != nil { @@ -247,7 +247,7 @@ type User struct { func (m *User) Reset() { *m = User{} } func (m *User) String() string { return proto.CompactTextString(m) } func (*User) ProtoMessage() {} -func (*User) Descriptor() ([]byte, []int) { return fileDescriptor10, []int{6} } +func (*User) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{6} } func (m *User) GetGlId() string { if m != nil { @@ -287,9 +287,9 @@ func init() { proto.RegisterType((*User)(nil), "gitaly.User") } -func init() { proto.RegisterFile("shared.proto", fileDescriptor10) } +func init() { proto.RegisterFile("shared.proto", fileDescriptor11) } -var fileDescriptor10 = []byte{ +var fileDescriptor11 = []byte{ // 518 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0x55, 0x1c, 0xc7, 0x90, 0x89, 0x8b, 0x60, 0xc9, 0xc1, 0xaa, 0x54, 0x35, 0x98, 0x4b, 0x0f, diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go index e4c89e4a4..3e5606f55 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/smarthttp.pb.go @@ -26,7 +26,7 @@ type InfoRefsRequest struct { func (m *InfoRefsRequest) Reset() { *m = InfoRefsRequest{} } func (m *InfoRefsRequest) String() string { return proto.CompactTextString(m) } func (*InfoRefsRequest) ProtoMessage() {} -func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{0} } +func (*InfoRefsRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} } func (m *InfoRefsRequest) GetRepository() *Repository { if m != nil { @@ -49,7 +49,7 @@ type InfoRefsResponse struct { func (m *InfoRefsResponse) Reset() { *m = InfoRefsResponse{} } func (m *InfoRefsResponse) String() string { return proto.CompactTextString(m) } func (*InfoRefsResponse) ProtoMessage() {} -func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{1} } +func (*InfoRefsResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{1} } func (m *InfoRefsResponse) GetData() []byte { if m != nil { @@ -70,7 +70,7 @@ type PostUploadPackRequest struct { func (m *PostUploadPackRequest) Reset() { *m = PostUploadPackRequest{} } func (m *PostUploadPackRequest) String() string { return proto.CompactTextString(m) } func (*PostUploadPackRequest) ProtoMessage() {} -func (*PostUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{2} } +func (*PostUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{2} } func (m *PostUploadPackRequest) GetRepository() *Repository { if m != nil { @@ -101,7 +101,7 @@ type PostUploadPackResponse struct { func (m *PostUploadPackResponse) Reset() { *m = PostUploadPackResponse{} } func (m *PostUploadPackResponse) String() string { return proto.CompactTextString(m) } func (*PostUploadPackResponse) ProtoMessage() {} -func (*PostUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{3} } +func (*PostUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{3} } func (m *PostUploadPackResponse) GetData() []byte { if m != nil { @@ -125,7 +125,7 @@ type PostReceivePackRequest struct { func (m *PostReceivePackRequest) Reset() { *m = PostReceivePackRequest{} } func (m *PostReceivePackRequest) String() string { return proto.CompactTextString(m) } func (*PostReceivePackRequest) ProtoMessage() {} -func (*PostReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{4} } +func (*PostReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{4} } func (m *PostReceivePackRequest) GetRepository() *Repository { if m != nil { @@ -170,7 +170,7 @@ type PostReceivePackResponse struct { func (m *PostReceivePackResponse) Reset() { *m = PostReceivePackResponse{} } func (m *PostReceivePackResponse) String() string { return proto.CompactTextString(m) } func (*PostReceivePackResponse) ProtoMessage() {} -func (*PostReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor11, []int{5} } +func (*PostReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{5} } func (m *PostReceivePackResponse) GetData() []byte { if m != nil { @@ -485,9 +485,9 @@ var _SmartHTTPService_serviceDesc = grpc.ServiceDesc{ Metadata: "smarthttp.proto", } -func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor11) } +func init() { proto.RegisterFile("smarthttp.proto", fileDescriptor12) } -var fileDescriptor11 = []byte{ +var fileDescriptor12 = []byte{ // 386 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xdd, 0xee, 0xd2, 0x40, 0x10, 0xc5, 0x5d, 0xbe, 0x12, 0x06, 0x14, 0x32, 0x44, 0x69, 0x9a, 0x28, 0xa4, 0x26, 0xa6, 0x17, diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go index 32049ed9c..f8d0df494 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/ssh.pb.go @@ -29,7 +29,7 @@ type SSHUploadPackRequest struct { func (m *SSHUploadPackRequest) Reset() { *m = SSHUploadPackRequest{} } func (m *SSHUploadPackRequest) String() string { return proto.CompactTextString(m) } func (*SSHUploadPackRequest) ProtoMessage() {} -func (*SSHUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{0} } +func (*SSHUploadPackRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{0} } func (m *SSHUploadPackRequest) GetRepository() *Repository { if m != nil { @@ -65,7 +65,7 @@ type SSHUploadPackResponse struct { func (m *SSHUploadPackResponse) Reset() { *m = SSHUploadPackResponse{} } func (m *SSHUploadPackResponse) String() string { return proto.CompactTextString(m) } func (*SSHUploadPackResponse) ProtoMessage() {} -func (*SSHUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{1} } +func (*SSHUploadPackResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{1} } func (m *SSHUploadPackResponse) GetStdout() []byte { if m != nil { @@ -103,7 +103,7 @@ type SSHReceivePackRequest struct { func (m *SSHReceivePackRequest) Reset() { *m = SSHReceivePackRequest{} } func (m *SSHReceivePackRequest) String() string { return proto.CompactTextString(m) } func (*SSHReceivePackRequest) ProtoMessage() {} -func (*SSHReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{2} } +func (*SSHReceivePackRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{2} } func (m *SSHReceivePackRequest) GetRepository() *Repository { if m != nil { @@ -153,7 +153,7 @@ type SSHReceivePackResponse struct { func (m *SSHReceivePackResponse) Reset() { *m = SSHReceivePackResponse{} } func (m *SSHReceivePackResponse) String() string { return proto.CompactTextString(m) } func (*SSHReceivePackResponse) ProtoMessage() {} -func (*SSHReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor12, []int{3} } +func (*SSHReceivePackResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{3} } func (m *SSHReceivePackResponse) GetStdout() []byte { if m != nil { @@ -356,9 +356,9 @@ var _SSHService_serviceDesc = grpc.ServiceDesc{ Metadata: "ssh.proto", } -func init() { proto.RegisterFile("ssh.proto", fileDescriptor12) } +func init() { proto.RegisterFile("ssh.proto", fileDescriptor13) } -var fileDescriptor12 = []byte{ +var fileDescriptor13 = []byte{ // 377 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xcd, 0xce, 0xd2, 0x40, 0x14, 0x75, 0xa4, 0x10, 0xb9, 0xf4, 0x33, 0x64, 0x04, 0xd2, 0x10, 0x7f, 0x48, 0xdd, 0x74, 0x61, diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go index 62a5dc4d6..42a8cc766 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go @@ -26,7 +26,7 @@ type WikiCommitDetails struct { func (m *WikiCommitDetails) Reset() { *m = WikiCommitDetails{} } func (m *WikiCommitDetails) String() string { return proto.CompactTextString(m) } func (*WikiCommitDetails) ProtoMessage() {} -func (*WikiCommitDetails) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{0} } +func (*WikiCommitDetails) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{0} } func (m *WikiCommitDetails) GetName() []byte { if m != nil { @@ -57,7 +57,7 @@ type WikiPageVersion struct { func (m *WikiPageVersion) Reset() { *m = WikiPageVersion{} } func (m *WikiPageVersion) String() string { return proto.CompactTextString(m) } func (*WikiPageVersion) ProtoMessage() {} -func (*WikiPageVersion) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{1} } +func (*WikiPageVersion) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{1} } func (m *WikiPageVersion) GetCommit() *GitCommit { if m != nil { @@ -89,7 +89,7 @@ type WikiPage struct { func (m *WikiPage) Reset() { *m = WikiPage{} } func (m *WikiPage) String() string { return proto.CompactTextString(m) } func (*WikiPage) ProtoMessage() {} -func (*WikiPage) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{2} } +func (*WikiPage) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{2} } func (m *WikiPage) GetVersion() *WikiPageVersion { if m != nil { @@ -155,7 +155,7 @@ type WikiGetPageVersionsRequest struct { func (m *WikiGetPageVersionsRequest) Reset() { *m = WikiGetPageVersionsRequest{} } func (m *WikiGetPageVersionsRequest) String() string { return proto.CompactTextString(m) } func (*WikiGetPageVersionsRequest) ProtoMessage() {} -func (*WikiGetPageVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{3} } +func (*WikiGetPageVersionsRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{3} } func (m *WikiGetPageVersionsRequest) GetRepository() *Repository { if m != nil { @@ -178,7 +178,7 @@ type WikiGetPageVersionsResponse struct { func (m *WikiGetPageVersionsResponse) Reset() { *m = WikiGetPageVersionsResponse{} } func (m *WikiGetPageVersionsResponse) String() string { return proto.CompactTextString(m) } func (*WikiGetPageVersionsResponse) ProtoMessage() {} -func (*WikiGetPageVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{4} } +func (*WikiGetPageVersionsResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{4} } func (m *WikiGetPageVersionsResponse) GetVersions() []*WikiPageVersion { if m != nil { @@ -201,7 +201,7 @@ type WikiWritePageRequest struct { func (m *WikiWritePageRequest) Reset() { *m = WikiWritePageRequest{} } func (m *WikiWritePageRequest) String() string { return proto.CompactTextString(m) } func (*WikiWritePageRequest) ProtoMessage() {} -func (*WikiWritePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{5} } +func (*WikiWritePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{5} } func (m *WikiWritePageRequest) GetRepository() *Repository { if m != nil { @@ -245,7 +245,7 @@ type WikiWritePageResponse struct { func (m *WikiWritePageResponse) Reset() { *m = WikiWritePageResponse{} } func (m *WikiWritePageResponse) String() string { return proto.CompactTextString(m) } func (*WikiWritePageResponse) ProtoMessage() {} -func (*WikiWritePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{6} } +func (*WikiWritePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{6} } func (m *WikiWritePageResponse) GetDuplicateError() []byte { if m != nil { @@ -268,7 +268,7 @@ type WikiUpdatePageRequest struct { func (m *WikiUpdatePageRequest) Reset() { *m = WikiUpdatePageRequest{} } func (m *WikiUpdatePageRequest) String() string { return proto.CompactTextString(m) } func (*WikiUpdatePageRequest) ProtoMessage() {} -func (*WikiUpdatePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{7} } +func (*WikiUpdatePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{7} } func (m *WikiUpdatePageRequest) GetRepository() *Repository { if m != nil { @@ -319,7 +319,7 @@ type WikiUpdatePageResponse struct { func (m *WikiUpdatePageResponse) Reset() { *m = WikiUpdatePageResponse{} } func (m *WikiUpdatePageResponse) String() string { return proto.CompactTextString(m) } func (*WikiUpdatePageResponse) ProtoMessage() {} -func (*WikiUpdatePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{8} } +func (*WikiUpdatePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{8} } func (m *WikiUpdatePageResponse) GetError() []byte { if m != nil { @@ -337,7 +337,7 @@ type WikiDeletePageRequest struct { func (m *WikiDeletePageRequest) Reset() { *m = WikiDeletePageRequest{} } func (m *WikiDeletePageRequest) String() string { return proto.CompactTextString(m) } func (*WikiDeletePageRequest) ProtoMessage() {} -func (*WikiDeletePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{9} } +func (*WikiDeletePageRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{9} } func (m *WikiDeletePageRequest) GetRepository() *Repository { if m != nil { @@ -366,7 +366,7 @@ type WikiDeletePageResponse struct { func (m *WikiDeletePageResponse) Reset() { *m = WikiDeletePageResponse{} } func (m *WikiDeletePageResponse) String() string { return proto.CompactTextString(m) } func (*WikiDeletePageResponse) ProtoMessage() {} -func (*WikiDeletePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{10} } +func (*WikiDeletePageResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{10} } type WikiFindPageRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` @@ -378,7 +378,7 @@ type WikiFindPageRequest struct { func (m *WikiFindPageRequest) Reset() { *m = WikiFindPageRequest{} } func (m *WikiFindPageRequest) String() string { return proto.CompactTextString(m) } func (*WikiFindPageRequest) ProtoMessage() {} -func (*WikiFindPageRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{11} } +func (*WikiFindPageRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{11} } func (m *WikiFindPageRequest) GetRepository() *Repository { if m != nil { @@ -417,7 +417,7 @@ type WikiFindPageResponse struct { func (m *WikiFindPageResponse) Reset() { *m = WikiFindPageResponse{} } func (m *WikiFindPageResponse) String() string { return proto.CompactTextString(m) } func (*WikiFindPageResponse) ProtoMessage() {} -func (*WikiFindPageResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{12} } +func (*WikiFindPageResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{12} } func (m *WikiFindPageResponse) GetPage() *WikiPage { if m != nil { @@ -436,7 +436,7 @@ type WikiFindFileRequest struct { func (m *WikiFindFileRequest) Reset() { *m = WikiFindFileRequest{} } func (m *WikiFindFileRequest) String() string { return proto.CompactTextString(m) } func (*WikiFindFileRequest) ProtoMessage() {} -func (*WikiFindFileRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{13} } +func (*WikiFindFileRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{13} } func (m *WikiFindFileRequest) GetRepository() *Repository { if m != nil { @@ -470,7 +470,7 @@ type WikiFindFileResponse struct { func (m *WikiFindFileResponse) Reset() { *m = WikiFindFileResponse{} } func (m *WikiFindFileResponse) String() string { return proto.CompactTextString(m) } func (*WikiFindFileResponse) ProtoMessage() {} -func (*WikiFindFileResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{14} } +func (*WikiFindFileResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{14} } func (m *WikiFindFileResponse) GetName() []byte { if m != nil { @@ -507,7 +507,7 @@ type WikiGetAllPagesRequest struct { func (m *WikiGetAllPagesRequest) Reset() { *m = WikiGetAllPagesRequest{} } func (m *WikiGetAllPagesRequest) String() string { return proto.CompactTextString(m) } func (*WikiGetAllPagesRequest) ProtoMessage() {} -func (*WikiGetAllPagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{15} } +func (*WikiGetAllPagesRequest) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{15} } func (m *WikiGetAllPagesRequest) GetRepository() *Repository { if m != nil { @@ -526,7 +526,7 @@ type WikiGetAllPagesResponse struct { func (m *WikiGetAllPagesResponse) Reset() { *m = WikiGetAllPagesResponse{} } func (m *WikiGetAllPagesResponse) String() string { return proto.CompactTextString(m) } func (*WikiGetAllPagesResponse) ProtoMessage() {} -func (*WikiGetAllPagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor13, []int{16} } +func (*WikiGetAllPagesResponse) Descriptor() ([]byte, []int) { return fileDescriptor14, []int{16} } func (m *WikiGetAllPagesResponse) GetPage() *WikiPage { if m != nil { @@ -1011,9 +1011,9 @@ var _WikiService_serviceDesc = grpc.ServiceDesc{ Metadata: "wiki.proto", } -func init() { proto.RegisterFile("wiki.proto", fileDescriptor13) } +func init() { proto.RegisterFile("wiki.proto", fileDescriptor14) } -var fileDescriptor13 = []byte{ +var fileDescriptor14 = []byte{ // 825 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x72, 0x1b, 0x45, 0x14, 0xcd, 0x48, 0xb2, 0x34, 0xba, 0x72, 0x1c, 0xd2, 0x84, 0x64, 0x32, 0x32, 0xc2, 0xd5, 0x50, diff --git a/vendor/vendor.json b/vendor/vendor.json index daf5d0855..4c5c7eb52 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -201,12 +201,12 @@ "revisionTime": "2017-01-30T11:31:45Z" }, { - "checksumSHA1": "jTJBhnPKmona+1U7mbfFjodrGUQ=", + "checksumSHA1": "sg1k7gDAboGP+dKAd4rhs9bIKes=", "path": "gitlab.com/gitlab-org/gitaly-proto/go", - "revision": "a74d4f2565d3461fa699f1d58df099a06f3a631c", - "revisionTime": "2017-12-08T15:42:58Z", - "version": "v0.61.0", - "versionExact": "v0.61.0" + "revision": "85a595fa1b13c82efc5c113ec36483c790320cf4", + "revisionTime": "2017-12-15T15:24:19Z", + "version": "v0.62.0", + "versionExact": "v0.62.0" }, { "checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=", |