diff options
| author | John Cai <jcai@gitlab.com> | 2019-03-12 20:41:29 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-03-19 20:23:12 +0300 |
| commit | 1aaad096ac83d797c874797ec1268dd2ea6faf04 (patch) | |
| tree | 72dfc9319d7a84b29a0c0c9beccb16559b0ec6b8 | |
| parent | 4ce8215b31d03af76f620ca37bef0c4fa4bed18b (diff) | |
Adding GeoFetch RPC
| -rw-r--r-- | internal/service/repository/geo_fetch.go | 115 | ||||
| -rw-r--r-- | internal/service/repository/geo_fetch_test.go | 100 | ||||
| -rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/repository-service.pb.go | 660 | ||||
| -rw-r--r-- | vendor/vendor.json | 9 |
4 files changed, 863 insertions, 21 deletions
diff --git a/internal/service/repository/geo_fetch.go b/internal/service/repository/geo_fetch.go new file mode 100644 index 000000000..6cdbbf3d9 --- /dev/null +++ b/internal/service/repository/geo_fetch.go @@ -0,0 +1,115 @@ +package repository + +import ( + "context" + "errors" + "fmt" + + grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/internal/rubyserver" +) + +func (s *server) GeoFetch(ctx context.Context, req *gitalypb.GeoFetchRequest) (*gitalypb.GeoFetchResponse, error) { + if err := validateGeoFetchRequest(req); err != nil { + return nil, helper.ErrInvalidArgument(err) + } + + authorizationKey := fmt.Sprintf("http.%s.extraHeader", req.GetGeoRemote().GetUrl()) + authorizationValue := fmt.Sprintf("Authorization: %s", req.GetGeoRemote().GetHttpAuthorizationHeader()) + + if err := s.setAuthorization(ctx, req.GetRepository(), authorizationKey, authorizationValue); err != nil { + return nil, helper.ErrInternal(err) + } + + defer func() { + if err := s.removeAuthorization(ctx, req.GetRepository(), authorizationKey); err != nil { + grpc_logrus.Extract(ctx).WithError(err).Error("error removing authorization config") + } + }() + + if err := s.addRemote(ctx, req.GetRepository(), req.GetGeoRemote().GetName(), req.GetGeoRemote().GetUrl()); err != nil { + return nil, helper.ErrInternal(err) + } + + if err := s.fetchRemote(ctx, req.GetRepository(), req.GetGeoRemote().GetName()); err != nil { + return nil, helper.ErrInternal(err) + } + + return &gitalypb.GeoFetchResponse{}, nil +} + +func validateGeoFetchRequest(req *gitalypb.GeoFetchRequest) error { + if req.GetRepository() == nil { + return errors.New("repository is empty") + } + + if req.GetGeoRemote().GetUrl() == "" { + return errors.New("missing remote url") + } + + if req.GetGeoRemote().GetName() == "" { + return errors.New("missing remote name") + } + + return nil +} + +func (s *server) addRemote(ctx context.Context, repository *gitalypb.Repository, name, url string) error { + client, err := s.RemoteServiceClient(ctx) + if err != nil { + return err + } + + clientCtx, err := rubyserver.SetHeaders(ctx, repository) + if err != nil { + return err + } + + if _, err = client.AddRemote(clientCtx, &gitalypb.AddRemoteRequest{ + Repository: repository, + Name: name, + Url: url, + MirrorRefmaps: []string{"all_refs"}, + }); err != nil { + return err + } + + return nil +} + +func (s *server) fetchRemote(ctx context.Context, repository *gitalypb.Repository, remoteName string) error { + fetchRemoteRequest := &gitalypb.FetchRemoteRequest{ + Repository: repository, + Remote: remoteName, + Force: false, + Timeout: 1000, + } + + _, err := s.FetchRemote(ctx, fetchRemoteRequest) + return err +} + +func (s *server) setAuthorization(ctx context.Context, repository *gitalypb.Repository, key, value string) error { + _, err := s.SetConfig(ctx, &gitalypb.SetConfigRequest{ + Repository: repository, + Entries: []*gitalypb.SetConfigRequest_Entry{ + &gitalypb.SetConfigRequest_Entry{ + Key: key, + Value: &gitalypb.SetConfigRequest_Entry_ValueStr{ + ValueStr: value, + }, + }, + }, + }) + return err +} + +func (s *server) removeAuthorization(ctx context.Context, repository *gitalypb.Repository, key string) error { + _, err := s.DeleteConfig(ctx, &gitalypb.DeleteConfigRequest{ + Repository: repository, + Keys: []string{key}, + }) + return err +} diff --git a/internal/service/repository/geo_fetch_test.go b/internal/service/repository/geo_fetch_test.go new file mode 100644 index 000000000..0fe600e5f --- /dev/null +++ b/internal/service/repository/geo_fetch_test.go @@ -0,0 +1,100 @@ +package repository + +import ( + "testing" + + "google.golang.org/grpc/codes" + + "github.com/stretchr/testify/require" + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/internal/testhelper" +) + +func TestGeoFetch(t *testing.T) { + server, serverSocketPath := runRepoServer(t) + defer server.Stop() + + client, conn := newRepositoryClient(t, serverSocketPath) + defer conn.Close() + + ctx, cancel := testhelper.Context() + defer cancel() + + _, remoteRepoPath, cleanupRemoteRepo := testhelper.NewTestRepo(t) + defer cleanupRemoteRepo() + + // add a branch + branch := "my-cool-branch" + testhelper.MustRunCommand(t, nil, "git", "-C", remoteRepoPath, "update-ref", "refs/heads/"+branch, "master") + + forkedRepo, forkRepoPath, forkRepoCleanup := testhelper.NewTestRepo(t) + defer forkRepoCleanup() + + req := &gitalypb.GeoFetchRequest{ + Repository: forkedRepo, + GeoRemote: &gitalypb.GeoRemote{ + Url: remoteRepoPath, + Name: "geo", + HttpAuthorizationHeader: "token", + }, + } + + _, err := client.GeoFetch(ctx, req) + require.NoError(t, err) + + testhelper.MustRunCommand(t, nil, "git", "-C", forkRepoPath, "show-ref", branch) +} + +func TestGeoFetchValidationError(t *testing.T) { + server, serverSocketPath := runRepoServer(t) + defer server.Stop() + + client, conn := newRepositoryClient(t, serverSocketPath) + defer conn.Close() + + ctx, cancel := testhelper.Context() + defer cancel() + + forkedRepo, _, forkRepoCleanup := getForkDestination(t) + defer forkRepoCleanup() + + testCases := []struct { + description string + request gitalypb.GeoFetchRequest + }{ + { + description: "missing repository", + request: gitalypb.GeoFetchRequest{ + Repository: nil, + GeoRemote: &gitalypb.GeoRemote{}, + }, + }, + { + description: "missing remote url", + request: gitalypb.GeoFetchRequest{ + Repository: forkedRepo, + GeoRemote: &gitalypb.GeoRemote{ + Name: "geo", + Url: "", + }, + }, + }, + { + description: "missing remote url", + request: gitalypb.GeoFetchRequest{ + Repository: forkedRepo, + GeoRemote: &gitalypb.GeoRemote{ + Name: "", + Url: "some url", + }, + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.description, func(t *testing.T) { + _, err := client.GeoFetch(ctx, &tc.request) + testhelper.RequireGrpcError(t, err, codes.InvalidArgument) + }) + } +} diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/repository-service.pb.go b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/repository-service.pb.go index 16b61b534..ab24e200e 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/repository-service.pb.go +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/gitalypb/repository-service.pb.go @@ -51,6 +51,7 @@ func (x GetArchiveRequest_Format) String() string { func (GetArchiveRequest_Format) EnumDescriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{18, 0} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{18, 0} @@ -61,6 +62,9 @@ func (GetArchiveRequest_Format) EnumDescriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{18, 0} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{18, 0} +>>>>>>> Adding GeoFetch RPC } type GetRawChangesResponse_RawChange_Operation int32 @@ -100,6 +104,7 @@ func (x GetRawChangesResponse_RawChange_Operation) String() string { func (GetRawChangesResponse_RawChange_Operation) EnumDescriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{63, 0, 0} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{63, 0, 0} @@ -110,6 +115,9 @@ func (GetRawChangesResponse_RawChange_Operation) EnumDescriptor() ([]byte, []int return fileDescriptor_repository_service_18c4b86108bd9b84, []int{63, 0, 0} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{63, 0, 0} +>>>>>>> Adding GeoFetch RPC } type RepositoryExistsRequest struct { @@ -125,6 +133,7 @@ func (*RepositoryExistsRequest) ProtoMessage() {} func (*RepositoryExistsRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{0} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{0} @@ -135,6 +144,9 @@ func (*RepositoryExistsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{0} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{0} +>>>>>>> Adding GeoFetch RPC } func (m *RepositoryExistsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepositoryExistsRequest.Unmarshal(m, b) @@ -174,6 +186,7 @@ func (*RepositoryExistsResponse) ProtoMessage() {} func (*RepositoryExistsResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{1} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{1} @@ -184,6 +197,9 @@ func (*RepositoryExistsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{1} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{1} +>>>>>>> Adding GeoFetch RPC } func (m *RepositoryExistsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepositoryExistsResponse.Unmarshal(m, b) @@ -223,6 +239,7 @@ func (*RepackIncrementalRequest) ProtoMessage() {} func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{2} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{2} @@ -233,6 +250,9 @@ func (*RepackIncrementalRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{2} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{2} +>>>>>>> Adding GeoFetch RPC } func (m *RepackIncrementalRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepackIncrementalRequest.Unmarshal(m, b) @@ -271,6 +291,7 @@ func (*RepackIncrementalResponse) ProtoMessage() {} func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{3} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{3} @@ -281,6 +302,9 @@ func (*RepackIncrementalResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{3} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{3} +>>>>>>> Adding GeoFetch RPC } func (m *RepackIncrementalResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepackIncrementalResponse.Unmarshal(m, b) @@ -314,6 +338,7 @@ func (*RepackFullRequest) ProtoMessage() {} func (*RepackFullRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{4} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{4} @@ -324,6 +349,9 @@ func (*RepackFullRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{4} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{4} +>>>>>>> Adding GeoFetch RPC } func (m *RepackFullRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepackFullRequest.Unmarshal(m, b) @@ -369,6 +397,7 @@ func (*RepackFullResponse) ProtoMessage() {} func (*RepackFullResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{5} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{5} @@ -379,6 +408,9 @@ func (*RepackFullResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{5} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{5} +>>>>>>> Adding GeoFetch RPC } func (m *RepackFullResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepackFullResponse.Unmarshal(m, b) @@ -412,6 +444,7 @@ func (*GarbageCollectRequest) ProtoMessage() {} func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{6} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{6} @@ -422,6 +455,9 @@ func (*GarbageCollectRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{6} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{6} +>>>>>>> Adding GeoFetch RPC } func (m *GarbageCollectRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GarbageCollectRequest.Unmarshal(m, b) @@ -467,6 +503,7 @@ func (*GarbageCollectResponse) ProtoMessage() {} func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{7} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{7} @@ -477,6 +514,9 @@ func (*GarbageCollectResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{7} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{7} +>>>>>>> Adding GeoFetch RPC } func (m *GarbageCollectResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GarbageCollectResponse.Unmarshal(m, b) @@ -509,6 +549,7 @@ func (*CleanupRequest) ProtoMessage() {} func (*CleanupRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{8} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{8} @@ -519,6 +560,9 @@ func (*CleanupRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{8} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{8} +>>>>>>> Adding GeoFetch RPC } func (m *CleanupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CleanupRequest.Unmarshal(m, b) @@ -557,6 +601,7 @@ func (*CleanupResponse) ProtoMessage() {} func (*CleanupResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{9} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{9} @@ -567,6 +612,9 @@ func (*CleanupResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{9} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{9} +>>>>>>> Adding GeoFetch RPC } func (m *CleanupResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CleanupResponse.Unmarshal(m, b) @@ -599,6 +647,7 @@ func (*RepositorySizeRequest) ProtoMessage() {} func (*RepositorySizeRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{10} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{10} @@ -609,6 +658,9 @@ func (*RepositorySizeRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{10} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{10} +>>>>>>> Adding GeoFetch RPC } func (m *RepositorySizeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepositorySizeRequest.Unmarshal(m, b) @@ -649,6 +701,7 @@ func (*RepositorySizeResponse) ProtoMessage() {} func (*RepositorySizeResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{11} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{11} @@ -659,6 +712,9 @@ func (*RepositorySizeResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{11} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{11} +>>>>>>> Adding GeoFetch RPC } func (m *RepositorySizeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RepositorySizeResponse.Unmarshal(m, b) @@ -699,6 +755,7 @@ func (*ApplyGitattributesRequest) ProtoMessage() {} func (*ApplyGitattributesRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{12} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{12} @@ -709,6 +766,9 @@ func (*ApplyGitattributesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{12} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{12} +>>>>>>> Adding GeoFetch RPC } func (m *ApplyGitattributesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplyGitattributesRequest.Unmarshal(m, b) @@ -754,6 +814,7 @@ func (*ApplyGitattributesResponse) ProtoMessage() {} func (*ApplyGitattributesResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{13} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{13} @@ -764,6 +825,9 @@ func (*ApplyGitattributesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{13} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{13} +>>>>>>> Adding GeoFetch RPC } func (m *ApplyGitattributesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplyGitattributesResponse.Unmarshal(m, b) @@ -803,6 +867,7 @@ func (*FetchRemoteRequest) ProtoMessage() {} func (*FetchRemoteRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{14} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{14} @@ -813,6 +878,9 @@ func (*FetchRemoteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{14} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{14} +>>>>>>> Adding GeoFetch RPC } func (m *FetchRemoteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FetchRemoteRequest.Unmarshal(m, b) @@ -900,6 +968,7 @@ func (*FetchRemoteResponse) ProtoMessage() {} func (*FetchRemoteResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{15} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{15} @@ -910,6 +979,9 @@ func (*FetchRemoteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{15} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{15} +>>>>>>> Adding GeoFetch RPC } func (m *FetchRemoteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FetchRemoteResponse.Unmarshal(m, b) @@ -942,6 +1014,7 @@ func (*CreateRepositoryRequest) ProtoMessage() {} func (*CreateRepositoryRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{16} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{16} @@ -952,6 +1025,9 @@ func (*CreateRepositoryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{16} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{16} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryRequest.Unmarshal(m, b) @@ -990,6 +1066,7 @@ func (*CreateRepositoryResponse) ProtoMessage() {} func (*CreateRepositoryResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{17} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{17} @@ -1000,6 +1077,9 @@ func (*CreateRepositoryResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{17} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{17} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryResponse.Unmarshal(m, b) @@ -1035,6 +1115,7 @@ func (*GetArchiveRequest) ProtoMessage() {} func (*GetArchiveRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{18} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{18} @@ -1045,6 +1126,9 @@ func (*GetArchiveRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{18} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{18} +>>>>>>> Adding GeoFetch RPC } func (m *GetArchiveRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetArchiveRequest.Unmarshal(m, b) @@ -1105,6 +1189,7 @@ func (*GetArchiveResponse) ProtoMessage() {} func (*GetArchiveResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{19} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{19} @@ -1115,6 +1200,9 @@ func (*GetArchiveResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{19} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{19} +>>>>>>> Adding GeoFetch RPC } func (m *GetArchiveResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetArchiveResponse.Unmarshal(m, b) @@ -1154,6 +1242,7 @@ func (*HasLocalBranchesRequest) ProtoMessage() {} func (*HasLocalBranchesRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{20} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{20} @@ -1164,6 +1253,9 @@ func (*HasLocalBranchesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{20} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{20} +>>>>>>> Adding GeoFetch RPC } func (m *HasLocalBranchesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HasLocalBranchesRequest.Unmarshal(m, b) @@ -1203,6 +1295,7 @@ func (*HasLocalBranchesResponse) ProtoMessage() {} func (*HasLocalBranchesResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{21} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{21} @@ -1213,6 +1306,9 @@ func (*HasLocalBranchesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{21} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{21} +>>>>>>> Adding GeoFetch RPC } func (m *HasLocalBranchesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HasLocalBranchesResponse.Unmarshal(m, b) @@ -1255,6 +1351,7 @@ func (*FetchSourceBranchRequest) ProtoMessage() {} func (*FetchSourceBranchRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{22} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{22} @@ -1265,6 +1362,9 @@ func (*FetchSourceBranchRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{22} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{22} +>>>>>>> Adding GeoFetch RPC } func (m *FetchSourceBranchRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FetchSourceBranchRequest.Unmarshal(m, b) @@ -1325,6 +1425,7 @@ func (*FetchSourceBranchResponse) ProtoMessage() {} func (*FetchSourceBranchResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{23} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{23} @@ -1335,6 +1436,9 @@ func (*FetchSourceBranchResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{23} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{23} +>>>>>>> Adding GeoFetch RPC } func (m *FetchSourceBranchResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FetchSourceBranchResponse.Unmarshal(m, b) @@ -1374,6 +1478,7 @@ func (*FsckRequest) ProtoMessage() {} func (*FsckRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{24} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{24} @@ -1384,6 +1489,9 @@ func (*FsckRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{24} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{24} +>>>>>>> Adding GeoFetch RPC } func (m *FsckRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FsckRequest.Unmarshal(m, b) @@ -1423,6 +1531,7 @@ func (*FsckResponse) ProtoMessage() {} func (*FsckResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{25} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{25} @@ -1433,6 +1542,9 @@ func (*FsckResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{25} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{25} +>>>>>>> Adding GeoFetch RPC } func (m *FsckResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FsckResponse.Unmarshal(m, b) @@ -1476,6 +1588,7 @@ func (*WriteRefRequest) ProtoMessage() {} func (*WriteRefRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{26} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{26} @@ -1486,6 +1599,9 @@ func (*WriteRefRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{26} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{26} +>>>>>>> Adding GeoFetch RPC } func (m *WriteRefRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WriteRefRequest.Unmarshal(m, b) @@ -1552,6 +1668,7 @@ func (*WriteRefResponse) ProtoMessage() {} func (*WriteRefResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{27} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{27} @@ -1562,6 +1679,9 @@ func (*WriteRefResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{27} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{27} +>>>>>>> Adding GeoFetch RPC } func (m *WriteRefResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WriteRefResponse.Unmarshal(m, b) @@ -1598,6 +1718,7 @@ func (*FindMergeBaseRequest) ProtoMessage() {} func (*FindMergeBaseRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{28} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{28} @@ -1608,6 +1729,9 @@ func (*FindMergeBaseRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{28} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{28} +>>>>>>> Adding GeoFetch RPC } func (m *FindMergeBaseRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindMergeBaseRequest.Unmarshal(m, b) @@ -1654,6 +1778,7 @@ func (*FindMergeBaseResponse) ProtoMessage() {} func (*FindMergeBaseResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{29} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{29} @@ -1664,6 +1789,9 @@ func (*FindMergeBaseResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{29} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{29} +>>>>>>> Adding GeoFetch RPC } func (m *FindMergeBaseResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindMergeBaseResponse.Unmarshal(m, b) @@ -1704,6 +1832,7 @@ func (*CreateForkRequest) ProtoMessage() {} func (*CreateForkRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{30} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{30} @@ -1714,6 +1843,9 @@ func (*CreateForkRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{30} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{30} +>>>>>>> Adding GeoFetch RPC } func (m *CreateForkRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateForkRequest.Unmarshal(m, b) @@ -1759,6 +1891,7 @@ func (*CreateForkResponse) ProtoMessage() {} func (*CreateForkResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{31} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{31} @@ -1769,6 +1902,9 @@ func (*CreateForkResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{31} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{31} +>>>>>>> Adding GeoFetch RPC } func (m *CreateForkResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateForkResponse.Unmarshal(m, b) @@ -1802,6 +1938,7 @@ func (*IsRebaseInProgressRequest) ProtoMessage() {} func (*IsRebaseInProgressRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{32} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{32} @@ -1812,6 +1949,9 @@ func (*IsRebaseInProgressRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{32} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{32} +>>>>>>> Adding GeoFetch RPC } func (m *IsRebaseInProgressRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsRebaseInProgressRequest.Unmarshal(m, b) @@ -1858,6 +1998,7 @@ func (*IsRebaseInProgressResponse) ProtoMessage() {} func (*IsRebaseInProgressResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{33} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{33} @@ -1868,6 +2009,9 @@ func (*IsRebaseInProgressResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{33} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{33} +>>>>>>> Adding GeoFetch RPC } func (m *IsRebaseInProgressResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsRebaseInProgressResponse.Unmarshal(m, b) @@ -1908,6 +2052,7 @@ func (*IsSquashInProgressRequest) ProtoMessage() {} func (*IsSquashInProgressRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{34} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{34} @@ -1918,6 +2063,9 @@ func (*IsSquashInProgressRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{34} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{34} +>>>>>>> Adding GeoFetch RPC } func (m *IsSquashInProgressRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsSquashInProgressRequest.Unmarshal(m, b) @@ -1964,6 +2112,7 @@ func (*IsSquashInProgressResponse) ProtoMessage() {} func (*IsSquashInProgressResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{35} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{35} @@ -1974,6 +2123,9 @@ func (*IsSquashInProgressResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{35} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{35} +>>>>>>> Adding GeoFetch RPC } func (m *IsSquashInProgressResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IsSquashInProgressResponse.Unmarshal(m, b) @@ -2014,6 +2166,7 @@ func (*CreateRepositoryFromURLRequest) ProtoMessage() {} func (*CreateRepositoryFromURLRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{36} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{36} @@ -2024,6 +2177,9 @@ func (*CreateRepositoryFromURLRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{36} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{36} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryFromURLRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryFromURLRequest.Unmarshal(m, b) @@ -2069,6 +2225,7 @@ func (*CreateRepositoryFromURLResponse) ProtoMessage() {} func (*CreateRepositoryFromURLResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{37} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{37} @@ -2079,6 +2236,9 @@ func (*CreateRepositoryFromURLResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{37} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{37} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryFromURLResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryFromURLResponse.Unmarshal(m, b) @@ -2111,6 +2271,7 @@ func (*CreateBundleRequest) ProtoMessage() {} func (*CreateBundleRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{38} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{38} @@ -2121,6 +2282,9 @@ func (*CreateBundleRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{38} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{38} +>>>>>>> Adding GeoFetch RPC } func (m *CreateBundleRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateBundleRequest.Unmarshal(m, b) @@ -2160,6 +2324,7 @@ func (*CreateBundleResponse) ProtoMessage() {} func (*CreateBundleResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{39} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{39} @@ -2170,6 +2335,9 @@ func (*CreateBundleResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{39} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{39} +>>>>>>> Adding GeoFetch RPC } func (m *CreateBundleResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateBundleResponse.Unmarshal(m, b) @@ -2210,6 +2378,7 @@ func (*WriteConfigRequest) ProtoMessage() {} func (*WriteConfigRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{40} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{40} @@ -2220,6 +2389,9 @@ func (*WriteConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{40} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{40} +>>>>>>> Adding GeoFetch RPC } func (m *WriteConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WriteConfigRequest.Unmarshal(m, b) @@ -2266,6 +2438,7 @@ func (*WriteConfigResponse) ProtoMessage() {} func (*WriteConfigResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{41} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{41} @@ -2276,6 +2449,9 @@ func (*WriteConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{41} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{41} +>>>>>>> Adding GeoFetch RPC } func (m *WriteConfigResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WriteConfigResponse.Unmarshal(m, b) @@ -2316,6 +2492,7 @@ func (*SetConfigRequest) ProtoMessage() {} func (*SetConfigRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{42} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{42} @@ -2326,6 +2503,9 @@ func (*SetConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{42} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{42} +>>>>>>> Adding GeoFetch RPC } func (m *SetConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetConfigRequest.Unmarshal(m, b) @@ -2377,6 +2557,7 @@ func (*SetConfigRequest_Entry) ProtoMessage() {} func (*SetConfigRequest_Entry) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{42, 0} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{42, 0} @@ -2387,6 +2568,9 @@ func (*SetConfigRequest_Entry) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{42, 0} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{42, 0} +>>>>>>> Adding GeoFetch RPC } func (m *SetConfigRequest_Entry) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetConfigRequest_Entry.Unmarshal(m, b) @@ -2558,6 +2742,7 @@ func (*SetConfigResponse) ProtoMessage() {} func (*SetConfigResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{43} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{43} @@ -2568,6 +2753,9 @@ func (*SetConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{43} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{43} +>>>>>>> Adding GeoFetch RPC } func (m *SetConfigResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetConfigResponse.Unmarshal(m, b) @@ -2601,6 +2789,7 @@ func (*DeleteConfigRequest) ProtoMessage() {} func (*DeleteConfigRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{44} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{44} @@ -2611,6 +2800,9 @@ func (*DeleteConfigRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{44} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{44} +>>>>>>> Adding GeoFetch RPC } func (m *DeleteConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteConfigRequest.Unmarshal(m, b) @@ -2656,6 +2848,7 @@ func (*DeleteConfigResponse) ProtoMessage() {} func (*DeleteConfigResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{45} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{45} @@ -2666,6 +2859,9 @@ func (*DeleteConfigResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{45} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{45} +>>>>>>> Adding GeoFetch RPC } func (m *DeleteConfigResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteConfigResponse.Unmarshal(m, b) @@ -2699,6 +2895,7 @@ func (*RestoreCustomHooksRequest) ProtoMessage() {} func (*RestoreCustomHooksRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{46} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{46} @@ -2709,6 +2906,9 @@ func (*RestoreCustomHooksRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{46} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{46} +>>>>>>> Adding GeoFetch RPC } func (m *RestoreCustomHooksRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestoreCustomHooksRequest.Unmarshal(m, b) @@ -2754,6 +2954,7 @@ func (*RestoreCustomHooksResponse) ProtoMessage() {} func (*RestoreCustomHooksResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{47} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{47} @@ -2764,6 +2965,9 @@ func (*RestoreCustomHooksResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{47} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{47} +>>>>>>> Adding GeoFetch RPC } func (m *RestoreCustomHooksResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestoreCustomHooksResponse.Unmarshal(m, b) @@ -2796,6 +3000,7 @@ func (*BackupCustomHooksRequest) ProtoMessage() {} func (*BackupCustomHooksRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{48} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{48} @@ -2806,6 +3011,9 @@ func (*BackupCustomHooksRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{48} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{48} +>>>>>>> Adding GeoFetch RPC } func (m *BackupCustomHooksRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BackupCustomHooksRequest.Unmarshal(m, b) @@ -2845,6 +3053,7 @@ func (*BackupCustomHooksResponse) ProtoMessage() {} func (*BackupCustomHooksResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{49} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{49} @@ -2855,6 +3064,9 @@ func (*BackupCustomHooksResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{49} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{49} +>>>>>>> Adding GeoFetch RPC } func (m *BackupCustomHooksResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BackupCustomHooksResponse.Unmarshal(m, b) @@ -2896,6 +3108,7 @@ func (*CreateRepositoryFromBundleRequest) ProtoMessage() {} func (*CreateRepositoryFromBundleRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{50} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{50} @@ -2906,6 +3119,9 @@ func (*CreateRepositoryFromBundleRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{50} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{50} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryFromBundleRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryFromBundleRequest.Unmarshal(m, b) @@ -2951,6 +3167,7 @@ func (*CreateRepositoryFromBundleResponse) ProtoMessage() {} func (*CreateRepositoryFromBundleResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{51} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{51} @@ -2961,6 +3178,9 @@ func (*CreateRepositoryFromBundleResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{51} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{51} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryFromBundleResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryFromBundleResponse.Unmarshal(m, b) @@ -2993,6 +3213,7 @@ func (*FindLicenseRequest) ProtoMessage() {} func (*FindLicenseRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{52} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{52} @@ -3003,6 +3224,9 @@ func (*FindLicenseRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{52} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{52} +>>>>>>> Adding GeoFetch RPC } func (m *FindLicenseRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindLicenseRequest.Unmarshal(m, b) @@ -3042,6 +3266,7 @@ func (*FindLicenseResponse) ProtoMessage() {} func (*FindLicenseResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{53} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{53} @@ -3052,6 +3277,9 @@ func (*FindLicenseResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{53} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{53} +>>>>>>> Adding GeoFetch RPC } func (m *FindLicenseResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindLicenseResponse.Unmarshal(m, b) @@ -3091,6 +3319,7 @@ func (*GetInfoAttributesRequest) ProtoMessage() {} func (*GetInfoAttributesRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{54} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{54} @@ -3101,6 +3330,9 @@ func (*GetInfoAttributesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{54} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{54} +>>>>>>> Adding GeoFetch RPC } func (m *GetInfoAttributesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetInfoAttributesRequest.Unmarshal(m, b) @@ -3140,6 +3372,7 @@ func (*GetInfoAttributesResponse) ProtoMessage() {} func (*GetInfoAttributesResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{55} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{55} @@ -3150,6 +3383,9 @@ func (*GetInfoAttributesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{55} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{55} +>>>>>>> Adding GeoFetch RPC } func (m *GetInfoAttributesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetInfoAttributesResponse.Unmarshal(m, b) @@ -3189,6 +3425,7 @@ func (*CalculateChecksumRequest) ProtoMessage() {} func (*CalculateChecksumRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{56} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{56} @@ -3199,6 +3436,9 @@ func (*CalculateChecksumRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{56} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{56} +>>>>>>> Adding GeoFetch RPC } func (m *CalculateChecksumRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CalculateChecksumRequest.Unmarshal(m, b) @@ -3238,6 +3478,7 @@ func (*CalculateChecksumResponse) ProtoMessage() {} func (*CalculateChecksumResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{57} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{57} @@ -3248,6 +3489,9 @@ func (*CalculateChecksumResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{57} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{57} +>>>>>>> Adding GeoFetch RPC } func (m *CalculateChecksumResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CalculateChecksumResponse.Unmarshal(m, b) @@ -3287,6 +3531,7 @@ func (*GetSnapshotRequest) ProtoMessage() {} func (*GetSnapshotRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{58} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{58} @@ -3297,6 +3542,9 @@ func (*GetSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{58} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{58} +>>>>>>> Adding GeoFetch RPC } func (m *GetSnapshotRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSnapshotRequest.Unmarshal(m, b) @@ -3336,6 +3584,7 @@ func (*GetSnapshotResponse) ProtoMessage() {} func (*GetSnapshotResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{59} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{59} @@ -3346,6 +3595,9 @@ func (*GetSnapshotResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{59} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{59} +>>>>>>> Adding GeoFetch RPC } func (m *GetSnapshotResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSnapshotResponse.Unmarshal(m, b) @@ -3387,6 +3639,7 @@ func (*CreateRepositoryFromSnapshotRequest) ProtoMessage() {} func (*CreateRepositoryFromSnapshotRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{60} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{60} @@ -3397,6 +3650,9 @@ func (*CreateRepositoryFromSnapshotRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{60} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{60} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryFromSnapshotRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryFromSnapshotRequest.Unmarshal(m, b) @@ -3449,6 +3705,7 @@ func (*CreateRepositoryFromSnapshotResponse) ProtoMessage() {} func (*CreateRepositoryFromSnapshotResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{61} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{61} @@ -3459,6 +3716,9 @@ func (*CreateRepositoryFromSnapshotResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{61} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{61} +>>>>>>> Adding GeoFetch RPC } func (m *CreateRepositoryFromSnapshotResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRepositoryFromSnapshotResponse.Unmarshal(m, b) @@ -3493,6 +3753,7 @@ func (*GetRawChangesRequest) ProtoMessage() {} func (*GetRawChangesRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{62} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{62} @@ -3503,6 +3764,9 @@ func (*GetRawChangesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{62} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{62} +>>>>>>> Adding GeoFetch RPC } func (m *GetRawChangesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRawChangesRequest.Unmarshal(m, b) @@ -3556,6 +3820,7 @@ func (*GetRawChangesResponse) ProtoMessage() {} func (*GetRawChangesResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{63} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{63} @@ -3566,6 +3831,9 @@ func (*GetRawChangesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{63} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{63} +>>>>>>> Adding GeoFetch RPC } func (m *GetRawChangesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRawChangesResponse.Unmarshal(m, b) @@ -3612,6 +3880,7 @@ func (*GetRawChangesResponse_RawChange) ProtoMessage() {} func (*GetRawChangesResponse_RawChange) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{63, 0} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{63, 0} @@ -3622,6 +3891,9 @@ func (*GetRawChangesResponse_RawChange) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{63, 0} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{63, 0} +>>>>>>> Adding GeoFetch RPC } func (m *GetRawChangesResponse_RawChange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRawChangesResponse_RawChange.Unmarshal(m, b) @@ -3712,6 +3984,7 @@ func (*SearchFilesByNameRequest) ProtoMessage() {} func (*SearchFilesByNameRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{64} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{64} @@ -3722,6 +3995,9 @@ func (*SearchFilesByNameRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{64} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{64} +>>>>>>> Adding GeoFetch RPC } func (m *SearchFilesByNameRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SearchFilesByNameRequest.Unmarshal(m, b) @@ -3775,6 +4051,7 @@ func (*SearchFilesByNameResponse) ProtoMessage() {} func (*SearchFilesByNameResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{65} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{65} @@ -3785,6 +4062,9 @@ func (*SearchFilesByNameResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{65} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{65} +>>>>>>> Adding GeoFetch RPC } func (m *SearchFilesByNameResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SearchFilesByNameResponse.Unmarshal(m, b) @@ -3827,6 +4107,7 @@ func (*SearchFilesByContentRequest) ProtoMessage() {} func (*SearchFilesByContentRequest) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{66} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{66} @@ -3837,6 +4118,9 @@ func (*SearchFilesByContentRequest) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{66} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{66} +>>>>>>> Adding GeoFetch RPC } func (m *SearchFilesByContentRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SearchFilesByContentRequest.Unmarshal(m, b) @@ -3899,6 +4183,7 @@ func (*SearchFilesByContentResponse) ProtoMessage() {} func (*SearchFilesByContentResponse) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{67} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{67} @@ -3909,6 +4194,9 @@ func (*SearchFilesByContentResponse) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{67} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{67} +>>>>>>> Adding GeoFetch RPC } func (m *SearchFilesByContentResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SearchFilesByContentResponse.Unmarshal(m, b) @@ -3949,6 +4237,7 @@ func (m *SearchFilesByContentResponse) GetEndOfMatch() bool { return false } +<<<<<<< HEAD type PreFetchRequest struct { SourceRepository *Repository `protobuf:"bytes,1,opt,name=source_repository,json=sourceRepository,proto3" json:"source_repository,omitempty"` TargetRepository *Repository `protobuf:"bytes,2,opt,name=target_repository,json=targetRepository,proto3" json:"target_repository,omitempty"` @@ -4055,6 +4344,8 @@ func (m *PreFetchResponse) XXX_DiscardUnknown() { var xxx_messageInfo_PreFetchResponse proto.InternalMessageInfo +======= +>>>>>>> Adding GeoFetch RPC type Remote struct { Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` @@ -4070,6 +4361,7 @@ func (*Remote) ProtoMessage() {} func (*Remote) Descriptor() ([]byte, []int) { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD return fileDescriptor_repository_service_31fa3b04395213d1, []int{70} ======= return fileDescriptor_repository_service_b1f4501d941bd44b, []int{70} @@ -4080,6 +4372,9 @@ func (*Remote) Descriptor() ([]byte, []int) { return fileDescriptor_repository_service_18c4b86108bd9b84, []int{70} >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + return fileDescriptor_repository_service_198ff4d03da0c075, []int{68} +>>>>>>> Adding GeoFetch RPC } func (m *Remote) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Remote.Unmarshal(m, b) @@ -4166,11 +4461,7 @@ func (m *FetchHttpRemoteRequest) Reset() { *m = FetchHttpRemoteRequest{} func (m *FetchHttpRemoteRequest) String() string { return proto.CompactTextString(m) } func (*FetchHttpRemoteRequest) ProtoMessage() {} func (*FetchHttpRemoteRequest) Descriptor() ([]byte, []int) { -<<<<<<< HEAD - return fileDescriptor_repository_service_b1f4501d941bd44b, []int{71} -======= - return fileDescriptor_repository_service_18c4b86108bd9b84, []int{71} ->>>>>>> Adding GeoFetch RPC + return fileDescriptor_repository_service_198ff4d03da0c075, []int{69} } func (m *FetchHttpRemoteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FetchHttpRemoteRequest.Unmarshal(m, b) @@ -4220,10 +4511,18 @@ func (m *FetchHTTPRemoteRequest) GetTimeout() int32 { type FetchHTTPRemoteResponse struct { ======= type FetchHttpRemoteResponse struct { +<<<<<<< HEAD >>>>>>> Adding FetchHttpRemote RPC XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` +======= + Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"` + GeoRemote *Remote `protobuf:"bytes,2,opt,name=geo_remote,json=geoRemote,proto3" json:"geo_remote,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +>>>>>>> Adding GeoFetch RPC } <<<<<<< HEAD @@ -4255,11 +4554,7 @@ func (m *FetchHttpRemoteResponse) Reset() { *m = FetchHttpRemoteResponse func (m *FetchHttpRemoteResponse) String() string { return proto.CompactTextString(m) } func (*FetchHttpRemoteResponse) ProtoMessage() {} func (*FetchHttpRemoteResponse) Descriptor() ([]byte, []int) { -<<<<<<< HEAD - return fileDescriptor_repository_service_b1f4501d941bd44b, []int{72} -======= - return fileDescriptor_repository_service_18c4b86108bd9b84, []int{72} ->>>>>>> Adding GeoFetch RPC + return fileDescriptor_repository_service_198ff4d03da0c075, []int{70} } func (m *FetchHttpRemoteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FetchHttpRemoteResponse.Unmarshal(m, b) @@ -4280,6 +4575,112 @@ func (m *FetchHttpRemoteResponse) XXX_DiscardUnknown() { var xxx_messageInfo_FetchHttpRemoteResponse proto.InternalMessageInfo >>>>>>> Adding FetchHttpRemote RPC +func (m *FetchHttpRemoteResponse) GetRepository() *Repository { + if m != nil { + return m.Repository + } + return nil +} + +func (m *FetchHttpRemoteResponse) GetGeoRemote() *Remote { + if m != nil { + return m.GeoRemote + } + return nil +} + +type GeoFastInitialFetchRequest struct { + SourceRepository *Repository `protobuf:"bytes,1,opt,name=source_repository,json=sourceRepository,proto3" json:"source_repository,omitempty"` + TargetRepository *Repository `protobuf:"bytes,2,opt,name=target_repository,json=targetRepository,proto3" json:"target_repository,omitempty"` + ObjectPool *ObjectPool `protobuf:"bytes,3,opt,name=object_pool,json=objectPool,proto3" json:"object_pool,omitempty"` + Remote *Remote `protobuf:"bytes,4,opt,name=remote,proto3" json:"remote,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GeoFastInitialFetchRequest) Reset() { *m = GeoFastInitialFetchRequest{} } +func (m *GeoFastInitialFetchRequest) String() string { return proto.CompactTextString(m) } +func (*GeoFastInitialFetchRequest) ProtoMessage() {} +func (*GeoFastInitialFetchRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_repository_service_198ff4d03da0c075, []int{71} +} +func (m *GeoFastInitialFetchRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GeoFastInitialFetchRequest.Unmarshal(m, b) +} +func (m *GeoFastInitialFetchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GeoFastInitialFetchRequest.Marshal(b, m, deterministic) +} +func (dst *GeoFastInitialFetchRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GeoFastInitialFetchRequest.Merge(dst, src) +} +func (m *GeoFastInitialFetchRequest) XXX_Size() int { + return xxx_messageInfo_GeoFastInitialFetchRequest.Size(m) +} +func (m *GeoFastInitialFetchRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GeoFastInitialFetchRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GeoFastInitialFetchRequest proto.InternalMessageInfo + +func (m *GeoFastInitialFetchRequest) GetSourceRepository() *Repository { + if m != nil { + return m.SourceRepository + } + return nil +} + +func (m *GeoFastInitialFetchRequest) GetTargetRepository() *Repository { + if m != nil { + return m.TargetRepository + } + return nil +} + +func (m *GeoFastInitialFetchRequest) GetObjectPool() *ObjectPool { + if m != nil { + return m.ObjectPool + } + return nil +} + +func (m *GeoFastInitialFetchRequest) GetRemote() *Remote { + if m != nil { + return m.Remote + } + return nil +} + +type GeoFastInitialFetchResponse struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GeoFastInitialFetchResponse) Reset() { *m = GeoFastInitialFetchResponse{} } +func (m *GeoFastInitialFetchResponse) String() string { return proto.CompactTextString(m) } +func (*GeoFastInitialFetchResponse) ProtoMessage() {} +func (*GeoFastInitialFetchResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_repository_service_198ff4d03da0c075, []int{72} +} +func (m *GeoFastInitialFetchResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GeoFastInitialFetchResponse.Unmarshal(m, b) +} +func (m *GeoFastInitialFetchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GeoFastInitialFetchResponse.Marshal(b, m, deterministic) +} +func (dst *GeoFastInitialFetchResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GeoFastInitialFetchResponse.Merge(dst, src) +} +func (m *GeoFastInitialFetchResponse) XXX_Size() int { + return xxx_messageInfo_GeoFastInitialFetchResponse.Size(m) +} +func (m *GeoFastInitialFetchResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GeoFastInitialFetchResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GeoFastInitialFetchResponse proto.InternalMessageInfo + func init() { proto.RegisterType((*RepositoryExistsRequest)(nil), "gitaly.RepositoryExistsRequest") proto.RegisterType((*RepositoryExistsResponse)(nil), "gitaly.RepositoryExistsResponse") @@ -4351,8 +4752,6 @@ func init() { proto.RegisterType((*SearchFilesByNameResponse)(nil), "gitaly.SearchFilesByNameResponse") proto.RegisterType((*SearchFilesByContentRequest)(nil), "gitaly.SearchFilesByContentRequest") proto.RegisterType((*SearchFilesByContentResponse)(nil), "gitaly.SearchFilesByContentResponse") - proto.RegisterType((*PreFetchRequest)(nil), "gitaly.PreFetchRequest") - proto.RegisterType((*PreFetchResponse)(nil), "gitaly.PreFetchResponse") proto.RegisterType((*Remote)(nil), "gitaly.Remote") <<<<<<< HEAD proto.RegisterType((*FetchHTTPRemoteRequest)(nil), "gitaly.FetchHTTPRemoteRequest") @@ -4360,7 +4759,12 @@ func init() { ======= proto.RegisterType((*FetchHttpRemoteRequest)(nil), "gitaly.FetchHttpRemoteRequest") proto.RegisterType((*FetchHttpRemoteResponse)(nil), "gitaly.FetchHttpRemoteResponse") +<<<<<<< HEAD >>>>>>> Adding FetchHttpRemote RPC +======= + proto.RegisterType((*GeoFastInitialFetchRequest)(nil), "gitaly.GeoFastInitialFetchRequest") + proto.RegisterType((*GeoFastInitialFetchResponse)(nil), "gitaly.GeoFastInitialFetchResponse") +>>>>>>> Adding GeoFetch RPC proto.RegisterEnum("gitaly.GetArchiveRequest_Format", GetArchiveRequest_Format_name, GetArchiveRequest_Format_value) proto.RegisterEnum("gitaly.GetRawChangesResponse_RawChange_Operation", GetRawChangesResponse_RawChange_Operation_name, GetRawChangesResponse_RawChange_Operation_value) } @@ -4411,12 +4815,17 @@ type RepositoryServiceClient interface { SearchFilesByName(ctx context.Context, in *SearchFilesByNameRequest, opts ...grpc.CallOption) (RepositoryService_SearchFilesByNameClient, error) RestoreCustomHooks(ctx context.Context, opts ...grpc.CallOption) (RepositoryService_RestoreCustomHooksClient, error) BackupCustomHooks(ctx context.Context, in *BackupCustomHooksRequest, opts ...grpc.CallOption) (RepositoryService_BackupCustomHooksClient, error) +<<<<<<< HEAD PreFetch(ctx context.Context, in *PreFetchRequest, opts ...grpc.CallOption) (*PreFetchResponse, error) <<<<<<< HEAD FetchHTTPRemote(ctx context.Context, in *FetchHTTPRemoteRequest, opts ...grpc.CallOption) (*FetchHTTPRemoteResponse, error) ======= FetchHttpRemote(ctx context.Context, in *FetchHttpRemoteRequest, opts ...grpc.CallOption) (*FetchHttpRemoteResponse, error) >>>>>>> Adding FetchHttpRemote RPC +======= + FetchHttpRemote(ctx context.Context, in *FetchHttpRemoteRequest, opts ...grpc.CallOption) (*FetchHttpRemoteResponse, error) + GeoFastInitialFetch(ctx context.Context, in *GeoFastInitialFetchRequest, opts ...grpc.CallOption) (*GeoFastInitialFetchResponse, error) +>>>>>>> Adding GeoFetch RPC } type repositoryServiceClient struct { @@ -4967,9 +5376,9 @@ func (x *repositoryServiceBackupCustomHooksClient) Recv() (*BackupCustomHooksRes return m, nil } -func (c *repositoryServiceClient) PreFetch(ctx context.Context, in *PreFetchRequest, opts ...grpc.CallOption) (*PreFetchResponse, error) { - out := new(PreFetchResponse) - err := c.cc.Invoke(ctx, "/gitaly.RepositoryService/PreFetch", in, out, opts...) +func (c *repositoryServiceClient) FetchHttpRemote(ctx context.Context, in *FetchHttpRemoteRequest, opts ...grpc.CallOption) (*FetchHttpRemoteResponse, error) { + out := new(FetchHttpRemoteResponse) + err := c.cc.Invoke(ctx, "/gitaly.RepositoryService/FetchHttpRemote", in, out, opts...) if err != nil { return nil, err } @@ -4977,6 +5386,7 @@ func (c *repositoryServiceClient) PreFetch(ctx context.Context, in *PreFetchRequ } <<<<<<< HEAD +<<<<<<< HEAD func (c *repositoryServiceClient) FetchHTTPRemote(ctx context.Context, in *FetchHTTPRemoteRequest, opts ...grpc.CallOption) (*FetchHTTPRemoteResponse, error) { out := new(FetchHTTPRemoteResponse) err := c.cc.Invoke(ctx, "/gitaly.RepositoryService/FetchHTTPRemote", in, out, opts...) @@ -4985,6 +5395,11 @@ func (c *repositoryServiceClient) FetchHttpRemote(ctx context.Context, in *Fetch out := new(FetchHttpRemoteResponse) err := c.cc.Invoke(ctx, "/gitaly.RepositoryService/FetchHttpRemote", in, out, opts...) >>>>>>> Adding FetchHttpRemote RPC +======= +func (c *repositoryServiceClient) GeoFastInitialFetch(ctx context.Context, in *GeoFastInitialFetchRequest, opts ...grpc.CallOption) (*GeoFastInitialFetchResponse, error) { + out := new(GeoFastInitialFetchResponse) + err := c.cc.Invoke(ctx, "/gitaly.RepositoryService/GeoFastInitialFetch", in, out, opts...) +>>>>>>> Adding GeoFetch RPC if err != nil { return nil, err } @@ -5027,12 +5442,17 @@ type RepositoryServiceServer interface { SearchFilesByName(*SearchFilesByNameRequest, RepositoryService_SearchFilesByNameServer) error RestoreCustomHooks(RepositoryService_RestoreCustomHooksServer) error BackupCustomHooks(*BackupCustomHooksRequest, RepositoryService_BackupCustomHooksServer) error +<<<<<<< HEAD PreFetch(context.Context, *PreFetchRequest) (*PreFetchResponse, error) <<<<<<< HEAD FetchHTTPRemote(context.Context, *FetchHTTPRemoteRequest) (*FetchHTTPRemoteResponse, error) ======= FetchHttpRemote(context.Context, *FetchHttpRemoteRequest) (*FetchHttpRemoteResponse, error) >>>>>>> Adding FetchHttpRemote RPC +======= + FetchHttpRemote(context.Context, *FetchHttpRemoteRequest) (*FetchHttpRemoteResponse, error) + GeoFastInitialFetch(context.Context, *GeoFastInitialFetchRequest) (*GeoFastInitialFetchResponse, error) +>>>>>>> Adding GeoFetch RPC } func RegisterRepositoryServiceServer(s *grpc.Server, srv RepositoryServiceServer) { @@ -5691,36 +6111,42 @@ func (x *repositoryServiceBackupCustomHooksServer) Send(m *BackupCustomHooksResp return x.ServerStream.SendMsg(m) } -func _RepositoryService_PreFetch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(PreFetchRequest) +func _RepositoryService_FetchHttpRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FetchHttpRemoteRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(RepositoryServiceServer).PreFetch(ctx, in) + return srv.(RepositoryServiceServer).FetchHttpRemote(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gitaly.RepositoryService/PreFetch", + FullMethod: "/gitaly.RepositoryService/FetchHttpRemote", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RepositoryServiceServer).PreFetch(ctx, req.(*PreFetchRequest)) + return srv.(RepositoryServiceServer).FetchHttpRemote(ctx, req.(*FetchHttpRemoteRequest)) } return interceptor(ctx, in, info, handler) } <<<<<<< HEAD +<<<<<<< HEAD func _RepositoryService_FetchHTTPRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(FetchHTTPRemoteRequest) ======= func _RepositoryService_FetchHttpRemote_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(FetchHttpRemoteRequest) >>>>>>> Adding FetchHttpRemote RPC +======= +func _RepositoryService_GeoFastInitialFetch_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GeoFastInitialFetchRequest) +>>>>>>> Adding GeoFetch RPC if err := dec(in); err != nil { return nil, err } if interceptor == nil { <<<<<<< HEAD +<<<<<<< HEAD return srv.(RepositoryServiceServer).FetchHTTPRemote(ctx, in) } info := &grpc.UnaryServerInfo{ @@ -5731,14 +6157,21 @@ func _RepositoryService_FetchHttpRemote_Handler(srv interface{}, ctx context.Con return srv.(RepositoryServiceServer).FetchHTTPRemote(ctx, req.(*FetchHTTPRemoteRequest)) ======= return srv.(RepositoryServiceServer).FetchHttpRemote(ctx, in) +======= + return srv.(RepositoryServiceServer).GeoFastInitialFetch(ctx, in) +>>>>>>> Adding GeoFetch RPC } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gitaly.RepositoryService/FetchHttpRemote", + FullMethod: "/gitaly.RepositoryService/GeoFastInitialFetch", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { +<<<<<<< HEAD return srv.(RepositoryServiceServer).FetchHttpRemote(ctx, req.(*FetchHttpRemoteRequest)) >>>>>>> Adding FetchHttpRemote RPC +======= + return srv.(RepositoryServiceServer).GeoFastInitialFetch(ctx, req.(*GeoFastInitialFetchRequest)) +>>>>>>> Adding GeoFetch RPC } return interceptor(ctx, in, info, handler) } @@ -5844,6 +6277,7 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ Handler: _RepositoryService_CreateRepositoryFromSnapshot_Handler, }, { +<<<<<<< HEAD MethodName: "PreFetch", Handler: _RepositoryService_PreFetch_Handler, }, @@ -5852,10 +6286,16 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ MethodName: "FetchHTTPRemote", Handler: _RepositoryService_FetchHTTPRemote_Handler, ======= +======= +>>>>>>> Adding GeoFetch RPC MethodName: "FetchHttpRemote", Handler: _RepositoryService_FetchHttpRemote_Handler, >>>>>>> Adding FetchHttpRemote RPC }, + { + MethodName: "GeoFastInitialFetch", + Handler: _RepositoryService_GeoFastInitialFetch_Handler, + }, }, Streams: []grpc.StreamDesc{ { @@ -5915,6 +6355,7 @@ var _RepositoryService_serviceDesc = grpc.ServiceDesc{ func init() { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD proto.RegisterFile("repository-service.proto", fileDescriptor_repository_service_31fa3b04395213d1) } @@ -6438,4 +6879,181 @@ var fileDescriptor_repository_service_18c4b86108bd9b84 = []byte{ 0x25, 0x00, 0x00, >>>>>>> Adding GeoFetch RPC >>>>>>> Adding GeoFetch RPC +======= + proto.RegisterFile("repository-service.proto", fileDescriptor_repository_service_198ff4d03da0c075) +} + +var fileDescriptor_repository_service_198ff4d03da0c075 = []byte{ + // 2707 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4b, 0x93, 0xdb, 0xc6, + 0xf1, 0x27, 0xf7, 0x45, 0xb2, 0x49, 0x49, 0xdc, 0xd9, 0x95, 0x96, 0x0b, 0xbd, 0x21, 0x95, 0x2d, + 0x3f, 0xb4, 0xb2, 0x57, 0x87, 0xbf, 0xcb, 0xff, 0xa4, 0x5c, 0xfb, 0x5e, 0xda, 0xd2, 0xee, 0x1a, + 0x2b, 0x59, 0x15, 0x95, 0x53, 0x08, 0x16, 0x1c, 0x92, 0xf0, 0x82, 0x18, 0x1a, 0x18, 0x6a, 0xbd, + 0x4e, 0x2a, 0x37, 0xdf, 0x72, 0xf0, 0x2d, 0xc9, 0x57, 0x48, 0xe5, 0x13, 0xe4, 0xab, 0xe4, 0x13, + 0xe4, 0x9a, 0x1c, 0x73, 0x49, 0xcd, 0x03, 0x33, 0x00, 0x01, 0x30, 0x4a, 0xc8, 0x72, 0x6e, 0x33, + 0xdd, 0x33, 0xdd, 0x3d, 0x3d, 0x3d, 0x3d, 0xe8, 0xdf, 0x00, 0x5a, 0x21, 0x1e, 0x92, 0xc8, 0xa3, + 0x24, 0xbc, 0x7c, 0x1c, 0xe1, 0xf0, 0x8d, 0xe7, 0xe2, 0x8d, 0x61, 0x48, 0x28, 0x41, 0x4b, 0x3d, + 0x8f, 0x3a, 0xfe, 0xa5, 0xd1, 0x88, 0xfa, 0x4e, 0x88, 0x3b, 0x82, 0x6a, 0xbe, 0x84, 0x35, 0x4b, + 0xcd, 0xd8, 0xfb, 0xce, 0x8b, 0x68, 0x64, 0xe1, 0x6f, 0x47, 0x38, 0xa2, 0x68, 0x13, 0x40, 0x0b, + 0x6b, 0x95, 0xef, 0x95, 0x1f, 0xd5, 0x37, 0xd1, 0x86, 0x90, 0xb2, 0xa1, 0x27, 0x59, 0x89, 0x51, + 0x9f, 0x2e, 0xfd, 0xfd, 0xf7, 0x8f, 0xe6, 0xaa, 0x73, 0xe6, 0x26, 0xb4, 0xb2, 0x62, 0xa3, 0x21, + 0x09, 0x22, 0x8c, 0x6e, 0xc0, 0x12, 0xe6, 0x14, 0x2e, 0xb3, 0x6a, 0xc9, 0x9e, 0xf9, 0x15, 0x9f, + 0xe3, 0xb8, 0xe7, 0xed, 0xc0, 0x0d, 0xf1, 0x00, 0x07, 0xd4, 0xf1, 0xa7, 0xb7, 0xa5, 0x6c, 0xde, + 0x84, 0xf5, 0x1c, 0xb9, 0xc2, 0x18, 0x93, 0xc2, 0xb2, 0x60, 0xee, 0x8f, 0xfc, 0x69, 0xb4, 0xa1, + 0x07, 0x70, 0xc5, 0x0d, 0xb1, 0x43, 0xb1, 0x7d, 0xe6, 0xd1, 0x81, 0x33, 0x6c, 0xcd, 0xf1, 0xc5, + 0x35, 0x04, 0x71, 0x9b, 0xd3, 0x94, 0x49, 0xab, 0x80, 0x92, 0x5a, 0xa5, 0x2d, 0xdf, 0xc1, 0xf5, + 0x03, 0x27, 0x3c, 0x73, 0x7a, 0x78, 0x87, 0xf8, 0x3e, 0x76, 0xe9, 0x4f, 0x66, 0x4f, 0x0b, 0x6e, + 0x8c, 0x6b, 0x96, 0x36, 0x3d, 0x83, 0xab, 0x3b, 0x3e, 0x76, 0x82, 0xd1, 0x70, 0x16, 0x5b, 0xb1, + 0x0c, 0xd7, 0x94, 0x34, 0xa9, 0xe0, 0x14, 0xae, 0xeb, 0x49, 0xa7, 0xde, 0xf7, 0x78, 0x16, 0xe1, + 0xf7, 0x21, 0xdc, 0x18, 0x17, 0x2a, 0x83, 0x0f, 0xc1, 0x42, 0xe4, 0x7d, 0x8f, 0xb9, 0xbc, 0x79, + 0x8b, 0xb7, 0xcd, 0x08, 0xd6, 0xb7, 0x86, 0x43, 0xff, 0xf2, 0xc0, 0xa3, 0x0e, 0xa5, 0xa1, 0x77, + 0x36, 0xa2, 0x78, 0x9a, 0x53, 0x80, 0x0c, 0xa8, 0x86, 0xf8, 0x8d, 0x17, 0x79, 0x24, 0xe0, 0x6e, + 0x6f, 0x58, 0xaa, 0xaf, 0x5c, 0x71, 0x0b, 0x8c, 0x3c, 0xa5, 0xd2, 0x2b, 0xbf, 0x9b, 0x03, 0xb4, + 0x8f, 0xa9, 0xdb, 0xb7, 0xf0, 0x80, 0xd0, 0x69, 0x7c, 0xc2, 0x8e, 0x5b, 0xc8, 0x85, 0x70, 0x53, + 0x6a, 0x96, 0xec, 0xa1, 0x55, 0x58, 0xec, 0x92, 0xd0, 0xc5, 0xad, 0x79, 0x1e, 0x18, 0xa2, 0x83, + 0xd6, 0xa0, 0x12, 0x10, 0x9b, 0x3a, 0xbd, 0xa8, 0xb5, 0x20, 0x4e, 0x67, 0x40, 0x5e, 0x38, 0xbd, + 0x08, 0xb5, 0xa0, 0x42, 0xbd, 0x01, 0x26, 0x23, 0xda, 0x5a, 0xbc, 0x57, 0x7e, 0xb4, 0x68, 0xc5, + 0x5d, 0x36, 0x25, 0x8a, 0xfa, 0xf6, 0x39, 0xbe, 0x6c, 0x2d, 0x09, 0x0d, 0x51, 0xd4, 0xff, 0x02, + 0x5f, 0xa2, 0xbb, 0x50, 0x3f, 0x0f, 0xc8, 0x45, 0x60, 0xf7, 0x09, 0x3b, 0xed, 0x15, 0xce, 0x04, + 0x4e, 0x3a, 0x64, 0x14, 0xb4, 0x0e, 0xd5, 0x80, 0xd8, 0xc3, 0x70, 0x14, 0xe0, 0x56, 0x8d, 0x6b, + 0xab, 0x04, 0xe4, 0x84, 0x75, 0x63, 0x37, 0x7d, 0xbe, 0x50, 0xad, 0x36, 0x6b, 0xe6, 0x75, 0x58, + 0x49, 0x79, 0x43, 0x7a, 0xe9, 0x25, 0xac, 0xed, 0xf0, 0x70, 0x4e, 0x2c, 0x7d, 0x06, 0x51, 0x6a, + 0x40, 0x2b, 0x2b, 0x56, 0xaa, 0xfc, 0x47, 0x19, 0x96, 0x0f, 0x30, 0xdd, 0x0a, 0xdd, 0xbe, 0xf7, + 0x66, 0xaa, 0x7d, 0xb9, 0x09, 0x35, 0x97, 0x0c, 0x06, 0x1e, 0xb5, 0xbd, 0x8e, 0xdc, 0x9a, 0xaa, + 0x20, 0xb4, 0x3b, 0x6c, 0xd3, 0x86, 0x21, 0xee, 0x7a, 0xdf, 0xf1, 0xdd, 0xa9, 0x59, 0xb2, 0x87, + 0x3e, 0x81, 0xa5, 0x2e, 0x09, 0x07, 0x0e, 0xe5, 0xbb, 0x73, 0x75, 0xf3, 0x5e, 0xac, 0x24, 0x63, + 0xd3, 0xc6, 0x3e, 0x1f, 0x67, 0xc9, 0xf1, 0xe6, 0x53, 0x58, 0x12, 0x14, 0x54, 0x81, 0xf9, 0xd7, + 0xed, 0x93, 0x66, 0x89, 0x35, 0x5e, 0x6c, 0x59, 0xcd, 0x32, 0x02, 0x58, 0x7a, 0xb1, 0x65, 0xd9, + 0x07, 0xaf, 0x9b, 0x73, 0xa8, 0x0e, 0x15, 0xd6, 0xde, 0x7e, 0xbd, 0xd9, 0x9c, 0x57, 0xe7, 0xe9, + 0x11, 0xa0, 0xa4, 0x02, 0x7d, 0x96, 0x3a, 0x0e, 0x75, 0xf8, 0x7a, 0x1b, 0x16, 0x6f, 0xb3, 0x2d, + 0x39, 0x74, 0xa2, 0x67, 0xc4, 0x75, 0xfc, 0xed, 0xd0, 0x09, 0xdc, 0x3e, 0x9e, 0xc9, 0x7d, 0xf2, + 0x11, 0xb4, 0xb2, 0x62, 0xa5, 0x19, 0xab, 0xb0, 0xf8, 0xc6, 0xf1, 0x47, 0x58, 0x5e, 0x27, 0xa2, + 0x63, 0xfe, 0xb5, 0x0c, 0x2d, 0x1e, 0x33, 0xa7, 0x64, 0x14, 0xba, 0x58, 0xcc, 0x9a, 0x66, 0xbf, + 0x3e, 0x83, 0xe5, 0x88, 0x8b, 0xb2, 0x13, 0x53, 0xe7, 0x0a, 0xa7, 0x36, 0xc5, 0x60, 0x2b, 0x95, + 0x91, 0xa5, 0x80, 0x33, 0x6e, 0x0c, 0xdf, 0xda, 0x86, 0xd5, 0x88, 0x12, 0x06, 0xa2, 0xdb, 0x00, + 0xd4, 0x09, 0x7b, 0x98, 0xda, 0x21, 0xee, 0xf2, 0x4d, 0x6e, 0x58, 0x35, 0x41, 0xb1, 0x70, 0x57, + 0x85, 0xe8, 0x53, 0x58, 0xcf, 0x59, 0x9c, 0xbe, 0x60, 0x43, 0x1c, 0x8d, 0x7c, 0x1a, 0x5f, 0xb0, + 0xa2, 0x67, 0xb6, 0xa1, 0xbe, 0x1f, 0xb9, 0xe7, 0xb3, 0x38, 0x22, 0x0f, 0xa1, 0x21, 0x44, 0xe9, + 0x3d, 0xc0, 0x61, 0x48, 0x42, 0x19, 0x0b, 0xa2, 0x63, 0xfe, 0xa5, 0x0c, 0xd7, 0x5e, 0x85, 0x1e, + 0x3b, 0x48, 0xdd, 0x69, 0x5c, 0xdf, 0x84, 0x79, 0xe6, 0x0d, 0x91, 0x4a, 0x59, 0x33, 0x95, 0x61, + 0xe7, 0xd3, 0x19, 0x16, 0xdd, 0x87, 0x06, 0xf1, 0x3b, 0xb6, 0xe2, 0x0b, 0x27, 0xd6, 0x89, 0xdf, + 0xb1, 0xe2, 0x21, 0x2a, 0xf7, 0x2d, 0x26, 0x72, 0x5f, 0x22, 0xe7, 0x2c, 0x35, 0x2b, 0x66, 0x0b, + 0x9a, 0xda, 0x76, 0xb1, 0xcc, 0xcf, 0x17, 0xaa, 0xe5, 0xe6, 0x9c, 0x39, 0x84, 0xd5, 0x7d, 0x2f, + 0xe8, 0x3c, 0xc7, 0x61, 0x0f, 0x6f, 0x3b, 0xd1, 0x54, 0x59, 0xe0, 0x16, 0xd4, 0x62, 0x43, 0xa3, + 0xd6, 0xdc, 0xbd, 0x79, 0xb6, 0xdd, 0x8a, 0xa0, 0xc2, 0xff, 0x03, 0xb8, 0x3e, 0xa6, 0x51, 0x1f, + 0xc1, 0x33, 0x27, 0x12, 0xa1, 0x5f, 0xb3, 0x78, 0xdb, 0xfc, 0xb1, 0x0c, 0xcb, 0x22, 0x7f, 0xed, + 0x93, 0xf0, 0xfc, 0x7f, 0x19, 0xf2, 0xc9, 0xef, 0x9d, 0xa4, 0x45, 0xea, 0xdb, 0x6b, 0xbd, 0x1d, + 0x59, 0x98, 0x19, 0xdd, 0x0e, 0x4e, 0x42, 0xd2, 0x0b, 0x71, 0x14, 0x4d, 0x99, 0x52, 0x43, 0x2e, + 0x2e, 0x91, 0x52, 0x05, 0xa1, 0xdd, 0x51, 0xbe, 0xfc, 0x39, 0x18, 0x79, 0x5a, 0xa5, 0x43, 0xef, + 0x42, 0xdd, 0x0b, 0xec, 0xa1, 0x24, 0xcb, 0x03, 0x04, 0x9e, 0x1a, 0x28, 0x8c, 0x3e, 0xfd, 0x76, + 0xe4, 0x44, 0xfd, 0x99, 0x19, 0x1d, 0x71, 0x71, 0x09, 0xa3, 0x05, 0x61, 0xdc, 0xe8, 0xac, 0xd6, + 0xb7, 0x35, 0x3a, 0x80, 0x3b, 0xe3, 0x37, 0xda, 0x7e, 0x48, 0x06, 0x2f, 0xad, 0x67, 0x53, 0x1e, + 0xcb, 0x51, 0xe8, 0x4b, 0x9b, 0x59, 0x53, 0xed, 0xf7, 0x7d, 0xb8, 0x5b, 0xa8, 0x4f, 0x6e, 0xfe, + 0x97, 0xb0, 0x22, 0x86, 0x6c, 0x8f, 0x82, 0x8e, 0x3f, 0x93, 0xaf, 0xbe, 0xf7, 0x61, 0x35, 0x2d, + 0x72, 0xc2, 0x3d, 0x35, 0x00, 0xc4, 0x4f, 0xf7, 0x0e, 0x09, 0xba, 0x5e, 0x6f, 0xca, 0xfd, 0xeb, + 0x8e, 0x7c, 0xdf, 0x1e, 0x3a, 0xb4, 0x1f, 0xef, 0x1f, 0x23, 0x9c, 0x38, 0xb4, 0xaf, 0x1c, 0xf2, + 0x01, 0xac, 0xa4, 0xd4, 0x4d, 0x4c, 0x9b, 0x3f, 0xce, 0x41, 0xf3, 0x14, 0xd3, 0xe9, 0x4d, 0xfb, + 0x04, 0x2a, 0x38, 0xa0, 0xa1, 0x87, 0x45, 0x6a, 0xa9, 0x6f, 0xde, 0x89, 0x27, 0x8c, 0x8b, 0xdf, + 0xd8, 0x0b, 0x68, 0x78, 0x69, 0xc5, 0xc3, 0x8d, 0x1f, 0xca, 0xb0, 0xc8, 0x49, 0x6c, 0x93, 0xd9, + 0x97, 0x9d, 0x48, 0x30, 0xac, 0x89, 0x6e, 0x43, 0x8d, 0x5f, 0xb1, 0x76, 0x44, 0x43, 0xb1, 0xe0, + 0xc3, 0x92, 0x55, 0xe5, 0xa4, 0x53, 0x1a, 0xa2, 0xfb, 0x50, 0x17, 0x6c, 0x2f, 0xa0, 0x4f, 0x37, + 0x79, 0x76, 0x5e, 0x3c, 0x2c, 0x59, 0xc0, 0x89, 0x6d, 0x46, 0x43, 0x77, 0x41, 0xf4, 0xec, 0x33, + 0x42, 0x7c, 0xf1, 0x9d, 0x79, 0x58, 0xb2, 0x84, 0xd4, 0x6d, 0x42, 0xfc, 0xed, 0x8a, 0xbc, 0xd2, + 0x95, 0xff, 0x56, 0x60, 0x39, 0x61, 0xb2, 0x0c, 0x21, 0x0c, 0x2b, 0xbb, 0xd8, 0xc7, 0xb3, 0xd8, + 0x44, 0x04, 0x0b, 0xe7, 0xf8, 0x52, 0xb8, 0xa9, 0x66, 0xf1, 0xb6, 0xd2, 0x7d, 0x03, 0x56, 0xd3, + 0x6a, 0xa4, 0xfa, 0x73, 0x56, 0x57, 0x46, 0x94, 0x84, 0x78, 0x67, 0x14, 0x51, 0x32, 0x38, 0x24, + 0xe4, 0x3c, 0x9a, 0xd2, 0x08, 0x1e, 0xa7, 0x73, 0x3a, 0x4e, 0x93, 0xe5, 0x42, 0x9e, 0x32, 0x69, + 0xca, 0x57, 0xd0, 0xda, 0x76, 0xdc, 0xf3, 0xd1, 0x70, 0x36, 0x96, 0xa8, 0x13, 0xf5, 0x04, 0xd6, + 0x73, 0xe4, 0x4e, 0x38, 0x56, 0x11, 0xdc, 0xcf, 0x3b, 0xf8, 0x53, 0x9f, 0xf1, 0x89, 0xbe, 0x79, + 0x08, 0xe6, 0x24, 0xa5, 0xd2, 0x47, 0x27, 0x80, 0xd8, 0x1d, 0xfa, 0xcc, 0x73, 0x71, 0x10, 0xcd, + 0x24, 0xdf, 0xec, 0xc0, 0x4a, 0x4a, 0xa2, 0xf4, 0xcb, 0x87, 0x80, 0x7c, 0x41, 0xb2, 0xa3, 0x3e, + 0x09, 0xa9, 0x1d, 0x38, 0x83, 0xf8, 0x86, 0x6e, 0x4a, 0xce, 0x29, 0x63, 0x1c, 0x39, 0x03, 0xbe, + 0x75, 0x07, 0x98, 0xb6, 0x83, 0x2e, 0xd9, 0x9a, 0x45, 0xed, 0xa9, 0x8c, 0xfb, 0x7f, 0x58, 0xcf, + 0x91, 0x2b, 0x4d, 0xbc, 0x03, 0xa0, 0x8b, 0x4e, 0xb9, 0x81, 0x09, 0x0a, 0x33, 0x6a, 0xc7, 0xf1, + 0xdd, 0x91, 0xef, 0x50, 0xbc, 0xd3, 0xc7, 0xee, 0x79, 0x34, 0x1a, 0xcc, 0xc2, 0xa8, 0xff, 0x83, + 0xf5, 0x1c, 0xb9, 0xd2, 0x28, 0x03, 0xaa, 0xae, 0xa4, 0x49, 0x6f, 0xa9, 0x3e, 0xdb, 0xbc, 0x03, + 0x4c, 0x4f, 0x03, 0x67, 0x18, 0xf5, 0x09, 0x9d, 0x85, 0x29, 0xef, 0xc1, 0x4a, 0x4a, 0xe2, 0x84, + 0xa0, 0xfe, 0x63, 0x19, 0x1e, 0xe4, 0x05, 0xd8, 0x0c, 0xcc, 0x61, 0x25, 0x70, 0x9f, 0xd2, 0xa1, + 0xad, 0x2f, 0xd2, 0x0a, 0xeb, 0xbf, 0x0c, 0x7d, 0x76, 0xb1, 0x70, 0x96, 0x33, 0xa2, 0x7d, 0x59, + 0x06, 0xf2, 0xb1, 0x5b, 0xa3, 0xc4, 0xc5, 0xf2, 0x0e, 0x3c, 0x9c, 0x6c, 0x9a, 0x8c, 0xfe, 0x3f, + 0x94, 0x61, 0xf5, 0x00, 0x53, 0xcb, 0xb9, 0xd8, 0xe9, 0x3b, 0x41, 0x6f, 0x3a, 0x7c, 0xe3, 0x01, + 0x5c, 0xe9, 0x86, 0x64, 0x60, 0xa7, 0x40, 0x8e, 0x9a, 0xd5, 0x60, 0x44, 0xf5, 0x8d, 0x7d, 0x17, + 0xea, 0x94, 0xd8, 0xa9, 0xaf, 0xf4, 0x9a, 0x05, 0x94, 0x58, 0x69, 0x24, 0x64, 0xce, 0xfc, 0xdb, + 0x3c, 0x5c, 0x1f, 0x33, 0x4d, 0x6e, 0xc6, 0x21, 0xd4, 0x43, 0xe7, 0xc2, 0x76, 0x05, 0xb9, 0x55, + 0xe6, 0x77, 0xd8, 0xbb, 0x89, 0x92, 0x37, 0x3b, 0x67, 0x43, 0x91, 0x2c, 0x08, 0x15, 0xd7, 0xf8, + 0x61, 0x1e, 0x6a, 0x8a, 0x83, 0xd6, 0xa0, 0x72, 0xe6, 0x93, 0x33, 0xf6, 0xc1, 0x25, 0x02, 0x6d, + 0x89, 0x75, 0xdb, 0x1d, 0x85, 0x0e, 0xcd, 0x69, 0x74, 0x88, 0x83, 0x14, 0xf8, 0x42, 0x5c, 0xef, + 0x62, 0x11, 0x95, 0x00, 0x5f, 0xb0, 0xdb, 0x9d, 0xb1, 0x58, 0xa5, 0xc1, 0x59, 0x0b, 0x82, 0x45, + 0xfc, 0x0e, 0x67, 0x1d, 0x43, 0x8d, 0x0c, 0x71, 0xe8, 0x50, 0xb6, 0xf6, 0x45, 0x5e, 0xab, 0x7f, + 0xfc, 0x96, 0x86, 0x6f, 0x1c, 0xc7, 0x13, 0x2d, 0x2d, 0x83, 0xf9, 0x9c, 0xf9, 0x42, 0x0b, 0x15, + 0x58, 0x4b, 0x23, 0x74, 0x2e, 0xd4, 0xf8, 0xd8, 0xa0, 0x01, 0xe9, 0x60, 0x0e, 0xb7, 0x2c, 0x72, + 0x83, 0x9e, 0x93, 0x8e, 0x5a, 0x06, 0x67, 0x55, 0x05, 0x2b, 0xc0, 0x17, 0x8c, 0x65, 0x7a, 0x50, + 0xd3, 0x22, 0xea, 0x50, 0x79, 0x79, 0xf4, 0xc5, 0xd1, 0xf1, 0xab, 0xa3, 0x66, 0x09, 0xd5, 0x60, + 0x71, 0x6b, 0x77, 0x77, 0x6f, 0x57, 0x60, 0x04, 0x3b, 0xc7, 0x27, 0xed, 0xbd, 0x5d, 0x81, 0x11, + 0xec, 0xee, 0x3d, 0xdb, 0x7b, 0xb1, 0xb7, 0xdb, 0x9c, 0x47, 0x0d, 0xa8, 0x3e, 0x3f, 0xde, 0x6d, + 0xef, 0x33, 0xd6, 0x02, 0x63, 0x59, 0x7b, 0x47, 0x5b, 0xcf, 0xf7, 0x76, 0x9b, 0x8b, 0xa8, 0x09, + 0x8d, 0x17, 0xbf, 0x38, 0xd9, 0xb3, 0x77, 0x0e, 0xb7, 0x8e, 0x0e, 0xf6, 0x76, 0x9b, 0x4b, 0xe6, + 0x6f, 0xa1, 0x75, 0x8a, 0x9d, 0xd0, 0xed, 0xef, 0x7b, 0x3e, 0x8e, 0xb6, 0x2f, 0x59, 0x0a, 0x9c, + 0x26, 0x12, 0x57, 0x61, 0xf1, 0xdb, 0x11, 0x96, 0x55, 0x49, 0xcd, 0x12, 0x9d, 0xb8, 0x5e, 0x9c, + 0x57, 0xf5, 0xa2, 0x8a, 0xb5, 0x8f, 0x61, 0x3d, 0x47, 0xbf, 0xfe, 0x1a, 0xeb, 0x32, 0x32, 0x0f, + 0xb4, 0x86, 0x25, 0x3a, 0xe6, 0x9f, 0xcb, 0x70, 0x33, 0x35, 0x67, 0x87, 0x04, 0x14, 0x07, 0xf4, + 0x27, 0x30, 0x1b, 0xbd, 0x07, 0x4d, 0xb7, 0x3f, 0x0a, 0xce, 0x31, 0x2b, 0x67, 0x85, 0x95, 0x12, + 0x96, 0xbb, 0x26, 0xe9, 0xb1, 0xf1, 0x6a, 0x85, 0x97, 0x70, 0x2b, 0xdf, 0x5a, 0xb9, 0xc8, 0x16, + 0x54, 0x06, 0x0e, 0x75, 0xfb, 0x6a, 0x99, 0x71, 0x17, 0xdd, 0x06, 0xe0, 0x4d, 0x3b, 0x71, 0xd1, + 0xd6, 0x38, 0x65, 0xd7, 0xa1, 0x0e, 0xba, 0x07, 0x0d, 0x1c, 0x74, 0x6c, 0xd2, 0xb5, 0x39, 0x4d, + 0xc2, 0x86, 0x80, 0x83, 0xce, 0x71, 0xf7, 0x39, 0xa3, 0x98, 0xdf, 0xc0, 0x92, 0x00, 0xe8, 0xe2, + 0xca, 0xa0, 0xac, 0x2a, 0x03, 0x76, 0xb2, 0xf8, 0x35, 0x28, 0x16, 0xcc, 0xdb, 0xe8, 0x53, 0x58, + 0x57, 0x09, 0x8e, 0x84, 0xde, 0xf7, 0x3c, 0x00, 0xed, 0x3e, 0x76, 0x3a, 0x38, 0x94, 0x47, 0x6d, + 0x2d, 0x4e, 0x78, 0x8a, 0x7f, 0xc8, 0xd9, 0x26, 0x85, 0x1b, 0x1c, 0x00, 0x39, 0xa4, 0x74, 0x38, + 0x3d, 0x46, 0xfa, 0x4e, 0x0a, 0x23, 0xad, 0x6f, 0x5e, 0xd5, 0xe3, 0xb9, 0x68, 0xc9, 0x35, 0x7f, + 0x03, 0x6b, 0x19, 0xad, 0xd2, 0xaf, 0xff, 0x8d, 0xda, 0xc7, 0x00, 0x3d, 0xcc, 0x72, 0xe4, 0x04, + 0xd5, 0xb5, 0x1e, 0x26, 0xa2, 0x69, 0xfe, 0xb3, 0x0c, 0xc6, 0x01, 0x26, 0xfb, 0x4e, 0x44, 0xdb, + 0x81, 0x47, 0x3d, 0xc7, 0x97, 0xa0, 0xa8, 0x58, 0x78, 0x6e, 0xb5, 0x5e, 0xfe, 0x0f, 0x00, 0xaa, + 0xcf, 0x60, 0x59, 0x61, 0x4f, 0x6f, 0x53, 0xee, 0xc7, 0xb0, 0x94, 0x12, 0xf0, 0x14, 0xea, 0xe4, + 0xec, 0x1b, 0xec, 0x52, 0x7b, 0xc8, 0x3e, 0xec, 0xe7, 0xd3, 0x53, 0x8f, 0x39, 0xeb, 0x84, 0x10, + 0xdf, 0x02, 0xa2, 0xda, 0x09, 0xdf, 0x2f, 0x4c, 0xf4, 0xfd, 0x6d, 0xb8, 0x99, 0xbb, 0x78, 0xe1, + 0xff, 0xcd, 0x3f, 0xb5, 0xf8, 0x4b, 0x4e, 0x8c, 0xf9, 0x8b, 0xa7, 0x2f, 0xf4, 0x0a, 0x9a, 0xe3, + 0xef, 0x50, 0xe8, 0x6e, 0x76, 0x2d, 0xa9, 0x87, 0x2f, 0xe3, 0x5e, 0xf1, 0x00, 0x79, 0x9b, 0x96, + 0xd0, 0xeb, 0xf8, 0xdd, 0x28, 0xf1, 0xa8, 0x84, 0x92, 0x13, 0x73, 0xdf, 0xb1, 0x8c, 0xfb, 0x13, + 0x46, 0x28, 0xd9, 0x7b, 0x00, 0xfa, 0x75, 0x08, 0xad, 0xa7, 0xa7, 0x24, 0xde, 0xa9, 0x0c, 0x23, + 0x8f, 0xa5, 0xc4, 0x7c, 0x09, 0x57, 0xd3, 0x8f, 0x3a, 0xe8, 0xb6, 0xba, 0x81, 0xf2, 0x9e, 0x99, + 0x8c, 0x3b, 0x45, 0xec, 0xa4, 0xc8, 0xf4, 0xbb, 0x8a, 0x16, 0x99, 0xfb, 0x88, 0xa3, 0x45, 0xe6, + 0x3f, 0xc7, 0x98, 0x25, 0xf4, 0x4b, 0x40, 0xd9, 0x77, 0x10, 0xa4, 0xfc, 0x54, 0xf8, 0x30, 0x63, + 0x98, 0x93, 0x86, 0x28, 0xf1, 0x87, 0x50, 0x4f, 0xbc, 0x1c, 0x20, 0xe5, 0xb1, 0xec, 0xe3, 0x8a, + 0x71, 0x33, 0x97, 0xa7, 0x24, 0xbd, 0x82, 0xe6, 0xf8, 0x97, 0x96, 0x0e, 0xa5, 0x82, 0x67, 0x08, + 0x1d, 0x4a, 0x85, 0x0f, 0x0a, 0x25, 0x74, 0x00, 0xa0, 0xc1, 0x75, 0xbd, 0xdd, 0x19, 0x44, 0x5f, + 0x6f, 0x77, 0x16, 0x8b, 0x37, 0x4b, 0x1f, 0x95, 0x99, 0x85, 0xe3, 0x20, 0xb9, 0xb6, 0xb0, 0x00, + 0x95, 0xd7, 0x16, 0x16, 0xe1, 0xeb, 0x22, 0xd8, 0x33, 0x68, 0xb3, 0x0e, 0xf6, 0x22, 0x94, 0x5d, + 0x07, 0x7b, 0x21, 0x54, 0x6d, 0x96, 0xd0, 0x53, 0x58, 0xd8, 0x8f, 0xdc, 0x73, 0xb4, 0xa2, 0x06, + 0x6b, 0x88, 0xda, 0x58, 0x4d, 0x13, 0xd5, 0xa4, 0xcf, 0xa0, 0x1a, 0x63, 0xb3, 0x68, 0x2d, 0x1e, + 0x33, 0x86, 0x34, 0x1b, 0xad, 0x2c, 0x43, 0x09, 0x38, 0x82, 0x2b, 0x29, 0x40, 0x15, 0xdd, 0x52, + 0x9a, 0x72, 0x90, 0x5d, 0xe3, 0x76, 0x01, 0x37, 0x79, 0x64, 0x35, 0xc0, 0xa9, 0xf7, 0x30, 0x03, + 0xc3, 0xea, 0x3d, 0xcc, 0xc1, 0x43, 0xf9, 0x61, 0xc8, 0x62, 0x93, 0xfa, 0x30, 0x14, 0xa2, 0xa5, + 0xfa, 0x30, 0x14, 0x43, 0x9b, 0xb1, 0xf8, 0x71, 0x14, 0x31, 0x29, 0xbe, 0x00, 0xd7, 0x4c, 0x8a, + 0x2f, 0x02, 0x21, 0xcd, 0x12, 0xf2, 0xb3, 0xcf, 0x71, 0x12, 0xf5, 0x43, 0xef, 0x14, 0x9d, 0x83, + 0x34, 0x0c, 0x69, 0xbc, 0xfb, 0x6f, 0xc7, 0x29, 0x6d, 0xcf, 0xa1, 0x91, 0x44, 0xfb, 0xd0, 0xcd, + 0xf4, 0xd4, 0x14, 0xe4, 0x60, 0xdc, 0xca, 0x67, 0x26, 0x0e, 0xcf, 0x05, 0x18, 0xc5, 0x20, 0x02, + 0x7a, 0x6f, 0x92, 0x5d, 0x69, 0x55, 0xef, 0xbf, 0xcd, 0xd0, 0x58, 0xf1, 0xa3, 0x32, 0xcb, 0x50, + 0x09, 0x68, 0x50, 0x67, 0xa8, 0x2c, 0x3c, 0xa9, 0x33, 0x54, 0x0e, 0x96, 0x68, 0x96, 0xd0, 0x36, + 0xd4, 0x14, 0x48, 0x86, 0x5a, 0x45, 0x50, 0x9f, 0xb1, 0x9e, 0xc3, 0x51, 0x32, 0xbe, 0x80, 0x46, + 0x12, 0xec, 0xd2, 0x5e, 0xcd, 0x41, 0xda, 0xb4, 0x57, 0x73, 0xf1, 0x31, 0x91, 0x7c, 0x35, 0x40, + 0x92, 0x48, 0xbe, 0x19, 0x1c, 0x26, 0x91, 0x7c, 0xb3, 0x88, 0x8a, 0x59, 0x42, 0x5f, 0xf3, 0x57, + 0xd7, 0x34, 0x9a, 0x81, 0x92, 0x8f, 0x9f, 0xb9, 0x00, 0x8a, 0xce, 0x40, 0x85, 0x50, 0x08, 0xdf, + 0xfb, 0xd7, 0xb0, 0x9c, 0x81, 0x25, 0xb4, 0xf4, 0x22, 0x24, 0x44, 0x4b, 0x2f, 0xc4, 0x34, 0xcc, + 0x12, 0xfa, 0x19, 0x54, 0xe4, 0x2f, 0x0f, 0xe8, 0x86, 0x1a, 0x9f, 0xfa, 0xa3, 0xc2, 0x58, 0xcb, + 0xd0, 0xd5, 0xec, 0xcf, 0xa1, 0x9e, 0x40, 0x29, 0x50, 0xf2, 0x06, 0x18, 0x43, 0x1f, 0xb4, 0x07, + 0x73, 0x60, 0x0d, 0xbe, 0xca, 0x5f, 0xc3, 0xad, 0x49, 0x50, 0x01, 0xfa, 0x60, 0x52, 0xe0, 0x8e, + 0x6b, 0xfb, 0xf0, 0xed, 0x06, 0xab, 0x85, 0x9c, 0xc0, 0x95, 0x54, 0xd9, 0xab, 0x13, 0x6e, 0x1e, + 0x2a, 0xa1, 0x13, 0x6e, 0x6e, 0xad, 0xcc, 0x97, 0x83, 0x61, 0x35, 0xaf, 0xd0, 0x41, 0x0f, 0x74, + 0x78, 0x17, 0x16, 0x6d, 0xc6, 0xc3, 0xc9, 0x83, 0x12, 0x6a, 0xbe, 0x86, 0xe5, 0x4c, 0xc5, 0xa8, + 0x63, 0xa3, 0xa8, 0x98, 0xd5, 0xb1, 0x51, 0x58, 0x6e, 0x72, 0xe9, 0x36, 0xa0, 0x2c, 0xac, 0x8b, + 0x12, 0x5f, 0x89, 0x05, 0xf8, 0xb2, 0xce, 0xc8, 0x13, 0x50, 0x61, 0x96, 0x5d, 0xbe, 0x86, 0xe5, + 0x0c, 0x82, 0xab, 0xcd, 0x2f, 0x02, 0x8d, 0xb5, 0xf9, 0x85, 0xf0, 0x2f, 0x37, 0xff, 0x05, 0x5c, + 0x1b, 0xab, 0x87, 0xd0, 0x9d, 0xd4, 0xa5, 0x9f, 0x29, 0xcf, 0x8c, 0xbb, 0x85, 0x7c, 0x15, 0x2b, + 0xbf, 0x82, 0x95, 0x9c, 0x2f, 0x7d, 0x64, 0xea, 0x98, 0x28, 0xaa, 0x81, 0x8c, 0x07, 0x13, 0xc7, + 0xc4, 0x1a, 0xb6, 0x3f, 0x7a, 0xcd, 0xc6, 0xf9, 0xce, 0xd9, 0x86, 0x4b, 0x06, 0x4f, 0x44, 0xf3, + 0x31, 0x09, 0x7b, 0x4f, 0xc4, 0xec, 0xc7, 0xfc, 0xdf, 0xb8, 0x27, 0x3d, 0x22, 0xfb, 0xc3, 0xb3, + 0xb3, 0x25, 0x4e, 0x7a, 0xfa, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xae, 0x76, 0xc0, 0x60, + 0x27, 0x00, 0x00, +>>>>>>> Adding GeoFetch RPC } diff --git a/vendor/vendor.json b/vendor/vendor.json index a952164df..d99f3a32e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -487,6 +487,7 @@ { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "checksumSHA1": "m2dWxzpWjVu9FT9sNBTEEyCeAYE=", "path": "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb", "revision": "16718ac6db9f02a58c5ffa510ba30cf2494eb84e", @@ -509,6 +510,14 @@ "version": "jc-geo-fetch", "versionExact": "jc-geo-fetch" >>>>>>> Adding GeoFetch RPC +======= + "checksumSHA1": "uroOI7kqhtko8Oqn2tsdZiuu3OM=", + "path": "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb", + "revision": "ec7937b63b5edf01a6cf9ddcbc2bef91fbc32509", + "revisionTime": "2019-03-12T18:07:06Z", + "version": "jc-geo-fast-initial-fetch", + "versionExact": "jc-geo-fast-initial-fetch" +>>>>>>> Adding GeoFetch RPC }, { "checksumSHA1": "WMOuBgCyclqy+Mqunb0NbykaC4Y=", |