diff options
author | Ahmad Sherif <ahmad.m.sherif@gmail.com> | 2017-12-04 20:07:33 +0300 |
---|---|---|
committer | Ahmad Sherif <ahmad.m.sherif@gmail.com> | 2017-12-04 20:07:33 +0300 |
commit | da169d725121ccb49365b13cb2d01761cb98c73b (patch) | |
tree | 01518a90b2df55728cac93fcd6cf7622fcdae157 | |
parent | 9efe739759a74182ca1668e19980f75380db3542 (diff) | |
parent | 0a4c601eb2c9a7dcdd4f0e216b05d0c998b97695 (diff) |
Merge branch 'feature/implement-user-revert-rpc' into 'master'
Implement UserRevert RPC
Closes #781
See merge request gitlab-org/gitaly!471
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | internal/service/operations/branches_test.go | 2 | ||||
-rw-r--r-- | internal/service/operations/cherry_pick.go | 24 | ||||
-rw-r--r-- | internal/service/operations/cherry_pick_test.go | 1 | ||||
-rw-r--r-- | internal/service/operations/revert.go | 28 | ||||
-rw-r--r-- | internal/service/operations/revert_test.go | 401 | ||||
-rw-r--r-- | internal/service/operations/tags_test.go | 2 | ||||
-rw-r--r-- | internal/service/operations/utils.go | 34 | ||||
-rw-r--r-- | internal/service/repository/fsck.go | 13 | ||||
-rw-r--r-- | internal/service/repository/write_ref.go | 13 | ||||
-rw-r--r-- | ruby/Gemfile | 2 | ||||
-rw-r--r-- | ruby/Gemfile.lock | 4 | ||||
-rw-r--r-- | ruby/lib/gitaly_server/operations_service.rb | 29 | ||||
-rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION | 2 | ||||
-rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/blob.pb.go | 6 | ||||
-rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go | 248 | ||||
-rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/repository-service.pb.go | 281 | ||||
-rw-r--r-- | vendor/vendor.json | 10 |
18 files changed, 954 insertions, 148 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b3a0d71d7..287efebc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UNRELEASED +- Implement UserRevert RPC + https://gitlab.com/gitlab-org/gitaly/merge_requests/471 - Fix commit message encoding and support alternates in CatFile https://gitlab.com/gitlab-org/gitaly/merge_requests/469 - Raise an exception when Git::Env.all is called diff --git a/internal/service/operations/branches_test.go b/internal/service/operations/branches_test.go index 2f56c2286..82b3d0191 100644 --- a/internal/service/operations/branches_test.go +++ b/internal/service/operations/branches_test.go @@ -114,6 +114,7 @@ func TestSuccessfulGitHooksForUserCreateBranchRequest(t *testing.T) { hookPath, hookOutputTempPath := WriteEnvToHook(t, testRepoPath, hookName) defer os.Remove(hookPath) + defer os.Remove(hookOutputTempPath) ctx, cancel := testhelper.Context() defer cancel() @@ -313,6 +314,7 @@ func TestSuccessfulGitHooksForUserDeleteBranchRequest(t *testing.T) { hookPath, hookOutputTempPath := WriteEnvToHook(t, testRepoPath, hookName) defer os.Remove(hookPath) + defer os.Remove(hookOutputTempPath) ctx, cancel := testhelper.Context() defer cancel() diff --git a/internal/service/operations/cherry_pick.go b/internal/service/operations/cherry_pick.go index 599bcf93c..e73b63467 100644 --- a/internal/service/operations/cherry_pick.go +++ b/internal/service/operations/cherry_pick.go @@ -1,8 +1,6 @@ package operations import ( - "fmt" - pb "gitlab.com/gitlab-org/gitaly-proto/go" "gitlab.com/gitlab-org/gitaly/internal/rubyserver" @@ -12,7 +10,7 @@ import ( ) func (s *server) UserCherryPick(ctx context.Context, req *pb.UserCherryPickRequest) (*pb.UserCherryPickResponse, error) { - if err := validateUserCherryPickRequest(req); err != nil { + if err := validateCherryPickOrRevertRequest(req); err != nil { return nil, grpc.Errorf(codes.InvalidArgument, "UserCherryPick: %v", err) } @@ -28,23 +26,3 @@ func (s *server) UserCherryPick(ctx context.Context, req *pb.UserCherryPickReque return client.UserCherryPick(clientCtx, req) } - -func validateUserCherryPickRequest(req *pb.UserCherryPickRequest) error { - if req.User == nil { - return fmt.Errorf("empty User") - } - - if req.Commit == nil { - return fmt.Errorf("empty Commit") - } - - if len(req.BranchName) == 0 { - return fmt.Errorf("empty BranchName") - } - - if len(req.Message) == 0 { - return fmt.Errorf("empty Message") - } - - return nil -} diff --git a/internal/service/operations/cherry_pick_test.go b/internal/service/operations/cherry_pick_test.go index a6e851571..36f21d1cb 100644 --- a/internal/service/operations/cherry_pick_test.go +++ b/internal/service/operations/cherry_pick_test.go @@ -164,6 +164,7 @@ func TestSuccessfulGitHooksForUserCherryPickRequest(t *testing.T) { t.Run(hookName, func(t *testing.T) { hookPath, hookOutputTempPath := operations.WriteEnvToHook(t, testRepoPath, hookName) defer os.Remove(hookPath) + defer os.Remove(hookOutputTempPath) md := testhelper.GitalyServersMetadata(t, serverSocketPath) ctx := metadata.NewOutgoingContext(ctxOuter, md) diff --git a/internal/service/operations/revert.go b/internal/service/operations/revert.go new file mode 100644 index 000000000..af1435922 --- /dev/null +++ b/internal/service/operations/revert.go @@ -0,0 +1,28 @@ +package operations + +import ( + pb "gitlab.com/gitlab-org/gitaly-proto/go" + + "gitlab.com/gitlab-org/gitaly/internal/rubyserver" + "golang.org/x/net/context" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" +) + +func (s *server) UserRevert(ctx context.Context, req *pb.UserRevertRequest) (*pb.UserRevertResponse, error) { + if err := validateCherryPickOrRevertRequest(req); err != nil { + return nil, grpc.Errorf(codes.InvalidArgument, "UserRevert: %v", err) + } + + client, err := s.OperationServiceClient(ctx) + if err != nil { + return nil, err + } + + clientCtx, err := rubyserver.SetHeaders(ctx, req.GetRepository()) + if err != nil { + return nil, err + } + + return client.UserRevert(clientCtx, req) +} diff --git a/internal/service/operations/revert_test.go b/internal/service/operations/revert_test.go new file mode 100644 index 000000000..a6132c195 --- /dev/null +++ b/internal/service/operations/revert_test.go @@ -0,0 +1,401 @@ +package operations_test + +import ( + "io/ioutil" + "os" + "path" + "testing" + + "gitlab.com/gitlab-org/gitaly/internal/git/log" + "gitlab.com/gitlab-org/gitaly/internal/service/operations" + "gitlab.com/gitlab-org/gitaly/internal/testhelper" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/metadata" +) + +func TestSuccessfulUserRevertRequest(t *testing.T) { + ctxOuter, cancel := testhelper.Context() + defer cancel() + + server, serverSocketPath := runFullServer(t) + defer server.Stop() + + client, conn := operations.NewOperationClient(t, serverSocketPath) + defer conn.Close() + + testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + destinationBranch := "revert-dst" + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", destinationBranch, "master") + + masterHeadCommit, err := log.GetCommit(ctxOuter, testRepo, "master", "") + require.NoError(t, err) + + user := &pb.User{ + Name: []byte("Ahmad Sherif"), + Email: []byte("ahmad@gitlab.com"), + GlId: "user-123", + } + + revertedCommit, err := log.GetCommit(ctxOuter, testRepo, "d59c60028b053793cecfb4022de34602e1a9218e", "") + require.NoError(t, err) + + testRepoCopy, _, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + testCases := []struct { + desc string + request *pb.UserRevertRequest + branchUpdate *pb.OperationBranchUpdate + }{ + { + desc: "branch exists", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + }, + branchUpdate: &pb.OperationBranchUpdate{}, + }, + { + desc: "nonexistent branch + start_repository == repository", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte("to-be-reverted-into-1"), + Message: []byte("Reverting " + revertedCommit.Id), + StartBranchName: []byte("master"), + }, + branchUpdate: &pb.OperationBranchUpdate{BranchCreated: true}, + }, + { + desc: "nonexistent branch + start_repository != repository", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte("to-be-reverted-into-2"), + Message: []byte("Reverting " + revertedCommit.Id), + StartRepository: testRepoCopy, + StartBranchName: []byte("master"), + }, + branchUpdate: &pb.OperationBranchUpdate{BranchCreated: true}, + }, + { + desc: "nonexistent branch + empty start_repository", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte("to-be-reverted-into-3"), + Message: []byte("Reverting " + revertedCommit.Id), + StartBranchName: []byte("master"), + }, + branchUpdate: &pb.OperationBranchUpdate{BranchCreated: true}, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.desc, func(t *testing.T) { + md := testhelper.GitalyServersMetadata(t, serverSocketPath) + ctx := metadata.NewOutgoingContext(ctxOuter, md) + + response, err := client.UserRevert(ctx, testCase.request) + require.NoError(t, err) + + headCommit, err := log.GetCommit(ctx, testRepo, string(testCase.request.BranchName), "") + require.NoError(t, err) + + expectedBranchUpdate := testCase.branchUpdate + expectedBranchUpdate.CommitId = headCommit.Id + + require.Equal(t, expectedBranchUpdate, response.BranchUpdate) + require.Equal(t, testCase.request.Message, headCommit.Subject) + require.Equal(t, masterHeadCommit.Id, headCommit.ParentIds[0]) + }) + } +} + +func TestSuccessfulGitHooksForUserRevertRequest(t *testing.T) { + ctxOuter, cancel := testhelper.Context() + defer cancel() + + server, serverSocketPath := runFullServer(t) + defer server.Stop() + + client, conn := operations.NewOperationClient(t, serverSocketPath) + defer conn.Close() + + testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + destinationBranch := "revert-dst" + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", destinationBranch, "master") + + user := &pb.User{ + Name: []byte("Ahmad Sherif"), + Email: []byte("ahmad@gitlab.com"), + GlId: "user-123", + } + + revertedCommit, err := log.GetCommit(ctxOuter, testRepo, "d59c60028b053793cecfb4022de34602e1a9218e", "") + require.NoError(t, err) + + request := &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + } + + for _, hookName := range operations.GitlabHooks { + t.Run(hookName, func(t *testing.T) { + hookPath, hookOutputTempPath := operations.WriteEnvToHook(t, testRepoPath, hookName) + defer os.Remove(hookPath) + defer os.Remove(hookOutputTempPath) + + md := testhelper.GitalyServersMetadata(t, serverSocketPath) + ctx := metadata.NewOutgoingContext(ctxOuter, md) + + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.Empty(t, response.PreReceiveError) + + output := string(testhelper.MustReadFile(t, hookOutputTempPath)) + require.Contains(t, output, "GL_ID="+user.GlId) + require.Contains(t, output, "GL_USERNAME="+user.GlUsername) + }) + } +} + +func TestFailedUserRevertRequestDueToValidations(t *testing.T) { + ctxOuter, cancel := testhelper.Context() + defer cancel() + + server, serverSocketPath := runFullServer(t) + defer server.Stop() + + client, conn := operations.NewOperationClient(t, serverSocketPath) + defer conn.Close() + + testRepo, _, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + revertedCommit, err := log.GetCommit(ctxOuter, testRepo, "d59c60028b053793cecfb4022de34602e1a9218e", "") + require.NoError(t, err) + + destinationBranch := "revert-dst" + + user := &pb.User{ + Name: []byte("Ahmad Sherif"), + Email: []byte("ahmad@gitlab.com"), + GlId: "user-123", + } + + testCases := []struct { + desc string + request *pb.UserRevertRequest + code codes.Code + }{ + { + desc: "empty user", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: nil, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + }, + code: codes.InvalidArgument, + }, + { + desc: "empty commit", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: nil, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + }, + code: codes.InvalidArgument, + }, + { + desc: "empty branch name", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: nil, + Message: []byte("Reverting " + revertedCommit.Id), + }, + code: codes.InvalidArgument, + }, + { + desc: "empty message", + request: &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: nil, + }, + code: codes.InvalidArgument, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.desc, func(t *testing.T) { + md := testhelper.GitalyServersMetadata(t, serverSocketPath) + ctx := metadata.NewOutgoingContext(ctxOuter, md) + + _, err := client.UserRevert(ctx, testCase.request) + testhelper.AssertGrpcError(t, err, testCase.code, "") + }) + } +} + +func TestFailedUserRevertRequestDueToPreReceiveError(t *testing.T) { + ctxOuter, cancel := testhelper.Context() + defer cancel() + + server, serverSocketPath := runFullServer(t) + defer server.Stop() + + client, conn := operations.NewOperationClient(t, serverSocketPath) + defer conn.Close() + + testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + destinationBranch := "revert-dst" + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", destinationBranch, "master") + + user := &pb.User{ + Name: []byte("Ahmad Sherif"), + Email: []byte("ahmad@gitlab.com"), + GlId: "user-123", + } + + revertedCommit, err := log.GetCommit(ctxOuter, testRepo, "d59c60028b053793cecfb4022de34602e1a9218e", "") + require.NoError(t, err) + + request := &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + } + + hookContent := []byte("#!/bin/sh\necho GL_ID=$GL_ID\nexit 1") + + for _, hookName := range operations.GitlabPreHooks { + t.Run(hookName, func(t *testing.T) { + hookPath := path.Join(testRepoPath, "hooks", hookName) + require.NoError(t, ioutil.WriteFile(hookPath, hookContent, 0755)) + defer os.Remove(hookPath) + + md := testhelper.GitalyServersMetadata(t, serverSocketPath) + ctx := metadata.NewOutgoingContext(ctxOuter, md) + + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.Contains(t, response.PreReceiveError, "GL_ID="+user.GlId) + }) + } +} + +func TestFailedUserRevertRequestDueToCreateTreeError(t *testing.T) { + ctxOuter, cancel := testhelper.Context() + defer cancel() + + server, serverSocketPath := runFullServer(t) + defer server.Stop() + + client, conn := operations.NewOperationClient(t, serverSocketPath) + defer conn.Close() + + testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + destinationBranch := "revert-dst" + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", destinationBranch, "master") + + user := &pb.User{ + Name: []byte("Ahmad Sherif"), + Email: []byte("ahmad@gitlab.com"), + GlId: "user-123", + } + + // This revert patch of the following commit cannot be applied to the destinationBranch above + revertedCommit, err := log.GetCommit(ctxOuter, testRepo, "372ab6950519549b14d220271ee2322caa44d4eb", "") + require.NoError(t, err) + + request := &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + } + + md := testhelper.GitalyServersMetadata(t, serverSocketPath) + ctx := metadata.NewOutgoingContext(ctxOuter, md) + + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.Equal(t, "Gitlab::Git::Repository::CreateTreeError", response.CreateTreeError) +} + +func TestFailedUserRevertRequestDueToCommitError(t *testing.T) { + ctxOuter, cancel := testhelper.Context() + defer cancel() + + server, serverSocketPath := runFullServer(t) + defer server.Stop() + + client, conn := operations.NewOperationClient(t, serverSocketPath) + defer conn.Close() + + testRepo, testRepoPath, cleanup := testhelper.NewTestRepo(t) + defer cleanup() + + sourceBranch := "revert-src" + destinationBranch := "revert-dst" + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", destinationBranch, "master") + testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "branch", sourceBranch, "a5391128b0ef5d21df5dd23d98557f4ef12fae20") + + user := &pb.User{ + Name: []byte("Ahmad Sherif"), + Email: []byte("ahmad@gitlab.com"), + GlId: "user-123", + } + + revertedCommit, err := log.GetCommit(ctxOuter, testRepo, sourceBranch, "") + require.NoError(t, err) + + request := &pb.UserRevertRequest{ + Repository: testRepo, + User: user, + Commit: revertedCommit, + BranchName: []byte(destinationBranch), + Message: []byte("Reverting " + revertedCommit.Id), + StartBranchName: []byte(sourceBranch), + } + + md := testhelper.GitalyServersMetadata(t, serverSocketPath) + ctx := metadata.NewOutgoingContext(ctxOuter, md) + + response, err := client.UserRevert(ctx, request) + require.NoError(t, err) + require.Equal(t, "Branch diverged", response.CommitError) +} diff --git a/internal/service/operations/tags_test.go b/internal/service/operations/tags_test.go index 38bdd0822..75611a526 100644 --- a/internal/service/operations/tags_test.go +++ b/internal/service/operations/tags_test.go @@ -87,6 +87,7 @@ func TestSuccessfulGitHooksForUserDeleteTagRequest(t *testing.T) { hookPath, hookOutputTempPath := WriteEnvToHook(t, testRepoPath, hookName) defer os.Remove(hookPath) + defer os.Remove(hookOutputTempPath) ctx, cancel := testhelper.Context() defer cancel() @@ -213,6 +214,7 @@ func TestSuccessfulGitHooksForUserCreateTagRequest(t *testing.T) { hookPath, hookOutputTempPath := WriteEnvToHook(t, testRepoPath, hookName) defer os.Remove(hookPath) + defer os.Remove(hookOutputTempPath) ctx, cancel := testhelper.Context() defer cancel() diff --git a/internal/service/operations/utils.go b/internal/service/operations/utils.go new file mode 100644 index 000000000..0818907fc --- /dev/null +++ b/internal/service/operations/utils.go @@ -0,0 +1,34 @@ +package operations + +import ( + "fmt" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" +) + +type cherryPickOrRevertRequest interface { + GetUser() *pb.User + GetCommit() *pb.GitCommit + GetBranchName() []byte + GetMessage() []byte +} + +func validateCherryPickOrRevertRequest(req cherryPickOrRevertRequest) error { + if req.GetUser() == nil { + return fmt.Errorf("empty User") + } + + if req.GetCommit() == nil { + return fmt.Errorf("empty Commit") + } + + if len(req.GetBranchName()) == 0 { + return fmt.Errorf("empty BranchName") + } + + if len(req.GetMessage()) == 0 { + return fmt.Errorf("empty Message") + } + + return nil +} diff --git a/internal/service/repository/fsck.go b/internal/service/repository/fsck.go new file mode 100644 index 000000000..c31a963ec --- /dev/null +++ b/internal/service/repository/fsck.go @@ -0,0 +1,13 @@ +package repository + +import ( + "gitlab.com/gitlab-org/gitaly/internal/helper" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + + "golang.org/x/net/context" +) + +func (s *server) Fsck(ctx context.Context, req *pb.FsckRequest) (*pb.FsckResponse, error) { + return nil, helper.Unimplemented +} diff --git a/internal/service/repository/write_ref.go b/internal/service/repository/write_ref.go new file mode 100644 index 000000000..2369499fe --- /dev/null +++ b/internal/service/repository/write_ref.go @@ -0,0 +1,13 @@ +package repository + +import ( + "gitlab.com/gitlab-org/gitaly/internal/helper" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + + "golang.org/x/net/context" +) + +func (s *server) WriteRef(ctx context.Context, req *pb.WriteRefRequest) (*pb.WriteRefResponse, error) { + return nil, helper.Unimplemented +} diff --git a/ruby/Gemfile b/ruby/Gemfile index 0ce42d5b9..2aaf872d1 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.58.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.59.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 6849257b6..f4e4ab108 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.58.0) + gitaly-proto (0.59.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -119,7 +119,7 @@ PLATFORMS DEPENDENCIES activesupport - gitaly-proto (~> 0.58.0) + gitaly-proto (~> 0.59.0) github-linguist (~> 4.7.0) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb index e1db64ce1..3314b5ae3 100644 --- a/ruby/lib/gitaly_server/operations_service.rb +++ b/ruby/lib/gitaly_server/operations_service.rb @@ -178,6 +178,35 @@ module GitalyServer end end + def user_revert(request, call) + bridge_exceptions do + begin + repo = Gitlab::Git::Repository.from_gitaly(request.repository, call) + user = Gitlab::Git::User.from_gitaly(request.user) + commit = Gitlab::Git::Commit.new(repo, request.commit) + start_repository = Gitlab::Git::GitalyRemoteRepository.new(request.start_repository || request.repository, call) + + result = repo.revert( + user: user, + commit: commit, + branch_name: request.branch_name, + message: request.message.dup, + start_branch_name: request.start_branch_name.presence, + start_repository: start_repository + ) + + branch_update = branch_update_result(result) + Gitaly::UserRevertResponse.new(branch_update: branch_update) + rescue Gitlab::Git::Repository::CreateTreeError => e + Gitaly::UserRevertResponse.new(create_tree_error: e.message) + rescue Gitlab::Git::CommitError => e + Gitaly::UserRevertResponse.new(commit_error: e.message) + rescue Gitlab::Git::HooksService::PreReceiveError => e + Gitaly::UserRevertResponse.new(pre_receive_error: e.message) + end + end + end + private def branch_update_result(gitlab_update_result) diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION index a60476bfe..cb6b534ab 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION @@ -1 +1 @@ -0.58.0 +0.59.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 fac146cbc..826846f79 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 @@ -93,6 +93,8 @@ It has these top-level messages: UserFFBranchResponse UserCherryPickRequest UserCherryPickResponse + UserRevertRequest + UserRevertResponse FindDefaultBranchNameRequest FindDefaultBranchNameResponse FindAllBranchNamesRequest @@ -145,6 +147,10 @@ It has these top-level messages: ChangeStorageResponse FetchSourceBranchRequest FetchSourceBranchResponse + FsckRequest + FsckResponse + WriteRefRequest + WriteRefResponse Repository GitCommit CommitAuthor diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go index 994aea8b8..978cb9019 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/operations.pb.go @@ -549,6 +549,110 @@ func (m *UserCherryPickResponse) GetPreReceiveError() string { return "" } +type UserRevertRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + User *User `protobuf:"bytes,2,opt,name=user" json:"user,omitempty"` + Commit *GitCommit `protobuf:"bytes,3,opt,name=commit" json:"commit,omitempty"` + BranchName []byte `protobuf:"bytes,4,opt,name=branch_name,json=branchName,proto3" json:"branch_name,omitempty"` + Message []byte `protobuf:"bytes,5,opt,name=message,proto3" json:"message,omitempty"` + StartBranchName []byte `protobuf:"bytes,6,opt,name=start_branch_name,json=startBranchName,proto3" json:"start_branch_name,omitempty"` + StartRepository *Repository `protobuf:"bytes,7,opt,name=start_repository,json=startRepository" json:"start_repository,omitempty"` +} + +func (m *UserRevertRequest) Reset() { *m = UserRevertRequest{} } +func (m *UserRevertRequest) String() string { return proto.CompactTextString(m) } +func (*UserRevertRequest) ProtoMessage() {} +func (*UserRevertRequest) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{15} } + +func (m *UserRevertRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *UserRevertRequest) GetUser() *User { + if m != nil { + return m.User + } + return nil +} + +func (m *UserRevertRequest) GetCommit() *GitCommit { + if m != nil { + return m.Commit + } + return nil +} + +func (m *UserRevertRequest) GetBranchName() []byte { + if m != nil { + return m.BranchName + } + return nil +} + +func (m *UserRevertRequest) GetMessage() []byte { + if m != nil { + return m.Message + } + return nil +} + +func (m *UserRevertRequest) GetStartBranchName() []byte { + if m != nil { + return m.StartBranchName + } + return nil +} + +func (m *UserRevertRequest) GetStartRepository() *Repository { + if m != nil { + return m.StartRepository + } + return nil +} + +type UserRevertResponse struct { + BranchUpdate *OperationBranchUpdate `protobuf:"bytes,1,opt,name=branch_update,json=branchUpdate" json:"branch_update,omitempty"` + CreateTreeError string `protobuf:"bytes,2,opt,name=create_tree_error,json=createTreeError" json:"create_tree_error,omitempty"` + CommitError string `protobuf:"bytes,3,opt,name=commit_error,json=commitError" json:"commit_error,omitempty"` + PreReceiveError string `protobuf:"bytes,4,opt,name=pre_receive_error,json=preReceiveError" json:"pre_receive_error,omitempty"` +} + +func (m *UserRevertResponse) Reset() { *m = UserRevertResponse{} } +func (m *UserRevertResponse) String() string { return proto.CompactTextString(m) } +func (*UserRevertResponse) ProtoMessage() {} +func (*UserRevertResponse) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{16} } + +func (m *UserRevertResponse) GetBranchUpdate() *OperationBranchUpdate { + if m != nil { + return m.BranchUpdate + } + return nil +} + +func (m *UserRevertResponse) GetCreateTreeError() string { + if m != nil { + return m.CreateTreeError + } + return "" +} + +func (m *UserRevertResponse) GetCommitError() string { + if m != nil { + return m.CommitError + } + return "" +} + +func (m *UserRevertResponse) GetPreReceiveError() string { + if m != nil { + return m.PreReceiveError + } + return "" +} + func init() { proto.RegisterType((*UserCreateBranchRequest)(nil), "gitaly.UserCreateBranchRequest") proto.RegisterType((*UserCreateBranchResponse)(nil), "gitaly.UserCreateBranchResponse") @@ -565,6 +669,8 @@ func init() { proto.RegisterType((*UserFFBranchResponse)(nil), "gitaly.UserFFBranchResponse") proto.RegisterType((*UserCherryPickRequest)(nil), "gitaly.UserCherryPickRequest") proto.RegisterType((*UserCherryPickResponse)(nil), "gitaly.UserCherryPickResponse") + proto.RegisterType((*UserRevertRequest)(nil), "gitaly.UserRevertRequest") + proto.RegisterType((*UserRevertResponse)(nil), "gitaly.UserRevertResponse") } // Reference imports to suppress errors if they are not otherwise used. @@ -585,6 +691,7 @@ type OperationServiceClient interface { UserMergeBranch(ctx context.Context, opts ...grpc.CallOption) (OperationService_UserMergeBranchClient, error) UserFFBranch(ctx context.Context, in *UserFFBranchRequest, opts ...grpc.CallOption) (*UserFFBranchResponse, error) UserCherryPick(ctx context.Context, in *UserCherryPickRequest, opts ...grpc.CallOption) (*UserCherryPickResponse, error) + UserRevert(ctx context.Context, in *UserRevertRequest, opts ...grpc.CallOption) (*UserRevertResponse, error) } type operationServiceClient struct { @@ -680,6 +787,15 @@ func (c *operationServiceClient) UserCherryPick(ctx context.Context, in *UserChe return out, nil } +func (c *operationServiceClient) UserRevert(ctx context.Context, in *UserRevertRequest, opts ...grpc.CallOption) (*UserRevertResponse, error) { + out := new(UserRevertResponse) + err := grpc.Invoke(ctx, "/gitaly.OperationService/UserRevert", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for OperationService service type OperationServiceServer interface { @@ -690,6 +806,7 @@ type OperationServiceServer interface { UserMergeBranch(OperationService_UserMergeBranchServer) error UserFFBranch(context.Context, *UserFFBranchRequest) (*UserFFBranchResponse, error) UserCherryPick(context.Context, *UserCherryPickRequest) (*UserCherryPickResponse, error) + UserRevert(context.Context, *UserRevertRequest) (*UserRevertResponse, error) } func RegisterOperationServiceServer(s *grpc.Server, srv OperationServiceServer) { @@ -830,6 +947,24 @@ func _OperationService_UserCherryPick_Handler(srv interface{}, ctx context.Conte return interceptor(ctx, in, info, handler) } +func _OperationService_UserRevert_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UserRevertRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OperationServiceServer).UserRevert(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.OperationService/UserRevert", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OperationServiceServer).UserRevert(ctx, req.(*UserRevertRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _OperationService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.OperationService", HandlerType: (*OperationServiceServer)(nil), @@ -858,6 +993,10 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{ MethodName: "UserCherryPick", Handler: _OperationService_UserCherryPick_Handler, }, + { + MethodName: "UserRevert", + Handler: _OperationService_UserRevert_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -873,57 +1012,60 @@ var _OperationService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("operations.proto", fileDescriptor6) } var fileDescriptor6 = []byte{ - // 817 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xae, 0x93, 0x34, 0x4d, 0x27, 0x69, 0x92, 0x2e, 0x6d, 0x31, 0xe9, 0x5f, 0xb0, 0x04, 0x94, - 0x1e, 0x2a, 0x54, 0xce, 0x5c, 0x5a, 0x28, 0x02, 0x44, 0x29, 0xa6, 0x15, 0xdc, 0xac, 0x6d, 0x32, - 0x72, 0x2d, 0x9a, 0xd8, 0xac, 0xb7, 0x15, 0xe1, 0x80, 0x38, 0xc1, 0x95, 0x47, 0xe0, 0x15, 0x78, - 0x01, 0x1e, 0x80, 0x2b, 0x07, 0x6e, 0x3c, 0x0b, 0xb2, 0x77, 0x9c, 0xd8, 0x8e, 0x8d, 0x28, 0x14, - 0xd1, 0xa3, 0x67, 0xc6, 0xdf, 0x7e, 0xf3, 0xcd, 0xec, 0xcc, 0x42, 0xd3, 0xf5, 0x50, 0x70, 0xe9, - 0xb8, 0x7d, 0x7f, 0xc3, 0x13, 0xae, 0x74, 0x59, 0xd9, 0x76, 0x24, 0x3f, 0x1e, 0xb4, 0x6a, 0xfe, - 0x11, 0x17, 0xd8, 0x55, 0x56, 0xe3, 0xb3, 0x06, 0x97, 0x0f, 0x7c, 0x14, 0xdb, 0x02, 0xb9, 0xc4, - 0x2d, 0xc1, 0xfb, 0x9d, 0x23, 0x13, 0x5f, 0x9d, 0xa0, 0x2f, 0xd9, 0x26, 0x80, 0x40, 0xcf, 0xf5, - 0x1d, 0xe9, 0x8a, 0x81, 0xae, 0xb5, 0xb5, 0xb5, 0xea, 0x26, 0xdb, 0x50, 0x30, 0x1b, 0xe6, 0xd0, - 0x63, 0xc6, 0xa2, 0xd8, 0x2a, 0x54, 0x0f, 0x43, 0x10, 0xab, 0xcf, 0x7b, 0xa8, 0x17, 0xda, 0xda, - 0x5a, 0xcd, 0x04, 0x65, 0xda, 0xe5, 0x3d, 0x64, 0x6d, 0x28, 0x9d, 0xf8, 0x28, 0xf4, 0x62, 0x08, - 0x57, 0x8b, 0xe0, 0x02, 0x0e, 0x66, 0xe8, 0x09, 0x20, 0x7c, 0xc9, 0x85, 0xb4, 0x3c, 0xd7, 0xe9, - 0x4b, 0xbd, 0xa4, 0x20, 0x42, 0xd3, 0x5e, 0x60, 0x31, 0xfa, 0xa0, 0x8f, 0x53, 0xf6, 0x3d, 0xb7, - 0xef, 0x23, 0xbb, 0x0e, 0x65, 0x75, 0x18, 0xf1, 0xad, 0x47, 0x07, 0x50, 0x1c, 0x79, 0xd9, 0x3a, - 0xcc, 0x7a, 0x02, 0x2d, 0x81, 0x1d, 0x74, 0x4e, 0xd1, 0x42, 0x21, 0x5c, 0x11, 0xb2, 0x9d, 0x36, - 0x1b, 0x9e, 0x40, 0x53, 0xd9, 0xef, 0x05, 0x66, 0xe3, 0x23, 0x69, 0x74, 0x17, 0x8f, 0xf1, 0x62, - 0x68, 0x64, 0xec, 0x28, 0x09, 0x92, 0x8c, 0x48, 0x82, 0xcc, 0xd4, 0xb4, 0xec, 0xd4, 0x3e, 0x68, - 0x30, 0x37, 0x02, 0xda, 0xe7, 0xf6, 0xdf, 0xe4, 0x75, 0x05, 0x2a, 0x92, 0xdb, 0xf1, 0xa4, 0xa6, - 0x24, 0xb7, 0x7f, 0x33, 0xa3, 0x6d, 0x98, 0x4f, 0x11, 0xf9, 0x83, 0x74, 0xbe, 0x52, 0x3a, 0xaa, - 0x35, 0xfe, 0x63, 0x3a, 0xec, 0x06, 0x34, 0x24, 0x17, 0x36, 0x4a, 0x4b, 0xe0, 0xa9, 0xe3, 0x3b, - 0x6e, 0x9f, 0x1a, 0xb9, 0xae, 0xcc, 0x26, 0x59, 0x99, 0x0e, 0x53, 0x3d, 0xf4, 0x7d, 0x6e, 0xa3, - 0x3e, 0xa9, 0x0e, 0xa1, 0x4f, 0xe3, 0x8d, 0x52, 0x24, 0x96, 0x0b, 0x29, 0xb2, 0x0c, 0x45, 0xc9, - 0x6d, 0xca, 0xa2, 0x1a, 0x1d, 0x1e, 0x44, 0x04, 0x76, 0xb6, 0x00, 0x65, 0x7c, 0xed, 0xf8, 0xd2, - 0x0f, 0x59, 0x57, 0x4c, 0xfa, 0xca, 0x16, 0xb2, 0x98, 0x2d, 0xe4, 0x37, 0x0d, 0x16, 0x82, 0xc3, - 0x1f, 0xa3, 0xb0, 0xcf, 0xa1, 0xe3, 0x23, 0xbd, 0x0a, 0xb9, 0x7a, 0x2d, 0xc2, 0x74, 0xc7, 0xed, - 0xf5, 0x1c, 0x69, 0x39, 0x5d, 0x22, 0x55, 0x51, 0x86, 0x07, 0xdd, 0x20, 0x23, 0xba, 0xd4, 0x4a, - 0xc3, 0xe8, 0x12, 0xe7, 0x6a, 0xc7, 0xe6, 0x60, 0x92, 0x7b, 0xde, 0xf1, 0x40, 0x2f, 0x87, 0x12, - 0xa8, 0x0f, 0xe3, 0x1d, 0x5d, 0xe4, 0x44, 0x56, 0x24, 0x6a, 0x82, 0x80, 0x96, 0x22, 0xb0, 0x05, - 0x33, 0x74, 0x63, 0x4f, 0xbc, 0x2e, 0x97, 0x48, 0x85, 0x5f, 0x8e, 0x12, 0x79, 0x12, 0x0d, 0x5b, - 0x05, 0x7a, 0x10, 0x06, 0x99, 0xb5, 0xc3, 0xd8, 0xd7, 0xc3, 0x52, 0xa5, 0xd0, 0x2c, 0x1a, 0x6f, - 0x61, 0x3e, 0x33, 0xf8, 0xd7, 0xe7, 0x5f, 0x85, 0x5a, 0xa0, 0xa6, 0xd5, 0x09, 0x7b, 0xa1, 0x4b, - 0x85, 0xad, 0x06, 0x36, 0xd5, 0x1e, 0x5d, 0x76, 0x0d, 0xea, 0x44, 0x31, 0x0a, 0x2a, 0x86, 0x41, - 0x44, 0x9c, 0xc2, 0x8c, 0x4f, 0x1a, 0x5c, 0x0a, 0x24, 0xd8, 0xd9, 0xb9, 0xa8, 0x55, 0x35, 0xde, - 0xd3, 0x25, 0x1e, 0x51, 0xa4, 0x12, 0x8d, 0x55, 0x41, 0x3b, 0x73, 0x15, 0xce, 0x34, 0xf7, 0xbf, - 0x14, 0xe8, 0x06, 0x1e, 0xa1, 0x10, 0x83, 0x3d, 0xa7, 0xf3, 0xf2, 0xdf, 0xaa, 0x75, 0x13, 0xca, - 0x4a, 0x1c, 0x6a, 0xaf, 0xd9, 0x28, 0xe6, 0xbe, 0x23, 0xb7, 0x43, 0x87, 0x49, 0x01, 0xe9, 0x15, - 0x52, 0x1a, 0x5b, 0x21, 0xf9, 0x57, 0x63, 0x1d, 0x66, 0xd5, 0x7a, 0x8d, 0x03, 0x94, 0xc3, 0x98, - 0x46, 0xe8, 0xd8, 0x1a, 0xa1, 0xdc, 0x81, 0xa6, 0x8a, 0x8d, 0x65, 0x3b, 0x95, 0x9b, 0xad, 0xfa, - 0x7d, 0x64, 0x30, 0xbe, 0xd3, 0x14, 0x89, 0x0b, 0x78, 0xbe, 0xb5, 0x54, 0xbd, 0x6e, 0x49, 0x81, - 0xa9, 0x5a, 0x2a, 0xc7, 0xbe, 0x40, 0x55, 0xcb, 0xe0, 0x06, 0x51, 0x27, 0xc6, 0xe7, 0x5e, 0x55, - 0xd9, 0x54, 0x48, 0x66, 0x6b, 0x94, 0x32, 0x5b, 0x63, 0xf3, 0x47, 0x09, 0x9a, 0x43, 0x8a, 0xcf, - 0x50, 0x9c, 0x3a, 0x1d, 0x64, 0xcf, 0xa1, 0x99, 0x7e, 0x97, 0xb0, 0xd5, 0x78, 0x9d, 0x33, 0x1e, - 0x59, 0xad, 0x76, 0x7e, 0x80, 0x92, 0xca, 0x98, 0x88, 0x80, 0xe3, 0xdb, 0x3e, 0x09, 0x9c, 0xf1, - 0x32, 0x49, 0x02, 0x67, 0x3d, 0x14, 0x8c, 0x09, 0xb6, 0x0b, 0x33, 0x89, 0x15, 0xc3, 0x96, 0xc6, - 0xd9, 0x8c, 0xb6, 0x68, 0x6b, 0x39, 0xc7, 0x9b, 0xc6, 0x1b, 0x2e, 0xf1, 0x24, 0x5e, 0xfa, 0x91, - 0x91, 0xc4, 0x1b, 0xdb, 0xfc, 0xc6, 0x04, 0x7b, 0x01, 0x8d, 0xd4, 0xbc, 0x66, 0x2b, 0xf1, 0x7f, - 0xc6, 0xd7, 0x53, 0x6b, 0x35, 0xd7, 0x1f, 0xa1, 0xae, 0x69, 0xb7, 0x34, 0xf6, 0x08, 0x6a, 0xf1, - 0x19, 0xc3, 0x16, 0xe3, 0xbf, 0xa5, 0x86, 0x63, 0x6b, 0x29, 0xdb, 0x39, 0xa4, 0xf9, 0x14, 0xea, - 0xc9, 0x36, 0x67, 0x49, 0xa5, 0xd2, 0xf3, 0xa3, 0xb5, 0x92, 0xe7, 0x8e, 0x20, 0x0f, 0xcb, 0xe1, - 0xf3, 0xfc, 0xf6, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x8c, 0xd2, 0xab, 0xc8, 0x0b, 0x00, - 0x00, + // 867 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x72, 0xd3, 0x48, + 0x10, 0x8e, 0x6c, 0xc7, 0x71, 0xda, 0x8e, 0x7f, 0x66, 0x93, 0xac, 0xa2, 0xfc, 0x79, 0x55, 0xb5, + 0xbb, 0xd9, 0x1c, 0x52, 0x5b, 0xd9, 0xf3, 0x5e, 0x92, 0x4d, 0xb6, 0x80, 0x22, 0x04, 0x91, 0x14, + 0xdc, 0x54, 0x13, 0xbb, 0x4b, 0x51, 0x11, 0x5b, 0x62, 0x34, 0x71, 0x61, 0x0e, 0x14, 0x27, 0xb8, + 0xf2, 0x08, 0x5c, 0x78, 0x00, 0xae, 0x1c, 0x78, 0x00, 0xae, 0x39, 0xf0, 0x3a, 0x94, 0x34, 0x23, + 0x7b, 0x24, 0x4b, 0x14, 0x81, 0x50, 0xa4, 0x28, 0x8e, 0xea, 0x6e, 0x7f, 0xd3, 0xdf, 0xd7, 0xdd, + 0x33, 0x6d, 0x68, 0x7a, 0x3e, 0x32, 0xca, 0x5d, 0xaf, 0x1f, 0x6c, 0xf9, 0xcc, 0xe3, 0x1e, 0x29, + 0x3b, 0x2e, 0xa7, 0x67, 0x43, 0xa3, 0x16, 0x9c, 0x52, 0x86, 0x5d, 0x61, 0x35, 0xdf, 0x68, 0xf0, + 0xeb, 0x71, 0x80, 0x6c, 0x97, 0x21, 0xe5, 0xb8, 0xc3, 0x68, 0xbf, 0x73, 0x6a, 0xe1, 0xa3, 0x73, + 0x0c, 0x38, 0xd9, 0x06, 0x60, 0xe8, 0x7b, 0x81, 0xcb, 0x3d, 0x36, 0xd4, 0xb5, 0xb6, 0xb6, 0x51, + 0xdd, 0x26, 0x5b, 0x02, 0x66, 0xcb, 0x1a, 0x79, 0x2c, 0x25, 0x8a, 0xac, 0x43, 0xf5, 0x24, 0x02, + 0xb1, 0xfb, 0xb4, 0x87, 0x7a, 0xa1, 0xad, 0x6d, 0xd4, 0x2c, 0x10, 0xa6, 0x03, 0xda, 0x43, 0xd2, + 0x86, 0xd2, 0x79, 0x80, 0x4c, 0x2f, 0x46, 0x70, 0xb5, 0x18, 0x2e, 0xcc, 0xc1, 0x8a, 0x3c, 0x21, + 0x44, 0xc0, 0x29, 0xe3, 0xb6, 0xef, 0xb9, 0x7d, 0xae, 0x97, 0x04, 0x44, 0x64, 0x3a, 0x0c, 0x2d, + 0x66, 0x1f, 0xf4, 0xc9, 0x94, 0x03, 0xdf, 0xeb, 0x07, 0x48, 0xfe, 0x80, 0xb2, 0x38, 0x4c, 0xe6, + 0x5b, 0x8f, 0x0f, 0x90, 0x71, 0xd2, 0x4b, 0x36, 0xa1, 0xe5, 0x33, 0xb4, 0x19, 0x76, 0xd0, 0x1d, + 0xa0, 0x8d, 0x8c, 0x79, 0x2c, 0xca, 0x76, 0xd6, 0x6a, 0xf8, 0x0c, 0x2d, 0x61, 0xdf, 0x0b, 0xcd, + 0xe6, 0x4b, 0xa9, 0xd1, 0x7f, 0x78, 0x86, 0xd7, 0x43, 0x23, 0x73, 0x5f, 0x48, 0x90, 0xcc, 0x48, + 0x4a, 0x90, 0x49, 0x4d, 0xcb, 0xa6, 0xf6, 0x42, 0x83, 0xf9, 0x31, 0xd0, 0x11, 0x75, 0xbe, 0x86, + 0xd7, 0x12, 0x54, 0x38, 0x75, 0x54, 0x52, 0x33, 0x9c, 0x3a, 0x9f, 0xc9, 0x68, 0x17, 0x16, 0x52, + 0x89, 0x7c, 0x01, 0x9d, 0xf7, 0x92, 0x8e, 0x68, 0x8d, 0xef, 0x48, 0x87, 0xfc, 0x09, 0x0d, 0x4e, + 0x99, 0x83, 0xdc, 0x66, 0x38, 0x70, 0x03, 0xd7, 0xeb, 0xcb, 0x46, 0xae, 0x0b, 0xb3, 0x25, 0xad, + 0x44, 0x87, 0x99, 0x1e, 0x06, 0x01, 0x75, 0x50, 0x9f, 0x16, 0x87, 0xc8, 0x4f, 0xf3, 0x89, 0x50, + 0x44, 0xe1, 0x22, 0x15, 0x59, 0x85, 0x22, 0xa7, 0x8e, 0x64, 0x51, 0x8d, 0x0f, 0x0f, 0x23, 0x42, + 0x3b, 0x59, 0x84, 0x32, 0x3e, 0x76, 0x03, 0x1e, 0x44, 0x59, 0x57, 0x2c, 0xf9, 0x95, 0x2d, 0x64, + 0x31, 0x5b, 0xc8, 0x0b, 0x0d, 0x16, 0xc3, 0xc3, 0x6f, 0x23, 0x73, 0xae, 0xa0, 0xe3, 0x63, 0xbd, + 0x0a, 0xb9, 0x7a, 0x2d, 0xc3, 0x6c, 0xc7, 0xeb, 0xf5, 0x5c, 0x6e, 0xbb, 0x5d, 0x99, 0x54, 0x45, + 0x18, 0x6e, 0x74, 0x43, 0x46, 0x72, 0xa8, 0x85, 0x86, 0xf1, 0x10, 0xe7, 0x6a, 0x47, 0xe6, 0x61, + 0x9a, 0xfa, 0xfe, 0xd9, 0x50, 0x2f, 0x47, 0x12, 0x88, 0x0f, 0xf3, 0x99, 0x1c, 0xe4, 0x04, 0x2b, + 0x29, 0x6a, 0x22, 0x01, 0x2d, 0x95, 0xc0, 0x0e, 0xcc, 0xc9, 0x89, 0x3d, 0xf7, 0xbb, 0x94, 0xa3, + 0x2c, 0xfc, 0x6a, 0x4c, 0xe4, 0x4e, 0x7c, 0xd9, 0x0a, 0xd0, 0xe3, 0x28, 0xc8, 0xaa, 0x9d, 0x28, + 0x5f, 0x37, 0x4b, 0x95, 0x42, 0xb3, 0x68, 0x3e, 0x85, 0x85, 0xcc, 0xe0, 0x4f, 0x9f, 0xff, 0x1b, + 0xd4, 0x42, 0x35, 0xed, 0x4e, 0xd4, 0x0b, 0x5d, 0x59, 0xd8, 0x6a, 0x68, 0x13, 0xed, 0xd1, 0x25, + 0xbf, 0x43, 0x5d, 0xa6, 0x18, 0x07, 0x15, 0xa3, 0x20, 0x99, 0xb8, 0x0c, 0x33, 0x5f, 0x69, 0xf0, + 0x4b, 0x28, 0xc1, 0xfe, 0xfe, 0x75, 0xad, 0xaa, 0xf9, 0x5c, 0x0e, 0xf1, 0x38, 0x45, 0x59, 0xa2, + 0x89, 0x2a, 0x68, 0x97, 0xae, 0xc2, 0xa5, 0xee, 0xfd, 0x77, 0x05, 0x39, 0x81, 0xa7, 0xc8, 0xd8, + 0xf0, 0xd0, 0xed, 0x3c, 0xfc, 0xb6, 0x6a, 0xfd, 0x05, 0x65, 0x21, 0x8e, 0x6c, 0xaf, 0x56, 0x1c, + 0xf3, 0xbf, 0xcb, 0x77, 0x23, 0x87, 0x25, 0x03, 0xd2, 0x4f, 0x48, 0x69, 0xe2, 0x09, 0xc9, 0x1f, + 0x8d, 0x4d, 0x68, 0x89, 0xe7, 0x55, 0x05, 0x28, 0x47, 0x31, 0x8d, 0xc8, 0xb1, 0x33, 0x46, 0xf9, + 0x17, 0x9a, 0x22, 0x56, 0x61, 0x3b, 0x93, 0xcb, 0x56, 0xfc, 0x7c, 0x6c, 0x30, 0x3f, 0xc8, 0x5b, + 0x44, 0x15, 0xf0, 0x6a, 0x6b, 0x29, 0x7a, 0xdd, 0xe6, 0x0c, 0x53, 0xb5, 0x14, 0x8e, 0x23, 0x86, + 0xa2, 0x96, 0xe1, 0x04, 0xc9, 0x4e, 0x54, 0xef, 0xbd, 0xaa, 0xb0, 0x89, 0x90, 0xcc, 0xd6, 0x28, + 0x65, 0xb7, 0xc6, 0xdb, 0x02, 0xb4, 0xa2, 0xca, 0xe1, 0x00, 0x43, 0xca, 0x3f, 0xdb, 0xe2, 0x12, + 0x6d, 0x71, 0xa1, 0x01, 0x51, 0xc5, 0xfb, 0x21, 0x5a, 0x62, 0xfb, 0xf5, 0x34, 0x34, 0x47, 0x29, + 0xde, 0x43, 0x36, 0x70, 0x3b, 0x48, 0xee, 0x43, 0x33, 0xbd, 0xaa, 0x92, 0x75, 0xb5, 0xc6, 0x19, + 0x7b, 0xb7, 0xd1, 0xce, 0x0f, 0x10, 0x52, 0x99, 0x53, 0x31, 0xb0, 0xba, 0x00, 0x26, 0x81, 0x33, + 0x96, 0xd5, 0x24, 0x70, 0xd6, 0xee, 0x68, 0x4e, 0x91, 0x03, 0x98, 0x4b, 0x6c, 0x1d, 0x64, 0x65, + 0x32, 0x9b, 0xf1, 0x62, 0x65, 0xac, 0xe6, 0x78, 0xd3, 0x78, 0xa3, 0xbd, 0x2e, 0x89, 0x97, 0xde, + 0x3b, 0x93, 0x78, 0x13, 0xcb, 0xa0, 0x39, 0x45, 0x1e, 0x40, 0x23, 0xf5, 0x84, 0x93, 0x35, 0xf5, + 0x37, 0x93, 0x1b, 0x8b, 0xb1, 0x9e, 0xeb, 0x8f, 0x51, 0x37, 0xb4, 0xbf, 0x35, 0x72, 0x0b, 0x6a, + 0xea, 0xb3, 0x43, 0x96, 0xd5, 0x9f, 0xa5, 0xde, 0x4b, 0x63, 0x25, 0xdb, 0x39, 0x4a, 0xf3, 0x2e, + 0xd4, 0x93, 0x37, 0x1f, 0x49, 0x2a, 0x95, 0x7e, 0x52, 0x8c, 0xb5, 0x3c, 0xf7, 0x08, 0x72, 0x0f, + 0x60, 0x3c, 0x35, 0x64, 0x29, 0x71, 0x53, 0xa8, 0xd7, 0x90, 0x61, 0x64, 0xb9, 0x62, 0x98, 0x93, + 0x72, 0xf4, 0xc7, 0xef, 0x9f, 0x8f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x04, 0x3f, 0x63, 0x86, 0x22, + 0x0e, 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 2680c2f5f..14916546e 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 @@ -533,6 +533,86 @@ func (m *FetchSourceBranchResponse) GetResult() bool { return false } +type FsckRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` +} + +func (m *FsckRequest) Reset() { *m = FsckRequest{} } +func (m *FsckRequest) String() string { return proto.CompactTextString(m) } +func (*FsckRequest) ProtoMessage() {} +func (*FsckRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{26} } + +func (m *FsckRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +type FsckResponse struct { + Error []byte `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (m *FsckResponse) Reset() { *m = FsckResponse{} } +func (m *FsckResponse) String() string { return proto.CompactTextString(m) } +func (*FsckResponse) ProtoMessage() {} +func (*FsckResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{27} } + +func (m *FsckResponse) GetError() []byte { + if m != nil { + return m.Error + } + return nil +} + +type WriteRefRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + Ref []byte `protobuf:"bytes,2,opt,name=ref,proto3" json:"ref,omitempty"` + Revision []byte `protobuf:"bytes,3,opt,name=revision,proto3" json:"revision,omitempty"` +} + +func (m *WriteRefRequest) Reset() { *m = WriteRefRequest{} } +func (m *WriteRefRequest) String() string { return proto.CompactTextString(m) } +func (*WriteRefRequest) ProtoMessage() {} +func (*WriteRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{28} } + +func (m *WriteRefRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *WriteRefRequest) GetRef() []byte { + if m != nil { + return m.Ref + } + return nil +} + +func (m *WriteRefRequest) GetRevision() []byte { + if m != nil { + return m.Revision + } + return nil +} + +type WriteRefResponse struct { + Error []byte `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"` +} + +func (m *WriteRefResponse) Reset() { *m = WriteRefResponse{} } +func (m *WriteRefResponse) String() string { return proto.CompactTextString(m) } +func (*WriteRefResponse) ProtoMessage() {} +func (*WriteRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor8, []int{29} } + +func (m *WriteRefResponse) GetError() []byte { + if m != nil { + return m.Error + } + return nil +} + func init() { proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest") proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse") @@ -560,6 +640,10 @@ func init() { proto.RegisterType((*ChangeStorageResponse)(nil), "gitaly.ChangeStorageResponse") proto.RegisterType((*FetchSourceBranchRequest)(nil), "gitaly.FetchSourceBranchRequest") proto.RegisterType((*FetchSourceBranchResponse)(nil), "gitaly.FetchSourceBranchResponse") + proto.RegisterType((*FsckRequest)(nil), "gitaly.FsckRequest") + proto.RegisterType((*FsckResponse)(nil), "gitaly.FsckResponse") + proto.RegisterType((*WriteRefRequest)(nil), "gitaly.WriteRefRequest") + proto.RegisterType((*WriteRefResponse)(nil), "gitaly.WriteRefResponse") proto.RegisterEnum("gitaly.GetArchiveRequest_Format", GetArchiveRequest_Format_name, GetArchiveRequest_Format_value) } @@ -587,6 +671,8 @@ type RepositoryServiceClient interface { HasLocalBranches(ctx context.Context, in *HasLocalBranchesRequest, opts ...grpc.CallOption) (*HasLocalBranchesResponse, error) ChangeStorage(ctx context.Context, in *ChangeStorageRequest, opts ...grpc.CallOption) (*ChangeStorageResponse, error) FetchSourceBranch(ctx context.Context, in *FetchSourceBranchRequest, opts ...grpc.CallOption) (*FetchSourceBranchResponse, error) + Fsck(ctx context.Context, in *FsckRequest, opts ...grpc.CallOption) (*FsckResponse, error) + WriteRef(ctx context.Context, in *WriteRefRequest, opts ...grpc.CallOption) (*WriteRefResponse, error) } type repositoryServiceClient struct { @@ -737,6 +823,24 @@ func (c *repositoryServiceClient) FetchSourceBranch(ctx context.Context, in *Fet return out, nil } +func (c *repositoryServiceClient) Fsck(ctx context.Context, in *FsckRequest, opts ...grpc.CallOption) (*FsckResponse, error) { + out := new(FsckResponse) + err := grpc.Invoke(ctx, "/gitaly.RepositoryService/Fsck", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *repositoryServiceClient) WriteRef(ctx context.Context, in *WriteRefRequest, opts ...grpc.CallOption) (*WriteRefResponse, error) { + out := new(WriteRefResponse) + err := grpc.Invoke(ctx, "/gitaly.RepositoryService/WriteRef", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for RepositoryService service type RepositoryServiceServer interface { @@ -753,6 +857,8 @@ type RepositoryServiceServer interface { HasLocalBranches(context.Context, *HasLocalBranchesRequest) (*HasLocalBranchesResponse, error) ChangeStorage(context.Context, *ChangeStorageRequest) (*ChangeStorageResponse, error) FetchSourceBranch(context.Context, *FetchSourceBranchRequest) (*FetchSourceBranchResponse, error) + Fsck(context.Context, *FsckRequest) (*FsckResponse, error) + WriteRef(context.Context, *WriteRefRequest) (*WriteRefResponse, error) } func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) { @@ -996,6 +1102,42 @@ func _RepositoryService_FetchSourceBranch_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } +func _RepositoryService_Fsck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FsckRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RepositoryServiceServer).Fsck(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RepositoryService/Fsck", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RepositoryServiceServer).Fsck(ctx, req.(*FsckRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _RepositoryService_WriteRef_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(WriteRefRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(RepositoryServiceServer).WriteRef(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/gitaly.RepositoryService/WriteRef", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(RepositoryServiceServer).WriteRef(ctx, req.(*WriteRefRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _RepositoryService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.RepositoryService", HandlerType: (*RepositoryServiceServer)(nil), @@ -1048,6 +1190,14 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ MethodName: "FetchSourceBranch", Handler: _RepositoryService_FetchSourceBranch_Handler, }, + { + MethodName: "Fsck", + Handler: _RepositoryService_Fsck_Handler, + }, + { + MethodName: "WriteRef", + Handler: _RepositoryService_WriteRef_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -1062,67 +1212,72 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("repository-service.proto", fileDescriptor8) } var fileDescriptor8 = []byte{ - // 980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x4f, 0xe3, 0x46, - 0x10, 0x4f, 0x8e, 0x23, 0x81, 0x21, 0x87, 0xc2, 0x96, 0x3f, 0xc6, 0x1c, 0x3d, 0xba, 0x7d, 0xe1, - 0xa1, 0x45, 0xa7, 0x20, 0x55, 0x7d, 0xab, 0x00, 0x41, 0x40, 0xd7, 0x43, 0xad, 0x41, 0x3a, 0x09, - 0xa9, 0xb2, 0x36, 0x66, 0x92, 0x58, 0xd8, 0xde, 0x74, 0x77, 0x03, 0x97, 0xfb, 0x9a, 0xfd, 0x04, - 0x55, 0x1f, 0xfb, 0x25, 0x2a, 0xaf, 0x37, 0xb1, 0x1d, 0xdb, 0xf7, 0x62, 0xf5, 0xcd, 0x3b, 0xbb, - 0xfb, 0x9b, 0xdf, 0xcc, 0xee, 0xcc, 0x6f, 0x0d, 0x96, 0xc0, 0x09, 0x97, 0xbe, 0xe2, 0x62, 0xf6, - 0xa3, 0x44, 0xf1, 0xec, 0x7b, 0x78, 0x32, 0x11, 0x5c, 0x71, 0xd2, 0x1a, 0xf9, 0x8a, 0x05, 0x33, - 0xbb, 0x23, 0xc7, 0x4c, 0xe0, 0x63, 0x62, 0xa5, 0x1f, 0x61, 0xcf, 0x59, 0xec, 0xb8, 0xfc, 0xec, - 0x4b, 0x25, 0x1d, 0xfc, 0x73, 0x8a, 0x52, 0x91, 0x1e, 0x40, 0x0a, 0x66, 0x35, 0x8f, 0x9a, 0xc7, - 0x1b, 0x3d, 0x72, 0x92, 0xa0, 0x9c, 0xa4, 0x9b, 0x9c, 0xcc, 0x2a, 0xda, 0x03, 0xab, 0x08, 0x27, - 0x27, 0x3c, 0x92, 0x48, 0x76, 0xa1, 0x85, 0xda, 0xa2, 0xb1, 0xd6, 0x1c, 0x33, 0xa2, 0xb7, 0xd9, - 0x3d, 0x37, 0xf2, 0x32, 0x9c, 0xa8, 0x59, 0x1d, 0x0e, 0x3f, 0xc1, 0x7e, 0x09, 0x9e, 0x21, 0xb1, - 0x0f, 0x6b, 0xbe, 0x74, 0x31, 0xb6, 0x19, 0x1a, 0x6d, 0x3f, 0x59, 0x62, 0x78, 0x30, 0xef, 0xe9, - 0x26, 0xf2, 0x04, 0x86, 0x18, 0x29, 0x16, 0xd4, 0xe1, 0x71, 0xa0, 0x79, 0x2c, 0xe3, 0x25, 0x3c, - 0x68, 0x00, 0x5b, 0xc9, 0xe4, 0xd5, 0x34, 0xa8, 0xe3, 0x85, 0x7c, 0x0f, 0x6f, 0x3c, 0x81, 0x4c, - 0xa1, 0x3b, 0xf0, 0x55, 0xc8, 0x26, 0xd6, 0x2b, 0x1d, 0x55, 0x27, 0x31, 0x9e, 0x6b, 0x1b, 0xdd, - 0x06, 0x92, 0xf5, 0x66, 0x38, 0x4c, 0x60, 0xa7, 0xcf, 0xc4, 0x80, 0x8d, 0xf0, 0x82, 0x07, 0x01, - 0x7a, 0xea, 0x7f, 0xe7, 0x61, 0xc1, 0xee, 0xb2, 0x47, 0xc3, 0xe5, 0x03, 0xec, 0xa4, 0xc0, 0x77, - 0xfe, 0x17, 0xac, 0x93, 0xf9, 0x1f, 0x60, 0x77, 0x19, 0xcc, 0x1c, 0x3f, 0x81, 0xd7, 0xd2, 0xff, - 0x82, 0x1a, 0x67, 0xc5, 0xd1, 0xdf, 0xf4, 0x09, 0xf6, 0xcf, 0x26, 0x93, 0x60, 0xd6, 0xf7, 0x15, - 0x53, 0x4a, 0xf8, 0x83, 0xa9, 0xc2, 0x3a, 0x45, 0x40, 0x6c, 0x58, 0x13, 0xf8, 0xec, 0x4b, 0x9f, - 0x47, 0x3a, 0x0b, 0x1d, 0x67, 0x31, 0xa6, 0x6f, 0xc1, 0x2e, 0x73, 0x66, 0xb2, 0xf0, 0x4f, 0x13, - 0xc8, 0x15, 0x2a, 0x6f, 0xec, 0x60, 0xc8, 0x55, 0x9d, 0x1c, 0xc4, 0xd5, 0x26, 0x34, 0x88, 0xa6, - 0xb0, 0xee, 0x98, 0x11, 0xd9, 0x86, 0xd5, 0x21, 0x17, 0x1e, 0x5a, 0x2b, 0xfa, 0x7c, 0x92, 0x01, - 0xd9, 0x83, 0x76, 0xc4, 0x5d, 0xc5, 0x46, 0xd2, 0x7a, 0x9d, 0x14, 0x67, 0xc4, 0xef, 0xd9, 0x48, - 0x12, 0x0b, 0xda, 0xca, 0x0f, 0x91, 0x4f, 0x95, 0xb5, 0x7a, 0xd4, 0x3c, 0x5e, 0x75, 0xe6, 0xc3, - 0x78, 0x8b, 0x94, 0x63, 0xf7, 0x09, 0x67, 0x56, 0x2b, 0xf1, 0x20, 0xe5, 0xf8, 0x03, 0xce, 0xc8, - 0x3b, 0xd8, 0x78, 0x8a, 0xf8, 0x4b, 0xe4, 0x8e, 0x79, 0x5c, 0xec, 0x6d, 0x3d, 0x09, 0xda, 0x74, - 0x1d, 0x5b, 0xe8, 0x0e, 0x7c, 0x93, 0x0b, 0xd2, 0x04, 0xff, 0x11, 0xf6, 0x2e, 0xf4, 0x65, 0xc9, - 0x44, 0x54, 0xe3, 0x12, 0xd8, 0x60, 0x15, 0xe1, 0x8c, 0xab, 0x7f, 0x9b, 0xb0, 0xd5, 0x47, 0x75, - 0x26, 0xbc, 0xb1, 0xff, 0x5c, 0x2b, 0xcd, 0x07, 0xb0, 0xee, 0xf1, 0x30, 0xf4, 0x95, 0xeb, 0x3f, - 0x9a, 0x4c, 0xaf, 0x25, 0x86, 0x9b, 0xc7, 0xf8, 0x0c, 0x26, 0x02, 0x87, 0xfe, 0x67, 0x9d, 0xec, - 0x75, 0xc7, 0x8c, 0xc8, 0xcf, 0xd0, 0x1a, 0x72, 0x11, 0x32, 0xa5, 0x93, 0xbd, 0xd9, 0x3b, 0x9a, - 0x3b, 0x29, 0x70, 0x3a, 0xb9, 0xd2, 0xeb, 0x1c, 0xb3, 0x9e, 0x9e, 0x42, 0x2b, 0xb1, 0x90, 0x36, - 0xac, 0x3c, 0xdc, 0xfc, 0xd6, 0x6d, 0xc4, 0x1f, 0xf7, 0x67, 0x4e, 0xb7, 0x49, 0x00, 0x5a, 0xf7, - 0x67, 0x8e, 0xdb, 0x7f, 0xe8, 0xbe, 0x22, 0x1b, 0xd0, 0x8e, 0xbf, 0xcf, 0x1f, 0x7a, 0xdd, 0x15, - 0x7a, 0x0c, 0x24, 0x0b, 0x9c, 0x96, 0xc2, 0x23, 0x53, 0x4c, 0xc7, 0xd9, 0x71, 0xf4, 0x77, 0x7c, - 0x04, 0xd7, 0x4c, 0xfe, 0xca, 0x3d, 0x16, 0x9c, 0x0b, 0x16, 0x79, 0xe3, 0x5a, 0x85, 0x40, 0xdf, - 0x83, 0x55, 0x84, 0x33, 0xee, 0xb7, 0x61, 0xf5, 0x99, 0x05, 0x53, 0x34, 0x5d, 0x38, 0x19, 0x50, - 0x05, 0xdb, 0x17, 0x63, 0x16, 0x8d, 0xf0, 0x4e, 0x71, 0xc1, 0x46, 0xb5, 0x8e, 0xe6, 0x18, 0xba, - 0x11, 0xbe, 0xb8, 0x32, 0x41, 0x72, 0x23, 0x16, 0xce, 0x6b, 0x61, 0x33, 0xc2, 0x17, 0xe3, 0xe0, - 0x96, 0x85, 0x48, 0xf7, 0x60, 0x67, 0xc9, 0xab, 0xb9, 0x27, 0x7f, 0x35, 0xc1, 0xd2, 0x57, 0xf5, - 0x8e, 0x4f, 0x85, 0x87, 0x49, 0x10, 0x75, 0x38, 0xfd, 0x02, 0x5b, 0x52, 0x43, 0xb9, 0x99, 0xad, - 0xaf, 0x2a, 0xb7, 0x76, 0x93, 0xc5, 0x4e, 0xae, 0xcd, 0x1a, 0x80, 0x81, 0x26, 0xa3, 0x6f, 0x56, - 0xc7, 0xe9, 0xc8, 0x0c, 0x41, 0x72, 0x08, 0xa0, 0x98, 0x18, 0xa1, 0x72, 0x05, 0x0e, 0xf5, 0x1d, - 0xeb, 0x38, 0xeb, 0x89, 0xc5, 0xc1, 0x21, 0x3d, 0x85, 0xfd, 0x92, 0xa0, 0x52, 0x95, 0x16, 0x28, - 0xa7, 0x81, 0x9a, 0xab, 0x74, 0x32, 0xea, 0xfd, 0xbd, 0xa6, 0x15, 0x6b, 0xde, 0x54, 0x93, 0xa7, - 0x05, 0xf9, 0x04, 0xdd, 0x65, 0xbd, 0x27, 0xef, 0x8a, 0x81, 0xe4, 0x1e, 0x16, 0xf6, 0x51, 0xf5, - 0x02, 0x93, 0xf7, 0x06, 0x79, 0xc8, 0x7a, 0x33, 0x22, 0x4e, 0x4a, 0x36, 0xe6, 0xdf, 0x0b, 0xf6, - 0x77, 0x5f, 0x59, 0xb1, 0x84, 0x9d, 0x17, 0xe6, 0x1c, 0x76, 0xe9, 0x1b, 0x20, 0x87, 0x5d, 0xa1, - 0xea, 0x0d, 0x72, 0x09, 0x90, 0x2a, 0x2d, 0xd9, 0xcf, 0x6f, 0xc9, 0x68, 0xbd, 0x6d, 0x97, 0x4d, - 0x2d, 0x60, 0x7e, 0x87, 0xcd, 0xbc, 0x50, 0x92, 0xc3, 0x45, 0x8f, 0x28, 0x93, 0x6c, 0xfb, 0xdb, - 0xaa, 0xe9, 0x2c, 0x64, 0x5e, 0x14, 0x53, 0xc8, 0x52, 0xe5, 0x4d, 0x21, 0xcb, 0xb5, 0x94, 0x36, - 0xc8, 0x1f, 0x40, 0x8a, 0x62, 0x46, 0x16, 0x79, 0xaa, 0x54, 0x55, 0x9b, 0x7e, 0x6d, 0xc9, 0x02, - 0xfe, 0x1a, 0x36, 0x32, 0x3a, 0x41, 0x16, 0x19, 0x2b, 0x2a, 0xa4, 0x7d, 0x50, 0x3a, 0xb7, 0x40, - 0xfa, 0x04, 0xdd, 0x65, 0x2d, 0x48, 0xaf, 0x69, 0x85, 0xe8, 0xa4, 0xd7, 0xb4, 0x52, 0x46, 0x1a, - 0xa4, 0x0f, 0x90, 0xb6, 0xd6, 0xf4, 0xb8, 0x0b, 0x7d, 0x3c, 0x3d, 0xee, 0x62, 0x27, 0xa6, 0x8d, - 0xf7, 0xcd, 0x98, 0xe1, 0x72, 0xab, 0x4c, 0x19, 0x56, 0xf4, 0xe4, 0x94, 0x61, 0x55, 0x97, 0xa5, - 0x0d, 0x72, 0x0b, 0x6f, 0x72, 0xbd, 0x8d, 0xbc, 0x5d, 0x84, 0x55, 0xd2, 0x68, 0xed, 0xc3, 0x8a, - 0xd9, 0x6c, 0xf1, 0x14, 0x9a, 0x47, 0x5a, 0x3c, 0x55, 0xcd, 0x32, 0x2d, 0x9e, 0xca, 0xce, 0x43, - 0x1b, 0x83, 0x96, 0xfe, 0x27, 0x39, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x96, 0x97, 0x74, 0xb7, - 0xc5, 0x0c, 0x00, 0x00, + // 1070 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, 0x70, 0xc8, 0xd2, 0x30, 0xcb, 0x8f, 0x31, 0x4b, 0x97, 0x4e, 0x7b, 0xc1, + 0x45, 0x8b, 0x56, 0x41, 0xaa, 0x7a, 0xb7, 0x02, 0xc4, 0x9f, 0xb6, 0x8b, 0x5a, 0x83, 0x84, 0x84, + 0x54, 0x59, 0x83, 0x99, 0x24, 0x16, 0x89, 0x27, 0x9d, 0x99, 0xc0, 0x66, 0x5f, 0xb3, 0x17, 0x7d, + 0x80, 0x5e, 0xf6, 0x25, 0x2a, 0xcf, 0x4c, 0x3c, 0x76, 0x6c, 0x73, 0x63, 0xf5, 0xce, 0x73, 0xe6, + 0xcc, 0x77, 0xbe, 0x39, 0x73, 0xfe, 0x0c, 0x0e, 0xa7, 0x63, 0x26, 0x42, 0xc9, 0xf8, 0xf4, 0x27, + 0x41, 0xf9, 0x73, 0x18, 0xd0, 0xc3, 0x31, 0x67, 0x92, 0xa1, 0x66, 0x3f, 0x94, 0x64, 0x38, 0x75, + 0xdb, 0x62, 0x40, 0x38, 0x7d, 0xd4, 0x52, 0xfc, 0x19, 0xb6, 0xbd, 0xe4, 0xc4, 0xd9, 0x97, 0x50, + 0x48, 0xe1, 0xd1, 0x3f, 0x27, 0x54, 0x48, 0xd4, 0x05, 0xb0, 0x60, 0x4e, 0x7d, 0xbf, 0x7e, 0xb0, + 0xda, 0x45, 0x87, 0x1a, 0xe5, 0xd0, 0x1e, 0xf2, 0x52, 0x5a, 0xb8, 0x0b, 0x4e, 0x1e, 0x4e, 0x8c, + 0x59, 0x24, 0x28, 0xda, 0x82, 0x26, 0x55, 0x12, 0x85, 0xb5, 0xec, 0x99, 0x15, 0xbe, 0x4e, 0x9f, + 0xb9, 0x12, 0x67, 0xa3, 0xb1, 0x9c, 0x56, 0xe1, 0xf0, 0x33, 0xec, 0x14, 0xe0, 0x19, 0x12, 0x3b, + 0xb0, 0x1c, 0x0a, 0x9f, 0xc6, 0x32, 0x43, 0xa3, 0x15, 0x6a, 0x15, 0xc3, 0x83, 0x04, 0x4f, 0x57, + 0x51, 0xc0, 0xe9, 0x88, 0x46, 0x92, 0x0c, 0xab, 0xf0, 0xd8, 0x55, 0x3c, 0xe6, 0xf1, 0x34, 0x0f, + 0x3c, 0x84, 0x75, 0xbd, 0x79, 0x3e, 0x19, 0x56, 0xb1, 0x82, 0xbe, 0x87, 0x37, 0x01, 0xa7, 0x44, + 0x52, 0xff, 0x21, 0x94, 0x23, 0x32, 0x76, 0x16, 0xd4, 0xad, 0xda, 0x5a, 0x78, 0xa2, 0x64, 0x78, + 0x03, 0x50, 0xda, 0x9a, 0xe1, 0x30, 0x86, 0xcd, 0x0b, 0xc2, 0x1f, 0x48, 0x9f, 0x9e, 0xb2, 0xe1, + 0x90, 0x06, 0xf2, 0x7f, 0xe7, 0xe1, 0xc0, 0xd6, 0xbc, 0x45, 0xc3, 0xe5, 0x13, 0x6c, 0x5a, 0xe0, + 0x9b, 0xf0, 0x2b, 0xad, 0xe2, 0xf9, 0x1f, 0x61, 0x6b, 0x1e, 0xcc, 0x3c, 0x3f, 0x82, 0x45, 0x11, + 0x7e, 0xa5, 0x0a, 0xa7, 0xe1, 0xa9, 0x6f, 0xfc, 0x04, 0x3b, 0xc7, 0xe3, 0xf1, 0x70, 0x7a, 0x11, + 0x4a, 0x22, 0x25, 0x0f, 0x1f, 0x26, 0x92, 0x56, 0x49, 0x02, 0xe4, 0xc2, 0x32, 0xa7, 0xcf, 0xa1, + 0x08, 0x59, 0xa4, 0xbc, 0xd0, 0xf6, 0x92, 0x35, 0x7e, 0x07, 0x6e, 0x91, 0x31, 0xe3, 0x85, 0x7f, + 0xea, 0x80, 0xce, 0xa9, 0x0c, 0x06, 0x1e, 0x1d, 0x31, 0x59, 0xc5, 0x07, 0x71, 0xb6, 0x71, 0x05, + 0xa2, 0x28, 0xac, 0x78, 0x66, 0x85, 0x36, 0x60, 0xa9, 0xc7, 0x78, 0x40, 0x9d, 0x86, 0x7a, 0x1f, + 0xbd, 0x40, 0xdb, 0xd0, 0x8a, 0x98, 0x2f, 0x49, 0x5f, 0x38, 0x8b, 0x3a, 0x39, 0x23, 0x76, 0x4b, + 0xfa, 0x02, 0x39, 0xd0, 0x92, 0xe1, 0x88, 0xb2, 0x89, 0x74, 0x96, 0xf6, 0xeb, 0x07, 0x4b, 0xde, + 0x6c, 0x19, 0x1f, 0x11, 0x62, 0xe0, 0x3f, 0xd1, 0xa9, 0xd3, 0xd4, 0x16, 0x84, 0x18, 0x7c, 0xa2, + 0x53, 0xf4, 0x1e, 0x56, 0x9f, 0x22, 0xf6, 0x12, 0xf9, 0x03, 0x16, 0x27, 0x7b, 0x4b, 0x6d, 0x82, + 0x12, 0x5d, 0xc6, 0x12, 0xbc, 0x09, 0x6f, 0x33, 0x97, 0x34, 0x97, 0xff, 0x0c, 0xdb, 0xa7, 0x2a, + 0x58, 0x52, 0x37, 0xaa, 0x10, 0x04, 0x2e, 0x38, 0x79, 0x38, 0x63, 0xea, 0xdf, 0x3a, 0xac, 0x5f, + 0x50, 0x79, 0xcc, 0x83, 0x41, 0xf8, 0x5c, 0xc9, 0xcd, 0xbb, 0xb0, 0x12, 0xb0, 0xd1, 0x28, 0x94, + 0x7e, 0xf8, 0x68, 0x3c, 0xbd, 0xac, 0x05, 0x57, 0x8f, 0xf1, 0x1b, 0x8c, 0x39, 0xed, 0x85, 0x5f, + 0x94, 0xb3, 0x57, 0x3c, 0xb3, 0x42, 0xbf, 0x40, 0xb3, 0xc7, 0xf8, 0x88, 0x48, 0xe5, 0xec, 0xb5, + 0xee, 0xfe, 0xcc, 0x48, 0x8e, 0xd3, 0xe1, 0xb9, 0xd2, 0xf3, 0x8c, 0x3e, 0x3e, 0x82, 0xa6, 0x96, + 0xa0, 0x16, 0x34, 0xee, 0xaf, 0x7e, 0xeb, 0xd4, 0xe2, 0x8f, 0xdb, 0x63, 0xaf, 0x53, 0x47, 0x00, + 0xcd, 0xdb, 0x63, 0xcf, 0xbf, 0xb8, 0xef, 0x2c, 0xa0, 0x55, 0x68, 0xc5, 0xdf, 0x27, 0xf7, 0xdd, + 0x4e, 0x03, 0x1f, 0x00, 0x4a, 0x03, 0xdb, 0x54, 0x78, 0x24, 0x92, 0xa8, 0x7b, 0xb6, 0x3d, 0xf5, + 0x1d, 0x3f, 0xc1, 0x25, 0x11, 0xbf, 0xb2, 0x80, 0x0c, 0x4f, 0x38, 0x89, 0x82, 0x41, 0xa5, 0x44, + 0xc0, 0x1f, 0xc0, 0xc9, 0xc3, 0x19, 0xf3, 0x1b, 0xb0, 0xf4, 0x4c, 0x86, 0x13, 0x6a, 0xaa, 0xb0, + 0x5e, 0x60, 0x09, 0x1b, 0xa7, 0x03, 0x12, 0xf5, 0xe9, 0x8d, 0x64, 0x9c, 0xf4, 0x2b, 0x3d, 0xcd, + 0x01, 0x74, 0x22, 0xfa, 0xe2, 0x0b, 0x8d, 0xe4, 0x47, 0x64, 0x34, 0xcb, 0x85, 0xb5, 0x88, 0xbe, + 0x18, 0x03, 0xd7, 0x64, 0x44, 0xf1, 0x36, 0x6c, 0xce, 0x59, 0x35, 0x71, 0xf2, 0x57, 0x1d, 0x1c, + 0x15, 0xaa, 0x37, 0x6c, 0xc2, 0x03, 0xaa, 0x2f, 0x51, 0x85, 0xd3, 0x47, 0x58, 0x17, 0x0a, 0xca, + 0x4f, 0x1d, 0x5d, 0x28, 0x3d, 0xda, 0xd1, 0xca, 0x5e, 0xa6, 0xcc, 0x1a, 0x80, 0x07, 0x45, 0x46, + 0x45, 0x56, 0xdb, 0x6b, 0x8b, 0x14, 0x41, 0xb4, 0x07, 0x20, 0x09, 0xef, 0x53, 0xe9, 0x73, 0xda, + 0x53, 0x31, 0xd6, 0xf6, 0x56, 0xb4, 0xc4, 0xa3, 0x3d, 0x7c, 0x04, 0x3b, 0x05, 0x97, 0xb2, 0x5d, + 0x9a, 0x53, 0x31, 0x19, 0xca, 0x59, 0x97, 0xd6, 0x2b, 0x7c, 0x0c, 0xab, 0xe7, 0x22, 0x78, 0xaa, + 0x12, 0x0e, 0x3f, 0x40, 0x5b, 0x43, 0xd8, 0x10, 0xa0, 0x9c, 0x33, 0x6e, 0x42, 0x50, 0x2f, 0xb0, + 0x80, 0x6f, 0xee, 0x78, 0x18, 0xa7, 0x6d, 0xaf, 0x8a, 0xa7, 0x3b, 0xd0, 0x88, 0x2f, 0xaf, 0xeb, + 0x6f, 0xfc, 0x99, 0x29, 0xcb, 0x8d, 0xb9, 0xb2, 0x7c, 0x00, 0x1d, 0x6b, 0xf4, 0x35, 0x7a, 0xdd, + 0xbf, 0x57, 0x54, 0xe7, 0x9e, 0x35, 0x17, 0x3d, 0x62, 0xa1, 0x3b, 0xe8, 0xcc, 0xcf, 0x3d, 0xe8, + 0x7d, 0x9e, 0x61, 0x66, 0xc0, 0x72, 0xf7, 0xcb, 0x15, 0x4c, 0xfc, 0xd5, 0xd0, 0x7d, 0xda, 0x9a, + 0x19, 0x66, 0x50, 0xc1, 0xc1, 0xec, 0xdc, 0xe4, 0x7e, 0xf7, 0x8a, 0xc6, 0x1c, 0x76, 0x76, 0x40, + 0xc9, 0x60, 0x17, 0xce, 0x42, 0x19, 0xec, 0x92, 0xe9, 0xa6, 0x86, 0xce, 0x00, 0xec, 0xc4, 0x81, + 0x76, 0xb2, 0x47, 0x52, 0x33, 0x8f, 0xeb, 0x16, 0x6d, 0x25, 0x30, 0xbf, 0xc3, 0x5a, 0x76, 0x60, + 0x40, 0x7b, 0x49, 0xad, 0x2c, 0x1a, 0x5d, 0xdc, 0x6f, 0xcb, 0xb6, 0xd3, 0x90, 0xd9, 0xe1, 0xc0, + 0x42, 0x16, 0x4e, 0x20, 0x16, 0xb2, 0x78, 0xa6, 0xc0, 0x35, 0xf4, 0x07, 0xa0, 0x7c, 0x53, 0x47, + 0x89, 0x9f, 0x4a, 0xa7, 0x0b, 0x17, 0xbf, 0xa6, 0x92, 0xc0, 0x5f, 0xc2, 0x6a, 0xaa, 0x5f, 0xa2, + 0xc4, 0x63, 0xf9, 0x49, 0xc1, 0xdd, 0x2d, 0xdc, 0x4b, 0x90, 0xee, 0xa0, 0x33, 0xdf, 0x13, 0x6d, + 0x98, 0x96, 0x34, 0x5f, 0x1b, 0xa6, 0xa5, 0xed, 0xb4, 0x86, 0x2e, 0x00, 0x6c, 0x8b, 0xb1, 0xcf, + 0x9d, 0xeb, 0x67, 0xf6, 0xb9, 0xf3, 0x1d, 0x09, 0xd7, 0x3e, 0xd4, 0x63, 0x86, 0xf3, 0x2d, 0xc3, + 0x32, 0x2c, 0xe9, 0x4d, 0x96, 0x61, 0x59, 0xb7, 0xc1, 0x35, 0x74, 0x0d, 0x6f, 0x32, 0x35, 0x1e, + 0xbd, 0x4b, 0xae, 0x55, 0xd0, 0x70, 0xdc, 0xbd, 0x92, 0xdd, 0x74, 0xf2, 0xe4, 0x8a, 0xa8, 0x4d, + 0x9e, 0xb2, 0xa6, 0x61, 0x93, 0xa7, 0xb4, 0x02, 0xe3, 0x1a, 0x3a, 0x82, 0xc5, 0xb8, 0x50, 0xa2, + 0xb7, 0x89, 0xb2, 0xad, 0xbc, 0xee, 0x46, 0x56, 0x98, 0x1c, 0xfa, 0x08, 0xcb, 0xb3, 0x12, 0x86, + 0xb6, 0x67, 0x3a, 0x73, 0x95, 0xd4, 0x75, 0xf2, 0x1b, 0x33, 0x80, 0x87, 0xa6, 0xfa, 0x23, 0x3c, + 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xc1, 0x43, 0x37, 0x43, 0x0e, 0x00, 0x00, } diff --git a/vendor/vendor.json b/vendor/vendor.json index 049e51684..bda79b5ae 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -201,12 +201,12 @@ "revisionTime": "2017-01-30T11:31:45Z" }, { - "checksumSHA1": "bGfAlbcqTr3IdViAogIPtRb8ZS4=", + "checksumSHA1": "wqiEiQvCNmzeYfjBtfSh0tOYoYs=", "path": "gitlab.com/gitlab-org/gitaly-proto/go", - "revision": "b1412591107369492d738b39493667548ce8c0f0", - "revisionTime": "2017-11-30T10:17:56Z", - "version": "v0.58.0", - "versionExact": "v0.58.0" + "revision": "fa425603222fbb85574be486460e88c84f49b77d", + "revisionTime": "2017-12-04T16:31:46Z", + "version": "v0.59.0", + "versionExact": "v0.59.0" }, { "checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=", |