diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-07-13 00:55:21 +0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-07-27 01:00:31 +0300 |
commit | e672c37382e57a6d695ef7d6343cf189471b0c7a (patch) | |
tree | a6918b5ad8373a4b699abe64a0d562fb5ef26a81 | |
parent | 3a9ae120cb3e6572a44e0b6b0519b3b451a18912 (diff) |
Add DiffNumStat RPC
-rw-r--r-- | changelogs/unreleased/diff-stats-rpc.yml | 5 | ||||
-rw-r--r-- | internal/diff/numstat.go | 105 | ||||
-rw-r--r-- | internal/service/diff/numstat.go | 94 | ||||
-rw-r--r-- | internal/service/diff/numstat_test.go | 284 | ||||
-rw-r--r-- | internal/service/diff/testdata/z-numstat.txt | bin | 0 -> 229 bytes | |||
-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 | 3 | ||||
-rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go | 245 | ||||
-rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/wiki.pb.go | 3 | ||||
-rw-r--r-- | vendor/vendor.json | 10 |
10 files changed, 695 insertions, 56 deletions
diff --git a/changelogs/unreleased/diff-stats-rpc.yml b/changelogs/unreleased/diff-stats-rpc.yml new file mode 100644 index 000000000..61c515686 --- /dev/null +++ b/changelogs/unreleased/diff-stats-rpc.yml @@ -0,0 +1,5 @@ +--- +title: Implement DiffService.DiffStats RPC +merge_request: 808 +author: +type: added diff --git a/internal/diff/numstat.go b/internal/diff/numstat.go new file mode 100644 index 000000000..b044fbc2f --- /dev/null +++ b/internal/diff/numstat.go @@ -0,0 +1,105 @@ +package diff + +import ( + "bufio" + "bytes" + "fmt" + "io" + "strconv" +) + +// NumStat represents a single parsed diff file change +type NumStat struct { + Path []byte + Additions int32 + Deletions int32 +} + +// NumStatParser holds necessary state for parsing the numstat output +type NumStatParser struct { + reader *bufio.Reader +} + +const ( + numStatDelimiter = byte(0) +) + +// NewDiffNumStatParser returns a new NumStatParser +func NewDiffNumStatParser(src io.Reader) *NumStatParser { + parser := &NumStatParser{} + reader := bufio.NewReader(src) + parser.reader = reader + + return parser +} + +// NextNumStat reads from git diff --numstat -z command, +// parses the stats and returns a *NumStat. +func (parser *NumStatParser) NextNumStat() (*NumStat, error) { + result := &NumStat{} + + data, err := parser.reader.ReadBytes(numStatDelimiter) + if err != nil { + return nil, err + } + + // We expect each `data` to be <NUM_ADDED>\t<NUM_DELETED>\t<REST>\0 + // <REST> can be either "<PATH>\0" or just "\0" + // In the latter case we are dealing with a rename (see below). + split := bytes.SplitN(data, []byte("\t"), 3) + if len(split) != 3 { + return nil, fmt.Errorf("error parsing %q", data) + } + + result.Additions, err = convertNumStat(split[0]) + if err != nil { + return nil, err + } + + result.Deletions, err = convertNumStat(split[1]) + if err != nil { + return nil, err + } + + rest := split[2] + if len(rest) == 0 { + return nil, fmt.Errorf("error parsing %q", data) + } + + if !bytes.Equal(rest, []byte{numStatDelimiter}) { + // We know that the last byte in 'rest' is a zero byte because of the + // contract of bufio.Reader.ReadBytes. + result.Path = rest[:len(rest)-1] + return result, nil + } + + // We are in the rename case. There will be two more zero-terminated + // strings: old path and new path. We discard the old path. + _, err = parser.reader.ReadBytes(numStatDelimiter) + if err != nil { + return nil, err + } + + newPath, err := parser.reader.ReadBytes(numStatDelimiter) + if err != nil { + return nil, err + } + + // Discard trailing zero byte left by ReadBytes + result.Path = newPath[:len(newPath)-1] + return result, nil +} + +func convertNumStat(num []byte) (int32, error) { + // It's a binary numstat + if bytes.Equal(num, []byte("-")) { + return 0, nil + } + + parsedNum, err := strconv.ParseInt(string(num), 10, 32) + if err != nil { + return 0, fmt.Errorf("error converting diff num stat: %v", err) + } + + return int32(parsedNum), nil +} diff --git a/internal/service/diff/numstat.go b/internal/service/diff/numstat.go new file mode 100644 index 000000000..1bb357a29 --- /dev/null +++ b/internal/service/diff/numstat.go @@ -0,0 +1,94 @@ +package diff + +import ( + "io" + + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/internal/diff" + "gitlab.com/gitlab-org/gitaly/internal/git" + "gitlab.com/gitlab-org/gitaly/internal/helper" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +var ( + maxNumStatBatchSize = 1000 +) + +func (s *server) DiffStats(in *pb.DiffStatsRequest, stream pb.DiffService_DiffStatsServer) error { + if err := validateDiffStatsRequestParams(in); err != nil { + return err + } + + var batch []*pb.DiffStats + cmdArgs := []string{"diff", "--numstat", "-z", in.LeftCommitId, in.RightCommitId} + cmd, err := git.Command(stream.Context(), in.Repository, cmdArgs...) + + if err != nil { + if _, ok := status.FromError(err); ok { + return err + } + return status.Errorf(codes.Internal, "%s: cmd: %v", "DiffStats", err) + } + + parser := diff.NewDiffNumStatParser(cmd) + + for { + stat, err := parser.NextNumStat() + if err != nil { + if err == io.EOF { + break + } + + return err + } + + numStat := &pb.DiffStats{ + Additions: stat.Additions, + Deletions: stat.Deletions, + Path: stat.Path, + } + + batch = append(batch, numStat) + + if len(batch) == maxNumStatBatchSize { + err := sendStats(batch, stream) + if err != nil { + return err + } + + batch = nil + } + } + + if err := cmd.Wait(); err != nil { + return status.Errorf(codes.Unavailable, "%s: %v", "DiffStats", err) + } + + return sendStats(batch, stream) +} + +func sendStats(batch []*pb.DiffStats, stream pb.DiffService_DiffStatsServer) error { + if len(batch) == 0 { + return nil + } + + if err := stream.Send(&pb.DiffStatsResponse{Stats: batch}); err != nil { + return status.Errorf(codes.Unavailable, "DiffStats: send: %v", err) + } + + return nil +} + +func validateDiffStatsRequestParams(in *pb.DiffStatsRequest) error { + repo := in.GetRepository() + if _, err := helper.GetRepoPath(repo); err != nil { + return err + } + + if err := validateRequest(in); err != nil { + return status.Errorf(codes.InvalidArgument, "DiffStats: %v", err) + } + + return nil +} diff --git a/internal/service/diff/numstat_test.go b/internal/service/diff/numstat_test.go new file mode 100644 index 000000000..c94779856 --- /dev/null +++ b/internal/service/diff/numstat_test.go @@ -0,0 +1,284 @@ +package diff + +import ( + "io" + "os" + "testing" + + "github.com/stretchr/testify/require" + pb "gitlab.com/gitlab-org/gitaly-proto/go" + "gitlab.com/gitlab-org/gitaly/internal/diff" + "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "golang.org/x/net/context" + "google.golang.org/grpc/codes" +) + +func TestSuccessfulDiffStatsRequest(t *testing.T) { + server, serverSocketPath := runDiffServer(t) + defer server.Stop() + + client, conn := newDiffClient(t, serverSocketPath) + defer conn.Close() + + testRepo, _, cleanupFn := testhelper.NewTestRepo(t) + defer cleanupFn() + + rightCommit := "e4003da16c1c2c3fc4567700121b17bf8e591c6c" + leftCommit := "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab" + rpcRequest := &pb.DiffStatsRequest{Repository: testRepo, RightCommitId: rightCommit, LeftCommitId: leftCommit} + + ctx, cancel := testhelper.Context() + defer cancel() + + expectedStats := []diff.NumStat{ + { + Path: []byte("CONTRIBUTING.md"), + Additions: 1, + Deletions: 1, + }, + { + Path: []byte("MAINTENANCE.md"), + Additions: 1, + Deletions: 1, + }, + { + Path: []byte("README.md"), + Additions: 1, + Deletions: 1, + }, + { + Path: []byte("gitaly/deleted-file"), + Additions: 0, + Deletions: 1, + }, + { + Path: []byte("gitaly/file-with-multiple-chunks"), + Additions: 28, + Deletions: 23, + }, + { + Path: []byte("gitaly/logo-white.png"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("gitaly/mode-file"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("gitaly/mode-file-with-mods"), + Additions: 2, + Deletions: 1, + }, + { + Path: []byte("gitaly/named-file-with-mods"), + Additions: 0, + Deletions: 1, + }, + { + Path: []byte("gitaly/no-newline-at-the-end"), + Additions: 1, + Deletions: 0, + }, + { + Path: []byte("gitaly/renamed-file"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("gitaly/renamed-file-with-mods"), + Additions: 1, + Deletions: 0, + }, + { + Path: []byte("gitaly/tab\tnewline\n file"), + Additions: 1, + Deletions: 0, + }, + { + Path: []byte("gitaly/テスト.txt"), + Additions: 0, + Deletions: 0, + }, + } + + stream, err := client.DiffStats(ctx, rpcRequest) + if err != nil { + t.Fatal(err) + } + + for { + fetchedStats, err := stream.Recv() + if err == io.EOF { + break + } + + require.NoError(t, err) + + stats := fetchedStats.GetStats() + + for index, fetchedStat := range stats { + expectedStat := expectedStats[index] + + require.Equal(t, expectedStat.Path, fetchedStat.Path) + require.Equal(t, expectedStat.Additions, fetchedStat.Additions) + require.Equal(t, expectedStat.Deletions, fetchedStat.Deletions) + } + } +} + +func TestFailedDiffStatsRequest(t *testing.T) { + server, serverSocketPath := runDiffServer(t) + defer server.Stop() + + client, conn := newDiffClient(t, serverSocketPath) + defer conn.Close() + + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + testRepo, _, cleanupFn := testhelper.NewTestRepo(t) + defer cleanupFn() + + tests := []struct { + desc string + repo *pb.Repository + leftCommitID string + rightCommitID string + err codes.Code + }{ + { + desc: "repo not found", + repo: &pb.Repository{StorageName: testRepo.GetStorageName(), RelativePath: "bar.git"}, + leftCommitID: "e4003da16c1c2c3fc4567700121b17bf8e591c6c", + rightCommitID: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", + err: codes.NotFound, + }, + { + desc: "storage not found", + repo: &pb.Repository{StorageName: "foo", RelativePath: "bar.git"}, + leftCommitID: "e4003da16c1c2c3fc4567700121b17bf8e591c6c", + rightCommitID: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", + err: codes.InvalidArgument, + }, + { + desc: "left commit ID not found", + repo: testRepo, + leftCommitID: "", + rightCommitID: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", + err: codes.InvalidArgument, + }, + { + desc: "right commit ID not found", + repo: testRepo, + leftCommitID: "e4003da16c1c2c3fc4567700121b17bf8e591c6c", + rightCommitID: "", + err: codes.InvalidArgument, + }, + { + desc: "invalid left commit", + repo: testRepo, + leftCommitID: "invalidinvalidinvalid", + rightCommitID: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", + err: codes.Unavailable, + }, + { + desc: "invalid right commit", + repo: testRepo, + leftCommitID: "e4003da16c1c2c3fc4567700121b17bf8e591c6c", + rightCommitID: "invalidinvalidinvalid", + err: codes.Unavailable, + }, + { + desc: "left commit not found", + repo: testRepo, + leftCommitID: "z4003da16c1c2c3fc4567700121b17bf8e591c6c", + rightCommitID: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", + err: codes.Unavailable, + }, + { + desc: "right commit not found", + repo: testRepo, + leftCommitID: "e4003da16c1c2c3fc4567700121b17bf8e591c6c", + rightCommitID: "z4003da16c1c2c3fc4567700121b17bf8e591c6c", + err: codes.Unavailable, + }, + } + + for _, tc := range tests { + rpcRequest := &pb.DiffStatsRequest{Repository: tc.repo, RightCommitId: tc.rightCommitID, LeftCommitId: tc.leftCommitID} + stream, err := client.DiffStats(ctx, rpcRequest) + require.NoError(t, err) + + t.Run(tc.desc, func(t *testing.T) { + _, err := stream.Recv() + + testhelper.RequireGrpcError(t, err, tc.err) + }) + } +} + +func TestStatsParser(t *testing.T) { + file, err := os.Open("testdata/z-numstat.txt") + + require.NoError(t, err) + defer file.Close() + + var parsedStats []*diff.NumStat + + parser := diff.NewDiffNumStatParser(file) + + for { + stat, err := parser.NextNumStat() + if err == io.EOF { + break + } + + require.NoError(t, err) + parsedStats = append(parsedStats, stat) + } + + expectedStats := []diff.NumStat{ + { + Path: []byte("app/controllers/graphql_controller.rb"), + Additions: 0, + Deletions: 15, + }, + { + Path: []byte("app/models/mr.rb"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("image.jpg"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("files/autocomplete_users_finder.rb"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("newfile"), + Additions: 0, + Deletions: 0, + }, + { + Path: []byte("xpto\nspace and linebreak"), + Additions: 1, + Deletions: 5, + }, + } + + require.Equal(t, len(expectedStats), len(parsedStats)) + + for index, parsedStat := range parsedStats { + expectedStat := expectedStats[index] + + require.Equal(t, expectedStat.Additions, parsedStat.Additions) + require.Equal(t, expectedStat.Deletions, parsedStat.Deletions) + require.Equal(t, expectedStat.Path, parsedStat.Path) + } +} diff --git a/internal/service/diff/testdata/z-numstat.txt b/internal/service/diff/testdata/z-numstat.txt Binary files differnew file mode 100644 index 000000000..5d755a557 --- /dev/null +++ b/internal/service/diff/testdata/z-numstat.txt diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION index a9a7f3fec..3f667dbcd 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION @@ -1 +1 @@ -0.107.0 +0.108.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 0b84a872d..618266011 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 @@ -92,6 +92,9 @@ It has these top-level messages: RawDiffResponse RawPatchRequest RawPatchResponse + DiffStatsRequest + DiffStats + DiffStatsResponse AddNamespaceRequest RemoveNamespaceRequest RenameNamespaceRequest diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go index fce1deadc..a9a6231be 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/diff.pb.go @@ -478,6 +478,86 @@ func (m *RawPatchResponse) GetData() []byte { return nil } +type DiffStatsRequest struct { + Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` + LeftCommitId string `protobuf:"bytes,2,opt,name=left_commit_id,json=leftCommitId" json:"left_commit_id,omitempty"` + RightCommitId string `protobuf:"bytes,3,opt,name=right_commit_id,json=rightCommitId" json:"right_commit_id,omitempty"` +} + +func (m *DiffStatsRequest) Reset() { *m = DiffStatsRequest{} } +func (m *DiffStatsRequest) String() string { return proto.CompactTextString(m) } +func (*DiffStatsRequest) ProtoMessage() {} +func (*DiffStatsRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{11} } + +func (m *DiffStatsRequest) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *DiffStatsRequest) GetLeftCommitId() string { + if m != nil { + return m.LeftCommitId + } + return "" +} + +func (m *DiffStatsRequest) GetRightCommitId() string { + if m != nil { + return m.RightCommitId + } + return "" +} + +type DiffStats struct { + Path []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Additions int32 `protobuf:"varint,2,opt,name=additions" json:"additions,omitempty"` + Deletions int32 `protobuf:"varint,3,opt,name=deletions" json:"deletions,omitempty"` +} + +func (m *DiffStats) Reset() { *m = DiffStats{} } +func (m *DiffStats) String() string { return proto.CompactTextString(m) } +func (*DiffStats) ProtoMessage() {} +func (*DiffStats) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{12} } + +func (m *DiffStats) GetPath() []byte { + if m != nil { + return m.Path + } + return nil +} + +func (m *DiffStats) GetAdditions() int32 { + if m != nil { + return m.Additions + } + return 0 +} + +func (m *DiffStats) GetDeletions() int32 { + if m != nil { + return m.Deletions + } + return 0 +} + +type DiffStatsResponse struct { + Stats []*DiffStats `protobuf:"bytes,1,rep,name=stats" json:"stats,omitempty"` +} + +func (m *DiffStatsResponse) Reset() { *m = DiffStatsResponse{} } +func (m *DiffStatsResponse) String() string { return proto.CompactTextString(m) } +func (*DiffStatsResponse) ProtoMessage() {} +func (*DiffStatsResponse) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{13} } + +func (m *DiffStatsResponse) GetStats() []*DiffStats { + if m != nil { + return m.Stats + } + return nil +} + func init() { proto.RegisterType((*CommitDiffRequest)(nil), "gitaly.CommitDiffRequest") proto.RegisterType((*CommitDiffResponse)(nil), "gitaly.CommitDiffResponse") @@ -490,6 +570,9 @@ func init() { proto.RegisterType((*RawDiffResponse)(nil), "gitaly.RawDiffResponse") proto.RegisterType((*RawPatchRequest)(nil), "gitaly.RawPatchRequest") proto.RegisterType((*RawPatchResponse)(nil), "gitaly.RawPatchResponse") + proto.RegisterType((*DiffStatsRequest)(nil), "gitaly.DiffStatsRequest") + proto.RegisterType((*DiffStats)(nil), "gitaly.DiffStats") + proto.RegisterType((*DiffStatsResponse)(nil), "gitaly.DiffStatsResponse") } // Reference imports to suppress errors if they are not otherwise used. @@ -510,6 +593,7 @@ type DiffServiceClient interface { CommitPatch(ctx context.Context, in *CommitPatchRequest, opts ...grpc.CallOption) (DiffService_CommitPatchClient, error) RawDiff(ctx context.Context, in *RawDiffRequest, opts ...grpc.CallOption) (DiffService_RawDiffClient, error) RawPatch(ctx context.Context, in *RawPatchRequest, opts ...grpc.CallOption) (DiffService_RawPatchClient, error) + DiffStats(ctx context.Context, in *DiffStatsRequest, opts ...grpc.CallOption) (DiffService_DiffStatsClient, error) } type diffServiceClient struct { @@ -680,6 +764,38 @@ func (x *diffServiceRawPatchClient) Recv() (*RawPatchResponse, error) { return m, nil } +func (c *diffServiceClient) DiffStats(ctx context.Context, in *DiffStatsRequest, opts ...grpc.CallOption) (DiffService_DiffStatsClient, error) { + stream, err := grpc.NewClientStream(ctx, &_DiffService_serviceDesc.Streams[5], c.cc, "/gitaly.DiffService/DiffStats", opts...) + if err != nil { + return nil, err + } + x := &diffServiceDiffStatsClient{stream} + if err := x.ClientStream.SendMsg(in); err != nil { + return nil, err + } + if err := x.ClientStream.CloseSend(); err != nil { + return nil, err + } + return x, nil +} + +type DiffService_DiffStatsClient interface { + Recv() (*DiffStatsResponse, error) + grpc.ClientStream +} + +type diffServiceDiffStatsClient struct { + grpc.ClientStream +} + +func (x *diffServiceDiffStatsClient) Recv() (*DiffStatsResponse, error) { + m := new(DiffStatsResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + // Server API for DiffService service type DiffServiceServer interface { @@ -690,6 +806,7 @@ type DiffServiceServer interface { CommitPatch(*CommitPatchRequest, DiffService_CommitPatchServer) error RawDiff(*RawDiffRequest, DiffService_RawDiffServer) error RawPatch(*RawPatchRequest, DiffService_RawPatchServer) error + DiffStats(*DiffStatsRequest, DiffService_DiffStatsServer) error } func RegisterDiffServiceServer(s *grpc.Server, srv DiffServiceServer) { @@ -801,6 +918,27 @@ func (x *diffServiceRawPatchServer) Send(m *RawPatchResponse) error { return x.ServerStream.SendMsg(m) } +func _DiffService_DiffStats_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(DiffStatsRequest) + if err := stream.RecvMsg(m); err != nil { + return err + } + return srv.(DiffServiceServer).DiffStats(m, &diffServiceDiffStatsServer{stream}) +} + +type DiffService_DiffStatsServer interface { + Send(*DiffStatsResponse) error + grpc.ServerStream +} + +type diffServiceDiffStatsServer struct { + grpc.ServerStream +} + +func (x *diffServiceDiffStatsServer) Send(m *DiffStatsResponse) error { + return x.ServerStream.SendMsg(m) +} + var _DiffService_serviceDesc = grpc.ServiceDesc{ ServiceName: "gitaly.DiffService", HandlerType: (*DiffServiceServer)(nil), @@ -831,6 +969,11 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{ Handler: _DiffService_RawPatch_Handler, ServerStreams: true, }, + { + StreamName: "DiffStats", + Handler: _DiffService_DiffStats_Handler, + ServerStreams: true, + }, }, Metadata: "diff.proto", } @@ -838,53 +981,57 @@ var _DiffService_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("diff.proto", fileDescriptor4) } var fileDescriptor4 = []byte{ - // 753 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xdb, 0x46, - 0x10, 0x2d, 0xf5, 0x41, 0x51, 0x23, 0x5a, 0x76, 0xd7, 0x85, 0x4d, 0xcb, 0x3d, 0x08, 0x44, 0xed, - 0xaa, 0x28, 0x60, 0x14, 0xea, 0xa5, 0xa7, 0x02, 0xb5, 0x8d, 0x16, 0x36, 0x6c, 0xd4, 0x60, 0x0e, - 0x39, 0x12, 0x6b, 0xed, 0x52, 0x5a, 0x84, 0xe4, 0x2a, 0xbb, 0x1b, 0xcb, 0xfa, 0x1b, 0xc9, 0x8f, - 0xc8, 0x25, 0xff, 0x28, 0xbf, 0x22, 0xf7, 0x1c, 0x82, 0xdd, 0x25, 0x29, 0xca, 0x56, 0x72, 0x71, - 0x0e, 0xbe, 0x69, 0xdf, 0x7b, 0x9c, 0x19, 0xbe, 0x37, 0x4b, 0x08, 0x80, 0xb0, 0x24, 0x39, 0x99, - 0x0b, 0xae, 0x38, 0x72, 0xa7, 0x4c, 0xe1, 0x74, 0x39, 0xf0, 0xe5, 0x0c, 0x0b, 0x4a, 0x2c, 0x1a, - 0x7e, 0x6e, 0xc2, 0x8f, 0x67, 0x3c, 0xcb, 0x98, 0x3a, 0x67, 0x49, 0x12, 0xd1, 0xd7, 0x6f, 0xa8, - 0x54, 0x68, 0x0c, 0x20, 0xe8, 0x9c, 0x4b, 0xa6, 0xb8, 0x58, 0x06, 0xce, 0xd0, 0x19, 0xf5, 0xc6, - 0xe8, 0xc4, 0x16, 0x38, 0x89, 0x2a, 0x26, 0xaa, 0xa9, 0xd0, 0x2f, 0xd0, 0x4f, 0x69, 0xa2, 0xe2, - 0x89, 0xa9, 0x16, 0x33, 0x12, 0x34, 0x86, 0xce, 0xa8, 0x1b, 0xf9, 0x1a, 0xb5, 0x2d, 0x2e, 0x08, - 0x3a, 0x86, 0x6d, 0xc1, 0xa6, 0xb3, 0xba, 0xac, 0x69, 0x64, 0x5b, 0x06, 0xae, 0x74, 0x7f, 0x41, - 0xc0, 0xa6, 0x39, 0x17, 0x34, 0x5e, 0xcc, 0x98, 0xa2, 0x72, 0x8e, 0x27, 0x34, 0x9e, 0xcc, 0x70, - 0x3e, 0xa5, 0x41, 0x6b, 0xe8, 0x8c, 0xbc, 0x68, 0xcf, 0xf2, 0x2f, 0x2b, 0xfa, 0xcc, 0xb0, 0xe8, - 0x27, 0x68, 0xcf, 0xb1, 0x9a, 0xc9, 0xa0, 0x3d, 0x6c, 0x8e, 0xfc, 0xc8, 0x1e, 0xd0, 0x11, 0xf4, - 0x27, 0x3c, 0x4d, 0xf1, 0x5c, 0xd2, 0x58, 0x9b, 0x22, 0x03, 0xd7, 0x54, 0xd9, 0x2a, 0x51, 0xfd, - 0xfa, 0x46, 0x46, 0xf3, 0x84, 0x8b, 0x09, 0x8d, 0x53, 0x96, 0x31, 0x25, 0x83, 0x8e, 0x95, 0x15, - 0xe8, 0x95, 0x01, 0xd1, 0x21, 0x74, 0x33, 0x7c, 0x1f, 0x27, 0x2c, 0xa5, 0x32, 0xf0, 0x86, 0xce, - 0xa8, 0x1d, 0x79, 0x19, 0xbe, 0xff, 0x57, 0x9f, 0x4b, 0x32, 0x65, 0x39, 0x95, 0x41, 0xb7, 0x22, - 0xaf, 0xf4, 0xb9, 0x24, 0x6f, 0x97, 0x8a, 0xca, 0x00, 0x2a, 0xf2, 0x54, 0x9f, 0xb5, 0x85, 0x12, - 0x27, 0x34, 0x5e, 0xd5, 0xee, 0x19, 0x85, 0xaf, 0xd1, 0xeb, 0xb2, 0x7e, 0x5d, 0x65, 0x9b, 0xf8, - 0x6b, 0x2a, 0xdb, 0xa8, 0xae, 0xb2, 0xdd, 0xb6, 0xd6, 0x54, 0xa6, 0x63, 0xf8, 0xb1, 0x01, 0xa8, - 0x1e, 0xbf, 0x9c, 0xf3, 0x5c, 0x52, 0x3d, 0x65, 0x22, 0x78, 0x16, 0x6b, 0xef, 0x4c, 0xfc, 0x7e, - 0xe4, 0x69, 0xe0, 0x06, 0xab, 0x19, 0xda, 0x87, 0x8e, 0xe2, 0x96, 0x6a, 0x18, 0xca, 0x55, 0xbc, - 0x24, 0xcc, 0x53, 0x55, 0xa6, 0xae, 0x3e, 0x5e, 0x10, 0xb4, 0x0b, 0x6d, 0xc5, 0x35, 0xdc, 0x32, - 0x70, 0x4b, 0xf1, 0x0b, 0x82, 0x0e, 0xc0, 0xe3, 0x29, 0x89, 0x33, 0x4e, 0x68, 0xd0, 0x36, 0xa3, - 0x75, 0x78, 0x4a, 0xae, 0x39, 0xa1, 0x9a, 0xca, 0xe9, 0xc2, 0x52, 0xae, 0xa5, 0x72, 0xba, 0x30, - 0xd4, 0x1e, 0xb8, 0xb7, 0x2c, 0xc7, 0x62, 0x59, 0x04, 0x53, 0x9c, 0xf4, 0xeb, 0x0a, 0xbc, 0xd0, - 0x53, 0x4d, 0x66, 0x31, 0xc1, 0x0a, 0x1b, 0xe7, 0xfd, 0xc8, 0x17, 0x78, 0x71, 0xa3, 0xc1, 0x73, - 0xac, 0x30, 0x1a, 0x82, 0x4f, 0x73, 0x12, 0xf3, 0xc4, 0x0a, 0x4d, 0x00, 0x5e, 0x04, 0x34, 0x27, - 0xff, 0x27, 0x46, 0x85, 0x7e, 0x85, 0x6d, 0x7e, 0x47, 0x45, 0x92, 0xf2, 0x45, 0x9c, 0x61, 0xf1, - 0x8a, 0x0a, 0x93, 0x81, 0x17, 0xf5, 0x4b, 0xf8, 0xda, 0xa0, 0xe8, 0x67, 0xe8, 0x96, 0xab, 0x43, - 0x4c, 0x00, 0x5e, 0xb4, 0x02, 0x2e, 0x5b, 0x9e, 0xb7, 0xd3, 0x0d, 0x3f, 0x38, 0x95, 0xbb, 0x34, - 0x55, 0xf8, 0xf9, 0xdc, 0xae, 0xea, 0x8e, 0xb4, 0x6a, 0x77, 0x24, 0x7c, 0xef, 0x40, 0xaf, 0x36, - 0xee, 0xf3, 0xdd, 0x82, 0xf0, 0x14, 0x76, 0xd7, 0x7c, 0x2d, 0xd6, 0xf6, 0x77, 0x70, 0x89, 0x06, - 0x64, 0xe0, 0x0c, 0x9b, 0xa3, 0xde, 0x78, 0xb7, 0x34, 0xb5, 0x2e, 0x2e, 0x24, 0x21, 0x29, 0xb3, - 0x31, 0xc1, 0x3f, 0x25, 0x9b, 0x01, 0x78, 0x82, 0xde, 0x31, 0xc9, 0x78, 0x5e, 0x78, 0x51, 0x9d, - 0xc3, 0xdf, 0xca, 0x49, 0x8b, 0x2e, 0xc5, 0xa4, 0x08, 0x5a, 0x66, 0x49, 0xad, 0xab, 0xe6, 0x77, - 0xf8, 0xd6, 0x81, 0x7e, 0x84, 0x17, 0xcf, 0xea, 0x3b, 0x1c, 0x1e, 0xc1, 0x76, 0x35, 0xd3, 0x37, - 0x66, 0x7f, 0xe7, 0x18, 0xdd, 0x93, 0xad, 0xfc, 0xbe, 0xc3, 0x1f, 0xc3, 0xce, 0x6a, 0xa8, 0xaf, - 0x4f, 0x3f, 0xfe, 0xd4, 0x80, 0x9e, 0x7e, 0xc5, 0x17, 0x54, 0xdc, 0xb1, 0x09, 0x45, 0xff, 0x01, - 0xac, 0x3e, 0x8a, 0xe8, 0xe0, 0xc1, 0x16, 0xad, 0xf2, 0x19, 0x0c, 0x36, 0x51, 0xb6, 0x51, 0xf8, - 0xc3, 0x1f, 0x0e, 0xba, 0x5c, 0xbf, 0x50, 0x83, 0x4d, 0xfb, 0x58, 0x94, 0x3a, 0xdc, 0xc8, 0x6d, - 0xaa, 0x65, 0x3f, 0x54, 0x0f, 0x6a, 0xd5, 0x9d, 0x7f, 0x58, 0x6b, 0xcd, 0x00, 0x53, 0xeb, 0x6f, - 0xe8, 0x14, 0xa9, 0xa2, 0xbd, 0x2a, 0x91, 0xb5, 0xd5, 0x1b, 0xec, 0x3f, 0xc2, 0x6b, 0xcf, 0xff, - 0x03, 0x5e, 0x69, 0x2c, 0xaa, 0x0b, 0xd7, 0xa6, 0x08, 0x1e, 0x13, 0xab, 0x12, 0xb7, 0xae, 0xf9, - 0xff, 0xf1, 0xe7, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0x55, 0x7c, 0x0d, 0x4f, 0xa3, 0x08, 0x00, - 0x00, + // 831 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0x33, 0x35, + 0x14, 0x65, 0x9a, 0x64, 0x32, 0xb9, 0x99, 0xa6, 0xad, 0x8b, 0xfa, 0x4d, 0xf3, 0xb1, 0x88, 0x46, + 0xb4, 0x0d, 0x42, 0xaa, 0x50, 0xd8, 0xb0, 0x40, 0x48, 0xb4, 0x15, 0xa8, 0x55, 0x2b, 0xaa, 0x61, + 0xc1, 0x82, 0xc5, 0xc8, 0x8d, 0x3d, 0x89, 0xc5, 0xcc, 0x38, 0xd8, 0xa6, 0x69, 0x5e, 0x03, 0x78, + 0x07, 0x36, 0xec, 0x79, 0x18, 0x5e, 0x85, 0x05, 0xb2, 0x3d, 0x7f, 0x69, 0xa3, 0x6e, 0xfa, 0x2d, + 0xb2, 0x8b, 0xcf, 0x39, 0x73, 0xef, 0xf1, 0xfd, 0x71, 0x0b, 0x40, 0x58, 0x92, 0x9c, 0x2f, 0x04, + 0x57, 0x1c, 0xb9, 0x33, 0xa6, 0x70, 0xba, 0x1a, 0xfa, 0x72, 0x8e, 0x05, 0x25, 0x16, 0x0d, 0xff, + 0x6b, 0xc1, 0xc1, 0x25, 0xcf, 0x32, 0xa6, 0xae, 0x58, 0x92, 0x44, 0xf4, 0xd7, 0xdf, 0xa8, 0x54, + 0x68, 0x02, 0x20, 0xe8, 0x82, 0x4b, 0xa6, 0xb8, 0x58, 0x05, 0xce, 0xc8, 0x19, 0xf7, 0x27, 0xe8, + 0xdc, 0x06, 0x38, 0x8f, 0x2a, 0x26, 0x6a, 0xa8, 0xd0, 0xa7, 0x30, 0x48, 0x69, 0xa2, 0xe2, 0xa9, + 0x89, 0x16, 0x33, 0x12, 0xec, 0x8c, 0x9c, 0x71, 0x2f, 0xf2, 0x35, 0x6a, 0x53, 0x5c, 0x13, 0x74, + 0x0a, 0x7b, 0x82, 0xcd, 0xe6, 0x4d, 0x59, 0xcb, 0xc8, 0x76, 0x0d, 0x5c, 0xe9, 0xbe, 0x82, 0x80, + 0xcd, 0x72, 0x2e, 0x68, 0xbc, 0x9c, 0x33, 0x45, 0xe5, 0x02, 0x4f, 0x69, 0x3c, 0x9d, 0xe3, 0x7c, + 0x46, 0x83, 0xf6, 0xc8, 0x19, 0x7b, 0xd1, 0x91, 0xe5, 0x7f, 0xaa, 0xe8, 0x4b, 0xc3, 0xa2, 0x8f, + 0xa1, 0xb3, 0xc0, 0x6a, 0x2e, 0x83, 0xce, 0xa8, 0x35, 0xf6, 0x23, 0x7b, 0x40, 0x27, 0x30, 0x98, + 0xf2, 0x34, 0xc5, 0x0b, 0x49, 0x63, 0x5d, 0x14, 0x19, 0xb8, 0x26, 0xca, 0x6e, 0x89, 0xea, 0xeb, + 0x1b, 0x19, 0xcd, 0x13, 0x2e, 0xa6, 0x34, 0x4e, 0x59, 0xc6, 0x94, 0x0c, 0xba, 0x56, 0x56, 0xa0, + 0xb7, 0x06, 0x44, 0xef, 0xa1, 0x97, 0xe1, 0xa7, 0x38, 0x61, 0x29, 0x95, 0x81, 0x37, 0x72, 0xc6, + 0x9d, 0xc8, 0xcb, 0xf0, 0xd3, 0x77, 0xfa, 0x5c, 0x92, 0x29, 0xcb, 0xa9, 0x0c, 0x7a, 0x15, 0x79, + 0xab, 0xcf, 0x25, 0xf9, 0xb0, 0x52, 0x54, 0x06, 0x50, 0x91, 0x17, 0xfa, 0xac, 0x4b, 0x28, 0x71, + 0x42, 0xe3, 0x3a, 0x76, 0xdf, 0x28, 0x7c, 0x8d, 0xde, 0x95, 0xf1, 0x9b, 0x2a, 0x9b, 0xc4, 0x5f, + 0x53, 0xd9, 0x44, 0x4d, 0x95, 0xcd, 0xb6, 0xbb, 0xa6, 0x32, 0x19, 0xc3, 0x7f, 0x77, 0x00, 0x35, + 0xdb, 0x2f, 0x17, 0x3c, 0x97, 0x54, 0xbb, 0x4c, 0x04, 0xcf, 0x62, 0x5d, 0x3b, 0xd3, 0x7e, 0x3f, + 0xf2, 0x34, 0x70, 0x8f, 0xd5, 0x1c, 0xbd, 0x83, 0xae, 0xe2, 0x96, 0xda, 0x31, 0x94, 0xab, 0x78, + 0x49, 0x98, 0xaf, 0xaa, 0x9e, 0xba, 0xfa, 0x78, 0x4d, 0xd0, 0x21, 0x74, 0x14, 0xd7, 0x70, 0xdb, + 0xc0, 0x6d, 0xc5, 0xaf, 0x09, 0x3a, 0x06, 0x8f, 0xa7, 0x24, 0xce, 0x38, 0xa1, 0x41, 0xc7, 0x58, + 0xeb, 0xf2, 0x94, 0xdc, 0x71, 0x42, 0x35, 0x95, 0xd3, 0xa5, 0xa5, 0x5c, 0x4b, 0xe5, 0x74, 0x69, + 0xa8, 0x23, 0x70, 0x1f, 0x58, 0x8e, 0xc5, 0xaa, 0x68, 0x4c, 0x71, 0xd2, 0xd7, 0x15, 0x78, 0xa9, + 0x5d, 0x4d, 0xe7, 0x31, 0xc1, 0x0a, 0x9b, 0xca, 0xfb, 0x91, 0x2f, 0xf0, 0xf2, 0x5e, 0x83, 0x57, + 0x58, 0x61, 0x34, 0x02, 0x9f, 0xe6, 0x24, 0xe6, 0x89, 0x15, 0x9a, 0x06, 0x78, 0x11, 0xd0, 0x9c, + 0xfc, 0x90, 0x18, 0x15, 0x3a, 0x83, 0x3d, 0xfe, 0x48, 0x45, 0x92, 0xf2, 0x65, 0x9c, 0x61, 0xf1, + 0x0b, 0x15, 0xa6, 0x07, 0x5e, 0x34, 0x28, 0xe1, 0x3b, 0x83, 0xa2, 0x4f, 0xa0, 0x57, 0x8e, 0x0e, + 0x31, 0x0d, 0xf0, 0xa2, 0x1a, 0xb8, 0x69, 0x7b, 0xde, 0x7e, 0x2f, 0xfc, 0xdb, 0xa9, 0xaa, 0x4b, + 0x53, 0x85, 0xb7, 0x67, 0xbb, 0xaa, 0x1d, 0x69, 0x37, 0x76, 0x24, 0xfc, 0xcb, 0x81, 0x7e, 0xc3, + 0xee, 0xf6, 0x4e, 0x41, 0x78, 0x01, 0x87, 0x6b, 0x75, 0x2d, 0xc6, 0xf6, 0x73, 0x70, 0x89, 0x06, + 0x64, 0xe0, 0x8c, 0x5a, 0xe3, 0xfe, 0xe4, 0xb0, 0x2c, 0x6a, 0x53, 0x5c, 0x48, 0x42, 0x52, 0xf6, + 0xc6, 0x34, 0xfe, 0x2d, 0xbd, 0x19, 0x82, 0x27, 0xe8, 0x23, 0x93, 0x8c, 0xe7, 0x45, 0x2d, 0xaa, + 0x73, 0xf8, 0x59, 0xe9, 0xb4, 0xc8, 0x52, 0x38, 0x45, 0xd0, 0x36, 0x43, 0x6a, 0xab, 0x6a, 0x7e, + 0x87, 0xbf, 0x3b, 0x30, 0x88, 0xf0, 0x72, 0xab, 0xde, 0xe1, 0xf0, 0x04, 0xf6, 0x2a, 0x4f, 0xaf, + 0x78, 0xff, 0xc3, 0x31, 0xba, 0x37, 0x97, 0xf2, 0xc3, 0x9a, 0x3f, 0x85, 0xfd, 0xda, 0xd4, 0x2b, + 0xee, 0xff, 0x74, 0x60, 0x5f, 0x5f, 0xf1, 0x47, 0x85, 0x95, 0xdc, 0x1e, 0xfb, 0x3f, 0x43, 0xaf, + 0x72, 0xa5, 0x7d, 0x37, 0xf6, 0xd0, 0xfc, 0xd6, 0x6f, 0x10, 0x26, 0x84, 0x29, 0xc6, 0x73, 0x69, + 0x32, 0x75, 0xa2, 0x1a, 0xd0, 0x2c, 0xa1, 0x29, 0xb5, 0x6c, 0xcb, 0xb2, 0x15, 0x10, 0x7e, 0x0d, + 0x07, 0x8d, 0x2b, 0x17, 0xc5, 0x39, 0x83, 0x8e, 0xd4, 0x40, 0xb1, 0x3f, 0x07, 0xe5, 0x75, 0x6b, + 0xa5, 0xe5, 0x27, 0xff, 0xb4, 0xa0, 0x6f, 0x40, 0x2a, 0x1e, 0xd9, 0x94, 0xa2, 0xef, 0x01, 0xea, + 0x3f, 0x23, 0xe8, 0xf8, 0xd9, 0xde, 0xd5, 0x13, 0x3d, 0x1c, 0x6e, 0xa2, 0x6c, 0xf6, 0xf0, 0xa3, + 0x2f, 0x1c, 0x74, 0xb3, 0xfe, 0x04, 0x0d, 0x37, 0x6d, 0x70, 0x11, 0xea, 0xfd, 0x46, 0x6e, 0x53, + 0x2c, 0xfb, 0xb4, 0x3f, 0x8b, 0xd5, 0x9c, 0xd5, 0xe7, 0xb1, 0xd6, 0x46, 0xc6, 0xc4, 0xfa, 0x06, + 0xba, 0xc5, 0x1e, 0xa0, 0xa3, 0x6a, 0x08, 0xd6, 0x96, 0x75, 0xf8, 0xee, 0x05, 0xde, 0xf8, 0xfe, + 0x5b, 0xf0, 0xca, 0x51, 0x44, 0x4d, 0xe1, 0x9a, 0x8b, 0xe0, 0x25, 0xd1, 0x08, 0x71, 0xd5, 0x1c, + 0x87, 0xe0, 0x65, 0x6b, 0x8a, 0x20, 0xc7, 0x1b, 0x98, 0x3a, 0xca, 0x83, 0x6b, 0xfe, 0xef, 0xfb, + 0xf2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xc8, 0xdc, 0x4e, 0x1b, 0x0a, 0x00, 0x00, } 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 d9aa060c9..49304408d 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 @@ -534,7 +534,8 @@ func (m *WikiFindFileResponse) GetPath() []byte { type WikiGetAllPagesRequest struct { Repository *Repository `protobuf:"bytes,1,opt,name=repository" json:"repository,omitempty"` - Limit uint32 `protobuf:"varint,2,opt,name=limit" json:"limit,omitempty"` + // Passing 0 means no limit is applied + Limit uint32 `protobuf:"varint,2,opt,name=limit" json:"limit,omitempty"` } func (m *WikiGetAllPagesRequest) Reset() { *m = WikiGetAllPagesRequest{} } diff --git a/vendor/vendor.json b/vendor/vendor.json index 4ab857786..e1ec740e9 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -201,12 +201,12 @@ "revisionTime": "2017-12-31T12:27:32Z" }, { - "checksumSHA1": "rgCZST5lyva7hcXhmoyewhT9xoM=", + "checksumSHA1": "NALMKCFqh9ydDBkO1Jc9Eiuq/pc=", "path": "gitlab.com/gitlab-org/gitaly-proto/go", - "revision": "a475ed6943d03ee5a37dd2c52e6a2763b861f231", - "revisionTime": "2018-07-12T12:56:56Z", - "version": "v0.107.0", - "versionExact": "v0.107.0" + "revision": "e020e2a7f8e2bcf0514df92c6dfcead37be32f58", + "revisionTime": "2018-07-17T15:52:52Z", + "version": "v0.108.0", + "versionExact": "v0.108.0" }, { "checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=", |