diff --git a/changelogs/unreleased/get-archive-root-dir.yml b/changelogs/unreleased/get-archive-root-dir.yml new file mode 100644 index 0000000000000000000000000000000000000000..1f7f01119fafadf2d8b2e6e431ef4915598d4333 --- /dev/null +++ b/changelogs/unreleased/get-archive-root-dir.yml @@ -0,0 +1,5 @@ +--- +title: 'GetArchive: deprecate path in favor of subdirectory and include' +merge_request: 2383 +author: Ethan Reeesor (@firelizzard) +type: added diff --git a/internal/service/repository/archive.go b/internal/service/repository/archive.go index 2a6f6e63bade83d68713e9afba416f57cfe510fe..db0e0619f7f74a710a9e41318350d925afd917db 100644 --- a/internal/service/repository/archive.go +++ b/internal/service/repository/archive.go @@ -4,6 +4,7 @@ import ( "context" "io" "os/exec" + "path/filepath" "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/git" @@ -15,6 +16,12 @@ import ( "gitlab.com/gitlab-org/gitaly/streamio" ) +type getArchivePaths struct { + subdirectory string + include []string + exclude []string +} + func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.RepositoryService_GetArchiveServer) error { ctx := stream.Context() compressCmd, format := parseArchiveFormat(in.GetFormat()) @@ -24,24 +31,45 @@ func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.Repo return err } - path, err := storage.ValidateRelativePath(repoRoot, string(in.GetPath())) - if err != nil { - return helper.ErrInvalidArgument(err) + paths := getArchivePaths{ + subdirectory: ".", + include: make([]string, len(in.GetInclude())), + exclude: make([]string, len(in.GetExclude())), + } + if len(in.GetSubdirectory()) > 0 { + paths.subdirectory = string(in.GetSubdirectory()) + } + for i, b := range in.GetInclude() { + paths.include[i] = string(b) + } + for i, b := range in.GetExclude() { + paths.exclude[i] = string(b) } - exclude := make([]string, len(in.GetExclude())) - for i, ex := range in.GetExclude() { - exclude[i], err = storage.ValidateRelativePath(repoRoot, string(ex)) - if err != nil { - return helper.ErrInvalidArgument(err) + if len(in.GetPath()) > 0 { + if paths.subdirectory != "." || len(paths.include) > 0 { + return helper.ErrInvalidArgumentf("path cannot be used in conjunction with subdirectory or include") } + + paths.include = []string{string(in.GetPath())} + } + + validateRelativePath(repoRoot, &paths.subdirectory, &err) + for i := range paths.include { + validateRelativePath(filepath.Join(repoRoot, paths.subdirectory), &paths.include[i], &err) + } + for i := range paths.exclude { + validateRelativePath(filepath.Join(repoRoot, paths.subdirectory), &paths.exclude[i], &err) + } + if err != nil { + return helper.ErrInvalidArgument(err) } - if err := validateGetArchiveRequest(in, format, path); err != nil { + if err := validateGetArchiveRequest(in, format); err != nil { return err } - if err := validateGetArchivePrecondition(ctx, in, path, exclude); err != nil { + if err := validateGetArchivePrecondition(ctx, in, paths); err != nil { return err } @@ -49,7 +77,15 @@ func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.Repo return stream.Send(&gitalypb.GetArchiveResponse{Data: p}) }) - return handleArchive(ctx, writer, in, compressCmd, format, path, exclude) + return handleArchive(ctx, writer, in, compressCmd, format, paths) +} + +func validateRelativePath(root string, path *string, err *error) { + if *err != nil { + return + } + + *path, *err = storage.ValidateRelativePath(root, *path) } func parseArchiveFormat(format gitalypb.GetArchiveRequest_Format) (*exec.Cmd, string) { @@ -67,7 +103,7 @@ func parseArchiveFormat(format gitalypb.GetArchiveRequest_Format) (*exec.Cmd, st return nil, "" } -func validateGetArchiveRequest(in *gitalypb.GetArchiveRequest, format string, path string) error { +func validateGetArchiveRequest(in *gitalypb.GetArchiveRequest, format string) error { if err := git.ValidateRevision([]byte(in.GetCommitId())); err != nil { return helper.ErrInvalidArgumentf("invalid commitId: %v", err) } @@ -79,55 +115,58 @@ func validateGetArchiveRequest(in *gitalypb.GetArchiveRequest, format string, pa return nil } -func validateGetArchivePrecondition(ctx context.Context, in *gitalypb.GetArchiveRequest, path string, exclude []string) error { +func validateGetArchivePrecondition(ctx context.Context, in *gitalypb.GetArchiveRequest, paths getArchivePaths) error { c, err := catfile.New(ctx, in.GetRepository()) if err != nil { return err } f := commit.NewTreeEntryFinder(c) - if path != "." { - if ok, err := findGetArchivePath(f, in.GetCommitId(), path); err != nil { - return err - } else if !ok { - return helper.ErrPreconditionFailedf("path doesn't exist") - } + var dir string + if paths.subdirectory != "." { + dir = paths.subdirectory + findGetArchivePath(f, in.GetCommitId(), dir, &err, "path doesn't exist") } - - for i, exclude := range exclude { - if ok, err := findGetArchivePath(f, in.GetCommitId(), exclude); err != nil { - return err - } else if !ok { - return helper.ErrPreconditionFailedf("exclude[%d] doesn't exist", i) - } + for i, include := range paths.include { + findGetArchivePath(f, in.GetCommitId(), filepath.Join(dir, include), &err, "include[%d] doesn't exist", i) } - - return nil + for i, exclude := range paths.exclude { + findGetArchivePath(f, in.GetCommitId(), filepath.Join(dir, exclude), &err, "exclude[%d] doesn't exist", i) + } + return err } -func findGetArchivePath(f *commit.TreeEntryFinder, commitID, path string) (ok bool, err error) { - treeEntry, err := f.FindByRevisionAndPath(commitID, path) - if err != nil { - return false, err +func findGetArchivePath(f *commit.TreeEntryFinder, commitID, path string, err *error, missingMessage string, missingArgs ...interface{}) { + if *err != nil { + return + } + + var treeEntry *gitalypb.TreeEntry + treeEntry, *err = f.FindByRevisionAndPath(commitID, path) + if *err != nil { + return } if treeEntry == nil || len(treeEntry.Oid) == 0 { - return false, nil + *err = helper.ErrPreconditionFailedf(missingMessage, missingArgs...) } - return true, nil } -func handleArchive(ctx context.Context, writer io.Writer, in *gitalypb.GetArchiveRequest, compressCmd *exec.Cmd, format string, path string, exclude []string) error { - pathspecs := make([]string, len(exclude)+1) - pathspecs[0] = path - for i, exclude := range exclude { - pathspecs[i+1] = ":(exclude)" + exclude +func handleArchive(ctx context.Context, writer io.Writer, in *gitalypb.GetArchiveRequest, compressCmd *exec.Cmd, format string, paths getArchivePaths) error { + args := []string{in.GetCommitId()} + pathspecs := make([]string, len(paths.include)+len(paths.exclude)) + if paths.subdirectory != "." { + args[0] += ":" + paths.subdirectory + } + for i, exclude := range paths.exclude { + pathspecs[i] = ":(exclude)" + exclude } + copy(pathspecs[len(paths.exclude):], paths.include) archiveCommand, err := git.SafeCmd(ctx, in.GetRepository(), nil, git.SubCmd{ Name: "archive", Flags: []git.Option{git.ValueFlag{"--format", format}, git.ValueFlag{"--prefix", in.GetPrefix() + "/"}}, - Args: []string{in.GetCommitId()}, + Args: args, PostSepArgs: pathspecs, }) if err != nil { diff --git a/internal/service/repository/archive_test.go b/internal/service/repository/archive_test.go index 87436d4a5d1e0eb8b712a9ba6cad009980b62883..865654e42c2853015c1064d97ec70fd28e8bd594 100644 --- a/internal/service/repository/archive_test.go +++ b/internal/service/repository/archive_test.go @@ -33,13 +33,15 @@ func TestGetArchiveSuccess(t *testing.T) { } testCases := []struct { - desc string - prefix string - commitID string - path []byte - exclude [][]byte - contents []string - excluded []string + desc string + prefix string + commitID string + path []byte + subdirectory []byte + include [][]byte + exclude [][]byte + contents []string + excluded []string }{ { desc: "without-prefix", @@ -89,6 +91,16 @@ func TestGetArchiveSuccess(t *testing.T) { contents: []string{"/.gitignore", "/LICENSE", "/README.md"}, excluded: []string{"/files/whitespace", "/files/html/500.html"}, }, + { + desc: "test", + commitID: "1e292f8fedd741b75372e19097c76d327140c312", + prefix: "my-prefix", + subdirectory: []byte("files"), + include: [][]byte{[]byte("images")}, + exclude: [][]byte{[]byte("images/wm.svg")}, + contents: []string{"/images/emoji.png"}, + excluded: []string{"/images/wm.svg", "/LICENSE"}, + }, } for _, tc := range testCases { @@ -100,12 +112,14 @@ func TestGetArchiveSuccess(t *testing.T) { defer cancel() req := &gitalypb.GetArchiveRequest{ - Repository: testRepo, - CommitId: tc.commitID, - Prefix: tc.prefix, - Format: format, - Path: tc.path, - Exclude: tc.exclude, + Repository: testRepo, + CommitId: tc.commitID, + Prefix: tc.prefix, + Format: format, + Path: tc.path, + Subdirectory: tc.subdirectory, + Include: tc.include, + Exclude: tc.exclude, } stream, err := client.GetArchive(ctx, req) require.NoError(t, err) diff --git a/proto/go/gitalypb/repository-service.pb.go b/proto/go/gitalypb/repository-service.pb.go index 0af7c9ef8ad616394d8c69693301e9d49e5c8ca2..775c8289723cd72467a7f6d9197d7a89688a143a 100644 --- a/proto/go/gitalypb/repository-service.pb.go +++ b/proto/go/gitalypb/repository-service.pb.go @@ -901,15 +901,21 @@ func (m *CreateRepositoryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateRepositoryResponse proto.InternalMessageInfo type GetArchiveRequest struct { - Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"` - CommitId string `protobuf:"bytes,2,opt,name=commit_id,json=commitId,proto3" json:"commit_id,omitempty"` - Prefix string `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix,omitempty"` - Format GetArchiveRequest_Format `protobuf:"varint,4,opt,name=format,proto3,enum=gitaly.GetArchiveRequest_Format" json:"format,omitempty"` - Path []byte `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` - Exclude [][]byte `protobuf:"bytes,6,rep,name=exclude,proto3" json:"exclude,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"` + CommitId string `protobuf:"bytes,2,opt,name=commit_id,json=commitId,proto3" json:"commit_id,omitempty"` + Prefix string `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix,omitempty"` + Format GetArchiveRequest_Format `protobuf:"varint,4,opt,name=format,proto3,enum=gitaly.GetArchiveRequest_Format" json:"format,omitempty"` + Exclude [][]byte `protobuf:"bytes,6,rep,name=exclude,proto3" json:"exclude,omitempty"` + Include [][]byte `protobuf:"bytes,8,rep,name=include,proto3" json:"include,omitempty"` + // use `include` instead + Path []byte `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` // Deprecated: Do not use. + // If `subdirectory` is not empty, `include` and `exclude` are relative to it. + // Archive entries will be relative to `subdirectory` - entry file paths will + // not include `subdirectory`. + Subdirectory []byte `protobuf:"bytes,7,opt,name=subdirectory,proto3" json:"subdirectory,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetArchiveRequest) Reset() { *m = GetArchiveRequest{} } @@ -965,6 +971,21 @@ func (m *GetArchiveRequest) GetFormat() GetArchiveRequest_Format { return GetArchiveRequest_ZIP } +func (m *GetArchiveRequest) GetExclude() [][]byte { + if m != nil { + return m.Exclude + } + return nil +} + +func (m *GetArchiveRequest) GetInclude() [][]byte { + if m != nil { + return m.Include + } + return nil +} + +// Deprecated: Do not use. func (m *GetArchiveRequest) GetPath() []byte { if m != nil { return m.Path @@ -972,9 +993,9 @@ func (m *GetArchiveRequest) GetPath() []byte { return nil } -func (m *GetArchiveRequest) GetExclude() [][]byte { +func (m *GetArchiveRequest) GetSubdirectory() []byte { if m != nil { - return m.Exclude + return m.Subdirectory } return nil } @@ -3990,197 +4011,198 @@ func init() { func init() { proto.RegisterFile("repository-service.proto", fileDescriptor_e9b1768cf174c79b) } var fileDescriptor_e9b1768cf174c79b = []byte{ - // 3029 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x5b, 0x6f, 0x1c, 0xc7, - 0xb1, 0xd6, 0xf2, 0xb2, 0x97, 0xe2, 0x4a, 0x5a, 0x36, 0x29, 0x72, 0x39, 0x22, 0x45, 0x69, 0x24, - 0xcb, 0xb2, 0x2d, 0x53, 0xb2, 0x74, 0x80, 0xe3, 0x73, 0x0e, 0x0e, 0x0e, 0x78, 0x27, 0x75, 0x21, - 0xe9, 0x21, 0x75, 0x0c, 0x0b, 0x30, 0xd6, 0xb3, 0xb3, 0xbd, 0xdc, 0x09, 0x67, 0xa7, 0x57, 0x3d, - 0xbd, 0xa2, 0x68, 0x20, 0x0f, 0x09, 0x90, 0x57, 0x03, 0x01, 0x82, 0x38, 0x6f, 0xc9, 0x73, 0x7e, - 0x41, 0x5e, 0x82, 0x20, 0x2f, 0xf9, 0x0f, 0xfe, 0x0b, 0xf9, 0x09, 0x79, 0x0a, 0xfa, 0x32, 0xd3, - 0x73, 0x5d, 0x2b, 0xe0, 0xc2, 0x79, 0x9b, 0xae, 0xee, 0xae, 0xaa, 0xae, 0xae, 0xea, 0xee, 0xfa, - 0x6a, 0xa0, 0x49, 0xf1, 0x80, 0x04, 0x2e, 0x23, 0xf4, 0xe2, 0xd3, 0x00, 0xd3, 0xb7, 0xae, 0x83, - 0xd7, 0x06, 0x94, 0x30, 0x82, 0xca, 0xa7, 0x2e, 0xb3, 0xbd, 0x0b, 0x03, 0x3c, 0xd7, 0x67, 0x92, - 0x66, 0xd4, 0x83, 0x9e, 0x4d, 0x71, 0x47, 0xb6, 0xcc, 0x63, 0x58, 0xb4, 0xa2, 0xd9, 0xdb, 0xef, - 0xdc, 0x80, 0x05, 0x16, 0x7e, 0x33, 0xc4, 0x01, 0x43, 0x9f, 0x03, 0x68, 0xc6, 0xcd, 0xd2, 0xed, - 0xd2, 0x83, 0x99, 0x27, 0x68, 0x4d, 0x72, 0x5c, 0xd3, 0x93, 0x36, 0xa6, 0x7e, 0xf7, 0xb7, 0x87, - 0x25, 0x2b, 0x36, 0xd6, 0x7c, 0x02, 0xcd, 0x2c, 0xd3, 0x60, 0x40, 0xfc, 0x00, 0xa3, 0x05, 0x28, - 0x63, 0x41, 0x11, 0x1c, 0xab, 0x96, 0x6a, 0x99, 0x27, 0x62, 0x8e, 0xed, 0x9c, 0xed, 0xfb, 0x0e, - 0xc5, 0x7d, 0xec, 0x33, 0xdb, 0xbb, 0xbc, 0x26, 0x37, 0x61, 0x29, 0x87, 0xab, 0x54, 0xc5, 0xa4, - 0x30, 0x2b, 0x3b, 0x77, 0x86, 0xde, 0xe5, 0x65, 0xa1, 0xbb, 0x70, 0xd5, 0xa1, 0xd8, 0x66, 0xb8, - 0xd5, 0x76, 0x59, 0xdf, 0x1e, 0x34, 0x27, 0xc4, 0x02, 0xeb, 0x92, 0xb8, 0x21, 0x68, 0xe6, 0x3c, - 0xa0, 0xb8, 0x4c, 0xa5, 0xc9, 0x5b, 0xb8, 0xb1, 0x6b, 0xd3, 0xb6, 0x7d, 0x8a, 0x37, 0x89, 0xe7, - 0x61, 0x87, 0xfd, 0x44, 0xda, 0x34, 0x61, 0x21, 0x2d, 0x57, 0x69, 0x74, 0x0c, 0x8b, 0x5f, 0x52, - 0x97, 0xe1, 0x4d, 0xd2, 0xef, 0xbb, 0x6c, 0x97, 0xda, 0x83, 0xde, 0xe5, 0x77, 0xc3, 0x80, 0x66, - 0x96, 0xa9, 0x12, 0xf8, 0x0c, 0xae, 0x6d, 0x7a, 0xd8, 0xf6, 0x87, 0x83, 0xcb, 0xcb, 0x99, 0x85, - 0xeb, 0x11, 0x2f, 0xc5, 0xfe, 0x0b, 0xb8, 0xa1, 0xa7, 0x1c, 0xbb, 0xdf, 0xe2, 0xcb, 0x4b, 0x79, - 0x08, 0x0b, 0x69, 0x96, 0xca, 0xc7, 0x11, 0x4c, 0x05, 0xee, 0xb7, 0x58, 0x70, 0x9b, 0xb4, 0xc4, - 0xb7, 0xf9, 0x06, 0x96, 0xd6, 0x07, 0x03, 0xef, 0x62, 0xd7, 0x65, 0x36, 0x63, 0xd4, 0x6d, 0x0f, - 0x19, 0xbe, 0x7c, 0xa8, 0x21, 0x03, 0xaa, 0x14, 0xbf, 0x75, 0x03, 0x97, 0xf8, 0x62, 0x87, 0xeb, - 0x56, 0xd4, 0x36, 0x97, 0xc1, 0xc8, 0x13, 0xa9, 0x2c, 0xf2, 0x97, 0x09, 0x40, 0x3b, 0x98, 0x39, - 0x3d, 0x0b, 0xf7, 0x09, 0xbb, 0xbc, 0x3d, 0x78, 0x64, 0x53, 0xc1, 0x4a, 0x28, 0x52, 0xb3, 0x54, - 0x0b, 0xcd, 0xc3, 0x74, 0x97, 0x50, 0x07, 0x37, 0x27, 0x85, 0x07, 0xca, 0x06, 0x5a, 0x84, 0x8a, - 0x4f, 0x5a, 0xcc, 0x3e, 0x0d, 0x9a, 0x53, 0xf2, 0x20, 0xf0, 0xc9, 0x89, 0x7d, 0x1a, 0xa0, 0x26, - 0x54, 0x98, 0xdb, 0xc7, 0x64, 0xc8, 0x9a, 0xd3, 0xb7, 0x4b, 0x0f, 0xa6, 0xad, 0xb0, 0xc9, 0xa7, - 0x04, 0x41, 0xaf, 0x75, 0x86, 0x2f, 0x9a, 0x65, 0x29, 0x21, 0x08, 0x7a, 0xcf, 0xf1, 0x05, 0x5a, - 0x85, 0x99, 0x33, 0x9f, 0x9c, 0xfb, 0xad, 0x1e, 0xe1, 0x07, 0x4b, 0x45, 0x74, 0x82, 0x20, 0xed, - 0x71, 0x0a, 0x5a, 0x82, 0xaa, 0x4f, 0x5a, 0x03, 0x3a, 0xf4, 0x71, 0xb3, 0x26, 0xa4, 0x55, 0x7c, - 0x72, 0xc4, 0x9b, 0xe8, 0x29, 0x5c, 0x95, 0x7a, 0xb6, 0x06, 0x36, 0xb5, 0xfb, 0x41, 0x13, 0xc4, - 0x92, 0xaf, 0xe9, 0x25, 0x0b, 0xeb, 0xd4, 0xe5, 0xa0, 0x23, 0x31, 0xe6, 0xd9, 0x54, 0xb5, 0xda, - 0xa8, 0x99, 0x37, 0x60, 0x2e, 0x61, 0x40, 0x1d, 0x3a, 0x9b, 0x22, 0xc8, 0xb4, 0xb5, 0xc6, 0x12, - 0x3a, 0x59, 0xa6, 0x4a, 0xe0, 0xef, 0x27, 0x60, 0x76, 0x17, 0xb3, 0x75, 0xea, 0xf4, 0xdc, 0xb7, - 0x63, 0xd8, 0xc8, 0x9b, 0x50, 0x73, 0x44, 0x84, 0xb6, 0xdc, 0x8e, 0xda, 0xcb, 0xaa, 0x24, 0xec, - 0x77, 0xf8, 0x2e, 0x0f, 0x28, 0xee, 0xba, 0xef, 0xc4, 0x76, 0xd6, 0x2c, 0xd5, 0x42, 0x9f, 0x43, - 0xb9, 0x4b, 0x68, 0xdf, 0x66, 0x62, 0x3b, 0xaf, 0x3d, 0xb9, 0x1d, 0x8a, 0xca, 0x68, 0xb6, 0xb6, - 0x23, 0xc6, 0x59, 0x6a, 0x3c, 0x8f, 0x96, 0x81, 0xcd, 0x7a, 0x62, 0xb7, 0xeb, 0x96, 0xf8, 0xe6, - 0x4e, 0x80, 0xdf, 0x39, 0xde, 0xb0, 0x83, 0x9b, 0xe5, 0xdb, 0x93, 0x0f, 0xea, 0x56, 0xd8, 0x34, - 0x9f, 0x42, 0x59, 0xce, 0x47, 0x15, 0x98, 0x7c, 0xbd, 0x7f, 0xd4, 0xb8, 0xc2, 0x3f, 0x4e, 0xd6, - 0xad, 0x46, 0x09, 0x01, 0x94, 0x4f, 0xd6, 0xad, 0xd6, 0xee, 0xeb, 0xc6, 0x04, 0x9a, 0x81, 0x0a, - 0xff, 0xde, 0x78, 0xfd, 0xa4, 0x31, 0x69, 0x3e, 0x00, 0x14, 0x57, 0x43, 0x87, 0x69, 0xc7, 0x66, - 0xb6, 0xb0, 0x4d, 0xdd, 0x12, 0xdf, 0x7c, 0xf3, 0xf6, 0xec, 0xe0, 0x05, 0x71, 0x6c, 0x6f, 0x83, - 0xda, 0xbe, 0xd3, 0x1b, 0x43, 0x90, 0x9a, 0x8f, 0xa1, 0x99, 0x65, 0xaa, 0x94, 0x98, 0x87, 0xe9, - 0xb7, 0xb6, 0x37, 0xc4, 0xea, 0x3a, 0x94, 0x0d, 0xf3, 0x87, 0x12, 0x34, 0x85, 0x6f, 0x1d, 0x93, - 0x21, 0x75, 0xb0, 0x9c, 0x75, 0xf9, 0x9d, 0xfd, 0x3f, 0x98, 0x0d, 0x04, 0xc3, 0x56, 0x8c, 0xc1, - 0x44, 0x11, 0x03, 0xab, 0x21, 0x07, 0x5b, 0x89, 0x5b, 0x45, 0x31, 0x68, 0x0b, 0x95, 0x84, 0x13, - 0xd4, 0xad, 0x7a, 0x10, 0x53, 0x13, 0xad, 0x00, 0x30, 0x9b, 0x9e, 0x62, 0xd6, 0xa2, 0xb8, 0x2b, - 0xdc, 0xa1, 0x6e, 0xd5, 0x24, 0xc5, 0xc2, 0x5d, 0xf3, 0x29, 0x2c, 0xe5, 0x2c, 0x4d, 0x3f, 0x0f, - 0x28, 0x0e, 0x86, 0x1e, 0x0b, 0x9f, 0x07, 0xb2, 0x65, 0xee, 0xc2, 0xcc, 0x4e, 0xe0, 0x9c, 0x5d, - 0x7e, 0x2f, 0xee, 0x41, 0x5d, 0x32, 0xd2, 0xf6, 0xc7, 0x94, 0x12, 0xaa, 0xbc, 0x40, 0x36, 0xcc, - 0x3f, 0x95, 0xe0, 0xba, 0xb8, 0xaa, 0x2c, 0xdc, 0xbd, 0xbc, 0xd9, 0x1b, 0x30, 0xc9, 0x2d, 0x21, - 0xcf, 0x67, 0xfe, 0x99, 0x38, 0xb6, 0x27, 0x93, 0xc7, 0x36, 0xba, 0x03, 0x75, 0xe2, 0x75, 0x5a, - 0x51, 0xbf, 0x34, 0xe0, 0x0c, 0xf1, 0x3a, 0x56, 0x38, 0x24, 0x3a, 0x52, 0xa7, 0x63, 0x47, 0xea, - 0xb3, 0xa9, 0x6a, 0xb9, 0x51, 0x31, 0x9b, 0xd0, 0xd0, 0x9a, 0xcb, 0x45, 0x3e, 0x9b, 0xaa, 0x96, - 0x1a, 0x13, 0xa6, 0x0f, 0xf3, 0x3b, 0xae, 0xdf, 0x79, 0x89, 0xe9, 0x29, 0xde, 0xb0, 0x83, 0x31, - 0x9c, 0x14, 0xcb, 0x50, 0x0b, 0xd5, 0x0c, 0x9a, 0x13, 0x22, 0x50, 0x35, 0xc1, 0xfc, 0x04, 0x6e, - 0xa4, 0xe4, 0xe9, 0xc0, 0x6b, 0xdb, 0x81, 0x74, 0xf9, 0x9a, 0x25, 0xbe, 0xcd, 0xef, 0x4a, 0x30, - 0x2b, 0x4f, 0xb8, 0x1d, 0x42, 0xcf, 0xfe, 0xfd, 0xae, 0xce, 0x5f, 0x6a, 0x71, 0x7d, 0xa2, 0x37, - 0xe3, 0xd2, 0x7e, 0x60, 0x61, 0xae, 0xf2, 0xbe, 0x7f, 0x44, 0xc9, 0x29, 0xc5, 0x41, 0x30, 0x96, - 0x23, 0x97, 0x0a, 0xa6, 0xb1, 0x23, 0x57, 0x12, 0xf6, 0x3b, 0xe6, 0xff, 0x82, 0x91, 0x27, 0x53, - 0x19, 0x73, 0x15, 0x66, 0x5c, 0xbf, 0x35, 0x50, 0x64, 0x15, 0x36, 0xe0, 0x46, 0x03, 0xa5, 0xca, - 0xc7, 0x6f, 0x86, 0x76, 0xd0, 0x1b, 0xb3, 0xca, 0x81, 0x60, 0x1a, 0x53, 0x59, 0x12, 0x42, 0x95, - 0xb3, 0x32, 0xdf, 0x57, 0x65, 0x0f, 0x6e, 0xa5, 0x6f, 0xbb, 0x1d, 0x4a, 0xfa, 0xaf, 0xac, 0x17, - 0x63, 0x09, 0xc6, 0x21, 0xf5, 0x94, 0xc6, 0xfc, 0xd3, 0xbc, 0x03, 0xab, 0x85, 0xd2, 0xd4, 0xb6, - 0x1f, 0xc2, 0x9c, 0x1c, 0xb2, 0x31, 0xf4, 0x3b, 0xde, 0x18, 0x1e, 0x8f, 0x1f, 0xc3, 0x7c, 0x92, - 0xe1, 0x88, 0x3b, 0xe9, 0xbb, 0x09, 0x68, 0x1c, 0x63, 0xb6, 0x49, 0xfc, 0xae, 0x7b, 0x7a, 0x79, - 0x03, 0x7c, 0x0e, 0x15, 0xec, 0x33, 0xea, 0x62, 0x19, 0xb2, 0x33, 0x4f, 0x6e, 0x85, 0xd3, 0xd2, - 0x42, 0xd6, 0xb6, 0x7d, 0x46, 0x2f, 0xac, 0x70, 0xb8, 0xf1, 0xab, 0x12, 0x4c, 0x0b, 0x12, 0x37, - 0x22, 0x7f, 0x86, 0xc9, 0x00, 0xe6, 0x9f, 0x68, 0x05, 0x6a, 0xe2, 0xea, 0x6a, 0x05, 0x8c, 0x4a, - 0xe3, 0xee, 0x5d, 0xb1, 0xaa, 0x82, 0x74, 0xcc, 0x28, 0xba, 0x03, 0x33, 0xb2, 0xdb, 0xf5, 0xd9, - 0xd3, 0x27, 0xe2, 0xcc, 0x9b, 0xde, 0xbb, 0x62, 0x81, 0x20, 0xee, 0x73, 0x1a, 0x5a, 0x05, 0xd9, - 0x6a, 0xb5, 0x09, 0xf1, 0xe4, 0xa3, 0x70, 0xef, 0x8a, 0x25, 0xb9, 0x6e, 0x10, 0xe2, 0x6d, 0x54, - 0xd4, 0x55, 0x69, 0xce, 0xc1, 0x6c, 0x4c, 0x55, 0xb5, 0x45, 0x0e, 0xcc, 0x6d, 0x61, 0x0f, 0xf3, - 0xec, 0x62, 0x3c, 0x76, 0x42, 0x30, 0x75, 0x86, 0x2f, 0xa4, 0x91, 0x6a, 0x96, 0xf8, 0x36, 0x17, - 0x60, 0x3e, 0x29, 0x44, 0x09, 0x77, 0x79, 0x9e, 0x19, 0x30, 0x42, 0xf1, 0xe6, 0x30, 0x60, 0xa4, - 0xbf, 0x47, 0xc8, 0x59, 0x30, 0x16, 0x15, 0x84, 0x37, 0x4c, 0xc4, 0xbc, 0x61, 0x19, 0x8c, 0x3c, - 0x51, 0x4a, 0x91, 0x13, 0x68, 0x6e, 0xd8, 0xce, 0xd9, 0x70, 0x30, 0x4e, 0x3d, 0xcc, 0x47, 0xb0, - 0x94, 0xc3, 0x75, 0x84, 0xcb, 0xbe, 0x81, 0x3b, 0x79, 0x21, 0x35, 0xa6, 0xe8, 0xc9, 0xb5, 0xcb, - 0x3d, 0x30, 0x47, 0x89, 0x54, 0xf6, 0x39, 0x00, 0xc4, 0xef, 0xa4, 0x17, 0xae, 0x83, 0xfd, 0x31, - 0xdc, 0x80, 0xe6, 0x26, 0xcc, 0x25, 0xf8, 0x29, 0x9b, 0x3c, 0x04, 0xe4, 0x49, 0x52, 0x2b, 0xe8, - 0x11, 0xca, 0x5a, 0xbe, 0xdd, 0x0f, 0xef, 0xbb, 0x86, 0xea, 0x39, 0xe6, 0x1d, 0x07, 0x76, 0x5f, - 0x6c, 0xda, 0x2e, 0x66, 0xfb, 0x7e, 0x97, 0xac, 0x8f, 0x2f, 0x35, 0x34, 0xff, 0x07, 0x96, 0x72, - 0xb8, 0x2a, 0x05, 0x6f, 0x01, 0xe8, 0x9c, 0x50, 0x6d, 0x5d, 0x8c, 0xc2, 0x55, 0xda, 0xb4, 0x3d, - 0x67, 0xe8, 0xd9, 0x0c, 0x6f, 0xf6, 0xb0, 0x73, 0x16, 0x0c, 0xfb, 0x97, 0x57, 0xe9, 0x3f, 0x61, - 0x29, 0x87, 0xab, 0x52, 0xc9, 0x80, 0xaa, 0xa3, 0x68, 0xca, 0x52, 0x51, 0x9b, 0x6f, 0xdb, 0x2e, - 0x66, 0xc7, 0xbe, 0x3d, 0x08, 0x7a, 0xe4, 0xf2, 0xe8, 0x88, 0xf9, 0x11, 0xcc, 0x25, 0xf8, 0x8d, - 0x70, 0xe5, 0xef, 0x4b, 0x70, 0x37, 0xcf, 0xb1, 0xc6, 0xa6, 0x0c, 0xcf, 0x4e, 0x7b, 0x8c, 0x0d, - 0x5a, 0xfa, 0x5a, 0xaa, 0xf0, 0xf6, 0x2b, 0xea, 0xf1, 0x4b, 0x56, 0x74, 0xd9, 0x43, 0xd6, 0x53, - 0x09, 0x97, 0x18, 0xbb, 0x3e, 0x64, 0x3d, 0xf3, 0x3e, 0xdc, 0x1b, 0xad, 0x98, 0xf2, 0xf9, 0xdf, - 0x96, 0x60, 0x7e, 0x17, 0x33, 0xcb, 0x3e, 0xdf, 0xec, 0xd9, 0xfe, 0xe9, 0x38, 0x60, 0x87, 0xbb, - 0x70, 0xb5, 0x4b, 0x49, 0xbf, 0x95, 0xc0, 0x1e, 0x6a, 0x56, 0x9d, 0x13, 0xa3, 0x57, 0xea, 0x2a, - 0xcc, 0x30, 0xd2, 0x4a, 0xbc, 0x73, 0x6b, 0x16, 0x30, 0x12, 0x0e, 0x30, 0xff, 0x3c, 0x05, 0x37, - 0x52, 0x8a, 0xa9, 0x8d, 0xd8, 0x83, 0x19, 0x6a, 0x9f, 0xb7, 0x1c, 0x49, 0x6e, 0x96, 0xc4, 0x3d, - 0xf5, 0x61, 0x2c, 0xa5, 0xcc, 0xce, 0x59, 0x8b, 0x48, 0x16, 0xd0, 0xa8, 0xd7, 0xf8, 0x61, 0x12, - 0x6a, 0x51, 0x0f, 0x5a, 0x84, 0x4a, 0xdb, 0x23, 0x6d, 0xfe, 0x64, 0x91, 0x2e, 0x56, 0xe6, 0xcd, - 0xfd, 0x4e, 0x04, 0xd9, 0x4c, 0x68, 0xc8, 0x06, 0xad, 0x40, 0xd5, 0xc7, 0xe7, 0x2d, 0x91, 0x9c, - 0x0a, 0xe5, 0x37, 0x26, 0x9a, 0x25, 0xab, 0xe2, 0xe3, 0xf3, 0x23, 0x9e, 0xa3, 0xae, 0x40, 0x95, - 0xbf, 0xd3, 0x45, 0xf7, 0x94, 0xee, 0x26, 0x5e, 0x47, 0x74, 0x1f, 0x42, 0x8d, 0x0c, 0x30, 0xb5, - 0x19, 0x5f, 0xfb, 0xb4, 0xc8, 0x89, 0x3f, 0x7b, 0xcf, 0x05, 0xac, 0x1d, 0x86, 0x13, 0x2d, 0xcd, - 0x83, 0xdb, 0x9c, 0xdb, 0x44, 0x33, 0x95, 0x20, 0x48, 0x9d, 0xda, 0xe7, 0xd1, 0x78, 0xee, 0x4b, - 0x5c, 0xa9, 0x3e, 0xe9, 0x60, 0x81, 0x83, 0x4c, 0x0b, 0x85, 0x5e, 0x92, 0x0e, 0x16, 0x20, 0x08, - 0x3e, 0x97, 0x5d, 0x55, 0xd9, 0xe5, 0xe3, 0x73, 0xd1, 0x75, 0x0f, 0xae, 0x85, 0x2b, 0x6d, 0xb5, - 0x2f, 0xf8, 0x89, 0x50, 0x93, 0x79, 0x9d, 0x5a, 0xeb, 0x06, 0xa7, 0xf1, 0x51, 0xe1, 0x82, 0xd5, - 0x28, 0x90, 0xa3, 0xd4, 0x92, 0xc5, 0x28, 0xd3, 0x85, 0x9a, 0x56, 0x67, 0x06, 0x2a, 0xaf, 0x0e, - 0x9e, 0x1f, 0x1c, 0x7e, 0x79, 0xd0, 0xb8, 0x82, 0x6a, 0x30, 0xbd, 0xbe, 0xb5, 0xb5, 0xbd, 0x25, - 0x33, 0xf5, 0xcd, 0xc3, 0xa3, 0xfd, 0xed, 0x2d, 0x99, 0xa9, 0x6f, 0x6d, 0xbf, 0xd8, 0x3e, 0xd9, - 0xde, 0x6a, 0x4c, 0xa2, 0x3a, 0x54, 0x5f, 0x1e, 0x6e, 0xed, 0xef, 0xf0, 0xae, 0x29, 0xde, 0x65, - 0x6d, 0x1f, 0xac, 0xbf, 0xdc, 0xde, 0x6a, 0x4c, 0xa3, 0x06, 0xd4, 0x4f, 0xbe, 0x3a, 0xda, 0x6e, - 0x6d, 0xee, 0xad, 0x1f, 0xec, 0x6e, 0x6f, 0x35, 0xca, 0xe6, 0x6f, 0x4a, 0xd0, 0x3c, 0xc6, 0x36, - 0x75, 0x7a, 0x3b, 0xae, 0x87, 0x83, 0x8d, 0x0b, 0x7e, 0x9a, 0x5e, 0xde, 0xb9, 0xe7, 0x61, 0xfa, - 0xcd, 0x10, 0xab, 0x74, 0xa1, 0x66, 0xc9, 0x46, 0x98, 0xc4, 0x4d, 0xea, 0x24, 0x6e, 0x01, 0xca, - 0x5d, 0xd7, 0x63, 0x98, 0xca, 0xed, 0xb7, 0x54, 0xcb, 0xfc, 0x0c, 0x96, 0x72, 0xb4, 0xd2, 0xf9, - 0x66, 0x97, 0x93, 0x85, 0x4f, 0xd7, 0x2d, 0xd9, 0x30, 0xff, 0x58, 0x82, 0x9b, 0x89, 0x39, 0x9b, - 0xc4, 0x67, 0xd8, 0x67, 0x3f, 0xdd, 0x62, 0x3e, 0x82, 0x86, 0xd3, 0x1b, 0xfa, 0x67, 0x98, 0x67, - 0x9e, 0x52, 0x57, 0x05, 0xcc, 0x5d, 0x57, 0xf4, 0xe8, 0x3c, 0xb9, 0x80, 0xe5, 0x7c, 0x5d, 0xd5, - 0x12, 0x9b, 0x50, 0xe9, 0xdb, 0xcc, 0xe9, 0x45, 0x8b, 0x0c, 0x9b, 0x68, 0x05, 0x40, 0x7c, 0xb6, - 0x62, 0xb7, 0x77, 0x4d, 0x50, 0xb6, 0x6c, 0x66, 0xa3, 0xdb, 0x50, 0xc7, 0x7e, 0xa7, 0x45, 0xba, - 0x2d, 0x41, 0x53, 0x80, 0x21, 0x60, 0xbf, 0x73, 0xd8, 0x7d, 0xc9, 0x29, 0xe6, 0xaf, 0x4b, 0x50, - 0x96, 0x70, 0x5b, 0xf8, 0x8e, 0x2f, 0x45, 0xef, 0x78, 0x1e, 0xc3, 0xe2, 0x9a, 0x95, 0x2b, 0x15, - 0xdf, 0xe8, 0xbf, 0x61, 0x29, 0x3a, 0x40, 0x09, 0x75, 0xbf, 0x15, 0x6e, 0xd9, 0xea, 0x61, 0xbb, - 0x83, 0xa9, 0x3a, 0x91, 0x16, 0xc3, 0x03, 0x35, 0xea, 0xdf, 0x13, 0xdd, 0xe8, 0x03, 0xb8, 0xd6, - 0x77, 0x29, 0x25, 0xb4, 0x45, 0x71, 0xb7, 0x6f, 0x0f, 0x82, 0xe6, 0x94, 0x78, 0x0a, 0x5e, 0x95, - 0x54, 0x4b, 0x12, 0xb9, 0x17, 0x2e, 0x08, 0x40, 0x63, 0xef, 0xe4, 0xe4, 0x68, 0x5c, 0x60, 0xea, - 0xfd, 0x04, 0x98, 0x9a, 0xc5, 0x23, 0x43, 0x70, 0x35, 0x86, 0x96, 0x4e, 0x26, 0xd0, 0x52, 0x73, - 0x09, 0x16, 0x33, 0x5a, 0xa9, 0x0d, 0xfc, 0x0a, 0x56, 0x76, 0x31, 0x3b, 0x6c, 0xff, 0x0c, 0x3b, - 0x6c, 0xcb, 0xa5, 0xd8, 0x19, 0x1f, 0x28, 0xfe, 0x1f, 0x70, 0xab, 0x88, 0xf5, 0x08, 0x70, 0xfc, - 0x0f, 0x25, 0x98, 0xdf, 0xf4, 0x88, 0x8f, 0xf9, 0xfd, 0x75, 0x44, 0x88, 0x37, 0x0e, 0x03, 0x4e, - 0x0d, 0x78, 0x1e, 0x91, 0x4a, 0xf9, 0xa5, 0x66, 0x42, 0x84, 0xe8, 0x8f, 0x19, 0x7a, 0x72, 0x94, - 0xa1, 0xcd, 0x45, 0xb8, 0x91, 0xd2, 0x50, 0x19, 0xf3, 0xaf, 0x25, 0x58, 0x4e, 0xf4, 0xec, 0xfb, - 0x0c, 0x53, 0xdf, 0xfe, 0x09, 0xd7, 0x90, 0x8b, 0x75, 0x4c, 0xfe, 0x0b, 0x58, 0xc7, 0x2a, 0xac, - 0x14, 0x2c, 0x41, 0x63, 0xda, 0xdc, 0x1e, 0x6f, 0xc7, 0x8d, 0x69, 0x67, 0x99, 0x2a, 0x81, 0xef, - 0xb8, 0x40, 0x5f, 0x1c, 0x9c, 0x63, 0x13, 0x28, 0x6e, 0x50, 0xec, 0xd9, 0xcc, 0x7d, 0x8b, 0xe5, - 0xb5, 0xad, 0x5e, 0x2d, 0x21, 0x91, 0x5f, 0x62, 0x52, 0xab, 0xb4, 0x64, 0xa5, 0xd5, 0x2f, 0x4b, - 0x3c, 0xf9, 0x1a, 0x78, 0xae, 0x33, 0x5e, 0x78, 0x1f, 0x7d, 0x0c, 0x65, 0xb9, 0x29, 0x23, 0x20, - 0x2a, 0x35, 0xc2, 0x5c, 0x81, 0x9b, 0xb9, 0x3a, 0x28, 0x1d, 0x5f, 0xc1, 0xd2, 0xe1, 0x80, 0xb9, - 0x7d, 0x11, 0x73, 0xe3, 0xdb, 0xac, 0x65, 0x30, 0xf2, 0xd8, 0x4a, 0xa1, 0x4f, 0xfe, 0x7e, 0x4b, - 0xd4, 0x52, 0xc3, 0x62, 0x98, 0x2c, 0x42, 0xa3, 0xaf, 0xa1, 0x91, 0xae, 0x03, 0xa3, 0xd5, 0xac, - 0xb4, 0x44, 0xd9, 0xd9, 0xb8, 0x5d, 0x3c, 0x40, 0xad, 0xb0, 0xfc, 0x8f, 0xef, 0x1f, 0x4c, 0x54, - 0x27, 0xd0, 0x37, 0x61, 0xfd, 0x36, 0x56, 0xdc, 0x45, 0xf1, 0xe9, 0xb9, 0xd5, 0x64, 0xe3, 0xce, - 0x88, 0x11, 0x09, 0x09, 0x25, 0xf4, 0x1c, 0x40, 0x57, 0x6b, 0xd1, 0x52, 0x72, 0x62, 0xac, 0x6a, - 0x6c, 0x18, 0x79, 0x5d, 0x29, 0x66, 0x5f, 0xc2, 0xb5, 0x64, 0xb1, 0x15, 0xad, 0x44, 0xef, 0xc1, - 0xbc, 0xe2, 0xaf, 0x71, 0xab, 0xa8, 0x3b, 0xc5, 0xf8, 0x6b, 0x85, 0xf8, 0xc6, 0xca, 0xaa, 0xda, - 0xcc, 0x05, 0x55, 0x5c, 0x6d, 0xe6, 0xc2, 0x8a, 0x6c, 0x4c, 0xef, 0x64, 0x9d, 0x53, 0xeb, 0x9d, - 0x5b, 0x52, 0xd5, 0x7a, 0xe7, 0x97, 0x47, 0x23, 0xc6, 0x0e, 0xa0, 0x6c, 0x7d, 0x12, 0x45, 0xdb, - 0x53, 0x58, 0x2e, 0x35, 0xcc, 0x51, 0x43, 0x52, 0x42, 0x0e, 0x60, 0x26, 0x56, 0xa4, 0x43, 0xd1, - 0x46, 0x65, 0x4b, 0x9f, 0xc6, 0xcd, 0xdc, 0xbe, 0xac, 0xb1, 0xd3, 0x49, 0x97, 0x36, 0x76, 0x41, - 0xdd, 0x4f, 0x1b, 0xbb, 0xb0, 0x86, 0x17, 0xb2, 0x7f, 0x09, 0xa0, 0x2b, 0x55, 0xda, 0xe3, 0x32, - 0x45, 0x34, 0xed, 0x71, 0xd9, 0xc2, 0x56, 0xc8, 0xec, 0xb1, 0xd0, 0x36, 0x5d, 0x79, 0xd2, 0xda, - 0x16, 0x14, 0xba, 0xb4, 0xb6, 0x45, 0x45, 0xab, 0x78, 0x04, 0x66, 0x4a, 0x39, 0x3a, 0x02, 0x8b, - 0x0a, 0x58, 0x3a, 0x02, 0x0b, 0xeb, 0x40, 0x91, 0x3d, 0xfe, 0x0b, 0xa6, 0x76, 0x02, 0xe7, 0x0c, - 0xcd, 0x45, 0x53, 0x74, 0x15, 0xc8, 0x98, 0x4f, 0x12, 0x53, 0x53, 0xb7, 0xa1, 0x1a, 0x16, 0x42, - 0xd0, 0x62, 0xc2, 0xdb, 0x75, 0x51, 0xc7, 0x68, 0x66, 0x3b, 0x52, 0x6c, 0x4e, 0xe0, 0x6a, 0xa2, - 0x8a, 0x81, 0x96, 0x23, 0xa9, 0x39, 0xc5, 0x14, 0x63, 0xa5, 0xa0, 0x37, 0x65, 0xb9, 0xe7, 0x00, - 0xba, 0xba, 0xa0, 0xf7, 0x39, 0x53, 0x01, 0xd1, 0xfb, 0x9c, 0x53, 0x8c, 0x88, 0x05, 0x52, 0xb6, - 0x40, 0xa0, 0x03, 0xa9, 0xb0, 0x60, 0xa1, 0x03, 0xa9, 0xb8, 0xbe, 0x10, 0x69, 0x2c, 0x84, 0xa4, - 0x21, 0xfd, 0xb8, 0x90, 0x82, 0x12, 0x43, 0x5c, 0x48, 0x51, 0x45, 0x20, 0x12, 0x42, 0xb3, 0xb5, - 0x73, 0x05, 0xc5, 0xa3, 0xfb, 0x45, 0x31, 0x94, 0xac, 0x0c, 0x18, 0x1f, 0xfe, 0xe8, 0xb8, 0x94, - 0xf5, 0x8e, 0xa1, 0x1e, 0x87, 0xe2, 0xd1, 0xcd, 0x24, 0x83, 0x04, 0x66, 0x69, 0x2c, 0xe7, 0x77, - 0x26, 0x97, 0xf1, 0xb8, 0x84, 0x7e, 0x0e, 0x46, 0x31, 0x1a, 0x89, 0x3e, 0x1a, 0xa5, 0x63, 0x52, - 0xe0, 0xc7, 0xef, 0x33, 0x34, 0xb9, 0xa2, 0x07, 0x25, 0xb4, 0x07, 0xb5, 0x08, 0x21, 0x47, 0xcd, - 0x22, 0x7c, 0xdf, 0x58, 0xca, 0xe9, 0x49, 0x59, 0xe7, 0x0b, 0xa8, 0xc7, 0x11, 0x6f, 0x6d, 0x9d, - 0x1c, 0xb0, 0x5d, 0x5b, 0x27, 0x17, 0x24, 0x8f, 0x1f, 0xc9, 0x1a, 0x33, 0x8d, 0x1d, 0xc9, 0x19, - 0x60, 0x36, 0x76, 0x24, 0x67, 0x41, 0xd6, 0xc8, 0x69, 0xda, 0xe2, 0xf7, 0x87, 0x24, 0xd0, 0x89, - 0xe2, 0xff, 0x1f, 0xe4, 0x22, 0xab, 0xfa, 0x14, 0x2a, 0x44, 0x49, 0x63, 0xfb, 0xf9, 0x0d, 0xcc, - 0x66, 0x90, 0x4b, 0x2d, 0xa3, 0x08, 0x2a, 0xd5, 0x32, 0x0a, 0x61, 0xcf, 0x68, 0x15, 0x1b, 0x50, - 0x51, 0x3f, 0x2d, 0xa1, 0x85, 0x68, 0x56, 0xe2, 0x8f, 0x28, 0x63, 0x31, 0x43, 0x4f, 0x59, 0xf6, - 0x08, 0x66, 0x62, 0xb0, 0x26, 0x8a, 0xdf, 0x11, 0x29, 0xb8, 0x52, 0x5b, 0x36, 0x07, 0x07, 0x8d, - 0xad, 0xfb, 0x17, 0x3c, 0xbb, 0x19, 0x01, 0x32, 0xa2, 0x4f, 0x46, 0xf9, 0x67, 0x5a, 0xe8, 0xc3, - 0xf7, 0x1b, 0x9c, 0x5a, 0xd5, 0xff, 0xc3, 0xd5, 0x04, 0x60, 0xa6, 0x4f, 0xe0, 0x3c, 0x54, 0x53, - 0x9f, 0xc0, 0xb9, 0x28, 0x5b, 0x6c, 0x6d, 0x67, 0x30, 0x9f, 0x87, 0x63, 0xa0, 0xbb, 0x3a, 0x2a, - 0x0a, 0x11, 0x19, 0xe3, 0xde, 0xe8, 0x41, 0x19, 0x61, 0x6d, 0x98, 0xcd, 0x80, 0x42, 0xda, 0x81, - 0x8a, 0x50, 0x2c, 0xed, 0x40, 0x85, 0x88, 0x52, 0x4c, 0x06, 0x06, 0x94, 0x2d, 0x0d, 0xa1, 0xd8, - 0x7b, 0xb7, 0xa0, 0x42, 0xa5, 0x8f, 0xe8, 0x11, 0x95, 0x25, 0x7d, 0xb8, 0xb4, 0x61, 0x36, 0x53, - 0x0d, 0xd2, 0x4b, 0x29, 0x2a, 0x3f, 0xe9, 0xa5, 0x14, 0x96, 0x92, 0x62, 0x4b, 0x79, 0x0d, 0xd7, - 0x53, 0xe8, 0x05, 0xba, 0x95, 0x78, 0x35, 0x64, 0xc0, 0x16, 0x63, 0xb5, 0xb0, 0x3f, 0xe5, 0x4f, - 0x04, 0x16, 0xf2, 0x31, 0x0a, 0xf4, 0x41, 0xcc, 0x75, 0x8a, 0xe1, 0x11, 0xe3, 0xfe, 0x8f, 0x0d, - 0x4b, 0x85, 0xf6, 0x09, 0x5c, 0x4d, 0xa4, 0xd7, 0xda, 0x81, 0xf3, 0x40, 0x0f, 0xed, 0xc0, 0xf9, - 0x80, 0x43, 0xb8, 0x0c, 0x2f, 0x85, 0x48, 0x84, 0x49, 0x3b, 0xba, 0x97, 0x3b, 0x3f, 0x05, 0x4b, - 0x18, 0x1f, 0xfc, 0xc8, 0xa8, 0xec, 0xbb, 0x37, 0x9d, 0xac, 0xc7, 0x73, 0xb9, 0x5c, 0x6c, 0x20, - 0x9e, 0xcb, 0x15, 0xe4, 0xf9, 0x09, 0xf6, 0xc9, 0xac, 0x3b, 0xce, 0x3e, 0x17, 0x09, 0x88, 0xb3, - 0x2f, 0x48, 0xd8, 0x43, 0xf6, 0x5d, 0x98, 0xcb, 0xc9, 0x99, 0x51, 0xcc, 0xef, 0x8b, 0x92, 0x7a, - 0xe3, 0xee, 0xc8, 0x31, 0xd9, 0x97, 0x58, 0x36, 0x4b, 0xd6, 0x11, 0x58, 0x98, 0x98, 0xeb, 0x08, - 0x2c, 0x4e, 0xb2, 0x43, 0x21, 0x1b, 0x8f, 0x5f, 0xf3, 0xc1, 0x9e, 0xdd, 0x5e, 0x73, 0x48, 0xff, - 0x91, 0xfc, 0xfc, 0x94, 0xd0, 0xd3, 0x47, 0x92, 0xc5, 0x23, 0xf1, 0x67, 0xf7, 0xa3, 0x53, 0xa2, - 0xda, 0x83, 0x76, 0xbb, 0x2c, 0x48, 0x4f, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0x76, 0x18, 0xb7, - 0x12, 0x2a, 0x2e, 0x00, 0x00, + // 3055 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4b, 0x6f, 0x1c, 0xc7, + 0xb5, 0xd6, 0xf0, 0x31, 0x8f, 0xc3, 0x91, 0x34, 0x2c, 0x52, 0xe4, 0xb0, 0x45, 0x8a, 0x52, 0x4b, + 0x96, 0x65, 0x5b, 0xa6, 0x64, 0xe9, 0x02, 0xd7, 0xf7, 0x5e, 0x5c, 0x5c, 0xf0, 0x4d, 0xea, 0x41, + 0xd2, 0x4d, 0xea, 0x1a, 0x16, 0x60, 0x8c, 0x7b, 0x7a, 0x6a, 0x38, 0x1d, 0xf6, 0x74, 0x8d, 0xaa, + 0x6b, 0x44, 0xd1, 0x40, 0x16, 0x09, 0x90, 0xad, 0x81, 0x00, 0x41, 0x9c, 0x65, 0xd6, 0xf9, 0x05, + 0xd9, 0x04, 0x41, 0x36, 0xf9, 0x0f, 0x5e, 0x66, 0x9b, 0x9f, 0x90, 0x55, 0x50, 0x8f, 0xee, 0xea, + 0xe7, 0x58, 0x01, 0x07, 0xce, 0xae, 0xeb, 0x9c, 0xaa, 0x73, 0x4e, 0x9d, 0x3a, 0xf5, 0x38, 0xdf, + 0x69, 0x68, 0x52, 0x3c, 0x20, 0x81, 0xcb, 0x08, 0xbd, 0xf8, 0x34, 0xc0, 0xf4, 0xad, 0xeb, 0xe0, + 0xb5, 0x01, 0x25, 0x8c, 0xa0, 0xf2, 0xa9, 0xcb, 0x6c, 0xef, 0xc2, 0x00, 0xcf, 0xf5, 0x99, 0xa4, + 0x19, 0xf5, 0xa0, 0x67, 0x53, 0xdc, 0x91, 0x2d, 0xf3, 0x18, 0x16, 0xad, 0x68, 0xf4, 0xf6, 0x3b, + 0x37, 0x60, 0x81, 0x85, 0xdf, 0x0c, 0x71, 0xc0, 0xd0, 0xe7, 0x00, 0x5a, 0x70, 0xb3, 0x74, 0xbb, + 0xf4, 0x60, 0xe6, 0x09, 0x5a, 0x93, 0x12, 0xd7, 0xf4, 0xa0, 0x8d, 0xa9, 0xdf, 0xfd, 0xf5, 0x61, + 0xc9, 0x8a, 0xf5, 0x35, 0x9f, 0x40, 0x33, 0x2b, 0x34, 0x18, 0x10, 0x3f, 0xc0, 0x68, 0x01, 0xca, + 0x58, 0x50, 0x84, 0xc4, 0xaa, 0xa5, 0x5a, 0xe6, 0x89, 0x18, 0x63, 0x3b, 0x67, 0xfb, 0xbe, 0x43, + 0x71, 0x1f, 0xfb, 0xcc, 0xf6, 0x2e, 0x6f, 0xc9, 0x4d, 0x58, 0xca, 0x91, 0x2a, 0x4d, 0x31, 0x29, + 0xcc, 0x4a, 0xe6, 0xce, 0xd0, 0xbb, 0xbc, 0x2e, 0x74, 0x17, 0xae, 0x3a, 0x14, 0xdb, 0x0c, 0xb7, + 0xda, 0x2e, 0xeb, 0xdb, 0x83, 0xe6, 0x84, 0x98, 0x60, 0x5d, 0x12, 0x37, 0x04, 0xcd, 0x9c, 0x07, + 0x14, 0xd7, 0xa9, 0x2c, 0x79, 0x0b, 0x37, 0x76, 0x6d, 0xda, 0xb6, 0x4f, 0xf1, 0x26, 0xf1, 0x3c, + 0xec, 0xb0, 0x9f, 0xc8, 0x9a, 0x26, 0x2c, 0xa4, 0xf5, 0x2a, 0x8b, 0x8e, 0x61, 0xf1, 0x4b, 0xea, + 0x32, 0xbc, 0x49, 0xfa, 0x7d, 0x97, 0xed, 0x52, 0x7b, 0xd0, 0xbb, 0xfc, 0x6a, 0x18, 0xd0, 0xcc, + 0x0a, 0x55, 0x0a, 0x9f, 0xc1, 0xb5, 0x4d, 0x0f, 0xdb, 0xfe, 0x70, 0x70, 0x79, 0x3d, 0xb3, 0x70, + 0x3d, 0x92, 0xa5, 0xc4, 0x7f, 0x01, 0x37, 0xf4, 0x90, 0x63, 0xf7, 0x5b, 0x7c, 0x79, 0x2d, 0x0f, + 0x61, 0x21, 0x2d, 0x52, 0xc5, 0x38, 0x82, 0xa9, 0xc0, 0xfd, 0x16, 0x0b, 0x69, 0x93, 0x96, 0xf8, + 0x36, 0xdf, 0xc0, 0xd2, 0xfa, 0x60, 0xe0, 0x5d, 0xec, 0xba, 0xcc, 0x66, 0x8c, 0xba, 0xed, 0x21, + 0xc3, 0x97, 0xdf, 0x6a, 0xc8, 0x80, 0x2a, 0xc5, 0x6f, 0xdd, 0xc0, 0x25, 0xbe, 0x58, 0xe1, 0xba, + 0x15, 0xb5, 0xcd, 0x65, 0x30, 0xf2, 0x54, 0x2a, 0x8f, 0xfc, 0x79, 0x02, 0xd0, 0x0e, 0x66, 0x4e, + 0xcf, 0xc2, 0x7d, 0xc2, 0x2e, 0xef, 0x0f, 0xbe, 0xb3, 0xa9, 0x10, 0x25, 0x0c, 0xa9, 0x59, 0xaa, + 0x85, 0xe6, 0x61, 0xba, 0x4b, 0xa8, 0x83, 0x9b, 0x93, 0x22, 0x02, 0x65, 0x03, 0x2d, 0x42, 0xc5, + 0x27, 0x2d, 0x66, 0x9f, 0x06, 0xcd, 0x29, 0x79, 0x10, 0xf8, 0xe4, 0xc4, 0x3e, 0x0d, 0x50, 0x13, + 0x2a, 0xcc, 0xed, 0x63, 0x32, 0x64, 0xcd, 0xe9, 0xdb, 0xa5, 0x07, 0xd3, 0x56, 0xd8, 0xe4, 0x43, + 0x82, 0xa0, 0xd7, 0x3a, 0xc3, 0x17, 0xcd, 0xb2, 0xd4, 0x10, 0x04, 0xbd, 0xe7, 0xf8, 0x02, 0xad, + 0xc2, 0xcc, 0x99, 0x4f, 0xce, 0xfd, 0x56, 0x8f, 0xf0, 0x83, 0xa5, 0x22, 0x98, 0x20, 0x48, 0x7b, + 0x9c, 0x82, 0x96, 0xa0, 0xea, 0x93, 0xd6, 0x80, 0x0e, 0x7d, 0xdc, 0xac, 0x09, 0x6d, 0x15, 0x9f, + 0x1c, 0xf1, 0x26, 0x7a, 0x0a, 0x57, 0xa5, 0x9d, 0xad, 0x81, 0x4d, 0xed, 0x7e, 0xd0, 0x04, 0x31, + 0xe5, 0x6b, 0x7a, 0xca, 0xc2, 0x3b, 0x75, 0xd9, 0xe9, 0x48, 0xf4, 0x79, 0x36, 0x55, 0xad, 0x36, + 0x6a, 0xe6, 0x0d, 0x98, 0x4b, 0x38, 0x50, 0x6f, 0x9d, 0x4d, 0xb1, 0xc9, 0xb4, 0xb7, 0xc6, 0xb2, + 0x75, 0xb2, 0x42, 0x95, 0xc2, 0xbf, 0x4d, 0xc0, 0xec, 0x2e, 0x66, 0xeb, 0xd4, 0xe9, 0xb9, 0x6f, + 0xc7, 0xb0, 0x90, 0x37, 0xa1, 0xe6, 0x88, 0x1d, 0xda, 0x72, 0x3b, 0x6a, 0x2d, 0xab, 0x92, 0xb0, + 0xdf, 0xe1, 0xab, 0x3c, 0xa0, 0xb8, 0xeb, 0xbe, 0x13, 0xcb, 0x59, 0xb3, 0x54, 0x0b, 0x7d, 0x0e, + 0xe5, 0x2e, 0xa1, 0x7d, 0x9b, 0x89, 0xe5, 0xbc, 0xf6, 0xe4, 0x76, 0xa8, 0x2a, 0x63, 0xd9, 0xda, + 0x8e, 0xe8, 0x67, 0xa9, 0xfe, 0x7c, 0xc1, 0xf1, 0x3b, 0xc7, 0x1b, 0x76, 0x70, 0xb3, 0x7c, 0x7b, + 0xf2, 0x41, 0xdd, 0x0a, 0x9b, 0x9c, 0xe3, 0xfa, 0x92, 0x53, 0x95, 0x1c, 0xd5, 0x44, 0x0b, 0x30, + 0x35, 0xb0, 0x59, 0x4f, 0x44, 0x48, 0x7d, 0x63, 0xa2, 0x59, 0xb2, 0x44, 0x1b, 0x99, 0x50, 0x0f, + 0x86, 0xed, 0x8e, 0x4b, 0xb1, 0x23, 0xa6, 0x5d, 0x11, 0x5b, 0x22, 0x41, 0x33, 0x9f, 0x42, 0x59, + 0x5a, 0x80, 0x2a, 0x30, 0xf9, 0x7a, 0xff, 0xa8, 0x71, 0x85, 0x7f, 0x9c, 0xac, 0x5b, 0x8d, 0x12, + 0x02, 0x28, 0x9f, 0xac, 0x5b, 0xad, 0xdd, 0xd7, 0x8d, 0x09, 0x34, 0x03, 0x15, 0xfe, 0xbd, 0xf1, + 0xfa, 0x49, 0x63, 0xd2, 0x7c, 0x00, 0x28, 0x3e, 0x11, 0xbd, 0xd1, 0x3b, 0x36, 0xb3, 0x85, 0x77, + 0xeb, 0x96, 0xf8, 0xe6, 0xcb, 0xbf, 0x67, 0x07, 0x2f, 0x88, 0x63, 0x7b, 0x1b, 0xd4, 0xf6, 0x9d, + 0xde, 0x18, 0xb6, 0xb9, 0xf9, 0x18, 0x9a, 0x59, 0xa1, 0xca, 0x88, 0x79, 0x98, 0x7e, 0x6b, 0x7b, + 0x43, 0xac, 0x2e, 0x54, 0xd9, 0x30, 0x7f, 0x28, 0x41, 0x53, 0x44, 0xe7, 0x31, 0x19, 0x52, 0x07, + 0xcb, 0x51, 0x97, 0x8f, 0x8d, 0xff, 0x83, 0xd9, 0x40, 0x08, 0x6c, 0xc5, 0x04, 0x4c, 0x14, 0x09, + 0xb0, 0x1a, 0xb2, 0xb3, 0x95, 0xb8, 0x97, 0x94, 0x80, 0xb6, 0x30, 0x49, 0x84, 0x11, 0x5f, 0xa2, + 0x98, 0x99, 0x68, 0x05, 0x80, 0xd9, 0xf4, 0x14, 0xb3, 0x16, 0xc5, 0x5d, 0x11, 0x50, 0x75, 0xab, + 0x26, 0x29, 0x16, 0xee, 0x9a, 0x4f, 0x61, 0x29, 0x67, 0x6a, 0xfa, 0x81, 0x41, 0x71, 0x30, 0xf4, + 0x58, 0xf8, 0xc0, 0x90, 0x2d, 0x73, 0x17, 0x66, 0x76, 0x02, 0xe7, 0xec, 0xf2, 0x6b, 0x71, 0x0f, + 0xea, 0x52, 0x90, 0xf6, 0x3f, 0xa6, 0x94, 0x50, 0x15, 0x05, 0xb2, 0x61, 0xfe, 0xb1, 0x04, 0xd7, + 0xc5, 0x65, 0x67, 0xe1, 0xee, 0xe5, 0xdd, 0xde, 0x80, 0x49, 0xee, 0x09, 0x79, 0xc2, 0xf3, 0xcf, + 0xc4, 0xc1, 0x3f, 0x99, 0x3c, 0xf8, 0xd1, 0x1d, 0xa8, 0x13, 0xaf, 0xd3, 0x8a, 0xf8, 0xd2, 0x81, + 0x33, 0xc4, 0xeb, 0x58, 0x61, 0x97, 0xe8, 0x50, 0x9e, 0x8e, 0x1d, 0xca, 0xcf, 0xa6, 0xaa, 0xe5, + 0x46, 0xc5, 0x6c, 0x42, 0x43, 0x5b, 0x2e, 0x27, 0xf9, 0x6c, 0xaa, 0x5a, 0x6a, 0x4c, 0x98, 0x3e, + 0xcc, 0xef, 0xb8, 0x7e, 0xe7, 0x25, 0xa6, 0xa7, 0x78, 0xc3, 0x0e, 0xc6, 0x70, 0xd6, 0x2c, 0x43, + 0x2d, 0x34, 0x33, 0x68, 0x4e, 0x88, 0x4d, 0xae, 0x09, 0xe6, 0x27, 0x70, 0x23, 0xa5, 0x4f, 0x6f, + 0xbc, 0xb6, 0x1d, 0xc8, 0x90, 0xaf, 0x59, 0xe2, 0xdb, 0xfc, 0xae, 0x04, 0xb3, 0xf2, 0x8c, 0xdc, + 0x21, 0xf4, 0xec, 0xdf, 0x1f, 0xea, 0xfc, 0xad, 0x17, 0xb7, 0x27, 0x7a, 0x75, 0x2e, 0xed, 0x07, + 0x16, 0xe6, 0x26, 0xef, 0xfb, 0x47, 0x94, 0x9c, 0x52, 0x1c, 0x04, 0x63, 0x39, 0xb4, 0xa9, 0x10, + 0x1a, 0x3b, 0xb4, 0x25, 0x61, 0xbf, 0x63, 0xfe, 0x2f, 0x18, 0x79, 0x3a, 0x95, 0x33, 0x57, 0x61, + 0xc6, 0xf5, 0x5b, 0x03, 0x45, 0x56, 0xdb, 0x06, 0xdc, 0xa8, 0xa3, 0x34, 0xf9, 0xf8, 0xcd, 0xd0, + 0x0e, 0x7a, 0x63, 0x36, 0x39, 0x10, 0x42, 0x63, 0x26, 0x4b, 0x42, 0x68, 0x72, 0x56, 0xe7, 0xfb, + 0x9a, 0xec, 0xc1, 0xad, 0xf4, 0x7d, 0xb9, 0x43, 0x49, 0xff, 0x95, 0xf5, 0x62, 0x2c, 0x9b, 0x71, + 0x48, 0x3d, 0x65, 0x31, 0xff, 0x34, 0xef, 0xc0, 0x6a, 0xa1, 0x36, 0xb5, 0xec, 0x87, 0x30, 0x27, + 0xbb, 0x6c, 0x0c, 0xfd, 0x8e, 0x37, 0x86, 0xe7, 0xe7, 0xc7, 0x30, 0x9f, 0x14, 0x38, 0xe2, 0x4e, + 0xfa, 0x6e, 0x02, 0x1a, 0xc7, 0x98, 0x6d, 0x12, 0xbf, 0xeb, 0x9e, 0x5e, 0xde, 0x01, 0x9f, 0x43, + 0x05, 0xfb, 0x8c, 0xba, 0x58, 0x6e, 0xd9, 0x99, 0x27, 0xb7, 0xc2, 0x61, 0x69, 0x25, 0x6b, 0xdb, + 0x3e, 0xa3, 0x17, 0x56, 0xd8, 0xdd, 0xf8, 0x55, 0x09, 0xa6, 0x05, 0x89, 0x3b, 0x91, 0x3f, 0xe4, + 0xe4, 0x06, 0xe6, 0x9f, 0x68, 0x05, 0x6a, 0xe2, 0xea, 0x6a, 0x05, 0x8c, 0x4a, 0xe7, 0xee, 0x5d, + 0xb1, 0xaa, 0x82, 0x74, 0xcc, 0x28, 0xba, 0x03, 0x33, 0x92, 0xed, 0xfa, 0xec, 0xe9, 0x13, 0x71, + 0xe6, 0x4d, 0xef, 0x5d, 0xb1, 0x40, 0x10, 0xf7, 0x39, 0x0d, 0xad, 0x82, 0x6c, 0xb5, 0xda, 0x84, + 0x78, 0xf2, 0x59, 0xb9, 0x77, 0xc5, 0x92, 0x52, 0x37, 0x08, 0xf1, 0x36, 0x2a, 0xea, 0xaa, 0x34, + 0xe7, 0x60, 0x36, 0x66, 0xaa, 0x5a, 0x22, 0x07, 0xe6, 0xb6, 0xb0, 0x87, 0x79, 0x7e, 0x32, 0x1e, + 0x3f, 0x21, 0x98, 0x3a, 0xc3, 0x17, 0xd2, 0x49, 0x35, 0x4b, 0x7c, 0x9b, 0x0b, 0x30, 0x9f, 0x54, + 0xa2, 0x94, 0xbb, 0x3c, 0x53, 0x0d, 0x18, 0xa1, 0x78, 0x73, 0x18, 0x30, 0xd2, 0xdf, 0x23, 0xe4, + 0x2c, 0x18, 0x8b, 0x09, 0x22, 0x1a, 0x26, 0x62, 0xd1, 0xb0, 0x0c, 0x46, 0x9e, 0x2a, 0x65, 0xc8, + 0x09, 0x34, 0x37, 0x6c, 0xe7, 0x6c, 0x38, 0x18, 0xa7, 0x1d, 0xe6, 0x23, 0x58, 0xca, 0x91, 0x3a, + 0x22, 0x64, 0xdf, 0xc0, 0x9d, 0xbc, 0x2d, 0x35, 0xa6, 0xdd, 0x93, 0xeb, 0x97, 0x7b, 0x60, 0x8e, + 0x52, 0xa9, 0xfc, 0x73, 0x00, 0x88, 0xdf, 0x49, 0x2f, 0x5c, 0x07, 0xfb, 0x63, 0xb8, 0x01, 0xcd, + 0x4d, 0x98, 0x4b, 0xc8, 0x53, 0x3e, 0x79, 0x08, 0xc8, 0x93, 0xa4, 0x56, 0xd0, 0x23, 0x94, 0xb5, + 0x7c, 0xbb, 0x1f, 0xde, 0x77, 0x0d, 0xc5, 0x39, 0xe6, 0x8c, 0x03, 0xbb, 0x2f, 0x16, 0x6d, 0x17, + 0xb3, 0x7d, 0xbf, 0x4b, 0xd6, 0xc7, 0x97, 0x5c, 0x9a, 0xff, 0x03, 0x4b, 0x39, 0x52, 0x95, 0x81, + 0xb7, 0x00, 0x74, 0x56, 0xa9, 0x96, 0x2e, 0x46, 0xe1, 0x26, 0x6d, 0xda, 0x9e, 0x33, 0xf4, 0x6c, + 0x86, 0x37, 0x7b, 0xd8, 0x39, 0x0b, 0x86, 0xfd, 0xcb, 0x9b, 0xf4, 0x9f, 0xb0, 0x94, 0x23, 0x55, + 0x99, 0x64, 0x40, 0xd5, 0x51, 0x34, 0xe5, 0xa9, 0xa8, 0xcd, 0x97, 0x6d, 0x17, 0xb3, 0x63, 0xdf, + 0x1e, 0x04, 0x3d, 0x72, 0x79, 0x7c, 0xc5, 0xfc, 0x08, 0xe6, 0x12, 0xf2, 0x46, 0x84, 0xf2, 0xf7, + 0x25, 0xb8, 0x9b, 0x17, 0x58, 0x63, 0x33, 0x86, 0xe7, 0xb7, 0x3d, 0xc6, 0x06, 0x2d, 0x7d, 0x2d, + 0x55, 0x78, 0xfb, 0x15, 0xf5, 0xf8, 0x25, 0x2b, 0x58, 0xf6, 0x90, 0xf5, 0x54, 0xca, 0x26, 0xfa, + 0xae, 0x0f, 0x59, 0xcf, 0xbc, 0x0f, 0xf7, 0x46, 0x1b, 0xa6, 0x62, 0xfe, 0xb7, 0x25, 0x98, 0xdf, + 0xc5, 0xcc, 0xb2, 0xcf, 0x37, 0x7b, 0xb6, 0x7f, 0x3a, 0x0e, 0xe0, 0xe2, 0x2e, 0x5c, 0xed, 0x52, + 0xd2, 0x6f, 0x25, 0xd0, 0x8b, 0x9a, 0x55, 0xe7, 0xc4, 0xe8, 0x95, 0xba, 0x0a, 0x33, 0x8c, 0xb4, + 0x12, 0xef, 0xdc, 0x9a, 0x05, 0x8c, 0x84, 0x1d, 0xcc, 0x3f, 0x4d, 0xc1, 0x8d, 0x94, 0x61, 0x6a, + 0x21, 0xf6, 0x60, 0x86, 0xda, 0xe7, 0x2d, 0x47, 0x92, 0x9b, 0x25, 0x71, 0x4f, 0x7d, 0x18, 0x4b, + 0x4a, 0xb3, 0x63, 0xd6, 0x22, 0x92, 0x05, 0x34, 0xe2, 0x1a, 0x3f, 0x4c, 0x42, 0x2d, 0xe2, 0xa0, + 0x45, 0xa8, 0xb4, 0x3d, 0xd2, 0xe6, 0x4f, 0x16, 0x19, 0x62, 0x65, 0xde, 0xdc, 0xef, 0x44, 0xa0, + 0xcf, 0x84, 0x06, 0x7d, 0xd0, 0x0a, 0x54, 0x7d, 0x7c, 0xde, 0x12, 0xa9, 0xaa, 0x30, 0x5e, 0xa4, + 0xaa, 0x15, 0x1f, 0x9f, 0x1f, 0xf1, 0x6c, 0x75, 0x05, 0xaa, 0xfc, 0x9d, 0x2e, 0xd8, 0x53, 0x9a, + 0x4d, 0xbc, 0x8e, 0x60, 0x1f, 0x42, 0x8d, 0x0c, 0x30, 0xb5, 0x19, 0x9f, 0xfb, 0xb4, 0xc8, 0xaa, + 0x3f, 0x7b, 0xcf, 0x09, 0xac, 0x1d, 0x86, 0x03, 0x2d, 0x2d, 0x83, 0xfb, 0x9c, 0xfb, 0x44, 0x0b, + 0x95, 0x30, 0x4a, 0x9d, 0xda, 0xe7, 0x51, 0x7f, 0x1e, 0x4b, 0xdc, 0xa8, 0x3e, 0xe9, 0x60, 0x91, + 0x3e, 0x4f, 0x0b, 0x83, 0x5e, 0x92, 0x0e, 0x16, 0x30, 0x0a, 0x3e, 0x97, 0xac, 0xaa, 0x64, 0xf9, + 0xf8, 0x5c, 0xb0, 0xee, 0xc1, 0xb5, 0x70, 0xa6, 0xad, 0xf6, 0x05, 0x3f, 0x11, 0x6a, 0x32, 0xaf, + 0x53, 0x73, 0xdd, 0xe0, 0x34, 0xde, 0x2b, 0x9c, 0xb0, 0xea, 0x05, 0xb2, 0x97, 0x9a, 0xb2, 0xe8, + 0x65, 0xba, 0x50, 0xd3, 0xe6, 0xcc, 0x40, 0xe5, 0xd5, 0xc1, 0xf3, 0x83, 0xc3, 0x2f, 0x0f, 0x1a, + 0x57, 0x50, 0x0d, 0xa6, 0xd7, 0xb7, 0xb6, 0xb6, 0xb7, 0x64, 0xa6, 0xbe, 0x79, 0x78, 0xb4, 0xbf, + 0xbd, 0x25, 0x33, 0xf5, 0xad, 0xed, 0x17, 0xdb, 0x27, 0xdb, 0x5b, 0x8d, 0x49, 0x54, 0x87, 0xea, + 0xcb, 0xc3, 0xad, 0xfd, 0x1d, 0xce, 0x9a, 0xe2, 0x2c, 0x6b, 0xfb, 0x60, 0xfd, 0xe5, 0xf6, 0x56, + 0x63, 0x1a, 0x35, 0xa0, 0x7e, 0xf2, 0xd5, 0xd1, 0x76, 0x6b, 0x73, 0x6f, 0xfd, 0x60, 0x77, 0x7b, + 0xab, 0x51, 0x36, 0x7f, 0x53, 0x82, 0xe6, 0x31, 0xb6, 0xa9, 0xd3, 0xdb, 0x71, 0x3d, 0x1c, 0x6c, + 0x5c, 0xf0, 0xd3, 0xf4, 0xf2, 0xc1, 0x3d, 0x0f, 0xd3, 0x6f, 0x86, 0x58, 0xa5, 0x0b, 0x35, 0x4b, + 0x36, 0xc2, 0x24, 0x6e, 0x52, 0x27, 0x71, 0x0b, 0x50, 0xee, 0xba, 0x1e, 0xc3, 0x54, 0x2e, 0xbf, + 0xa5, 0x5a, 0xe6, 0x67, 0xb0, 0x94, 0x63, 0x95, 0xce, 0x37, 0xbb, 0x9c, 0x2c, 0x62, 0xba, 0x6e, + 0xc9, 0x86, 0xf9, 0x87, 0x12, 0xdc, 0x4c, 0x8c, 0xd9, 0x24, 0x3e, 0xc3, 0x3e, 0xfb, 0xe9, 0x26, + 0xf3, 0x11, 0x34, 0x9c, 0xde, 0xd0, 0x3f, 0xc3, 0x3c, 0xf3, 0x94, 0xb6, 0x2a, 0x68, 0xef, 0xba, + 0xa2, 0x47, 0xe7, 0xc9, 0x05, 0x2c, 0xe7, 0xdb, 0xaa, 0xa6, 0xd8, 0x84, 0x4a, 0xdf, 0x66, 0x4e, + 0x2f, 0x9a, 0x64, 0xd8, 0x44, 0x2b, 0x00, 0xe2, 0xb3, 0x15, 0xbb, 0xbd, 0x6b, 0x82, 0xb2, 0x65, + 0x33, 0x1b, 0xdd, 0x86, 0x3a, 0xf6, 0x3b, 0x2d, 0xd2, 0x6d, 0x09, 0x9a, 0x82, 0x1c, 0x01, 0xfb, + 0x9d, 0xc3, 0xee, 0x4b, 0x4e, 0x31, 0x7f, 0x5d, 0x82, 0xb2, 0x04, 0xec, 0xc2, 0x77, 0x7c, 0x29, + 0x7a, 0xc7, 0xf3, 0x3d, 0x2c, 0xae, 0x59, 0x39, 0x53, 0xf1, 0x8d, 0xfe, 0x1b, 0x96, 0xa2, 0x03, + 0x94, 0x50, 0xf7, 0x5b, 0x11, 0x96, 0xad, 0x1e, 0xb6, 0x3b, 0x98, 0xaa, 0x13, 0x69, 0x31, 0x3c, + 0x50, 0x23, 0xfe, 0x9e, 0x60, 0xa3, 0x0f, 0xe0, 0x5a, 0xdf, 0xa5, 0x94, 0xd0, 0x16, 0xc5, 0xdd, + 0xbe, 0x3d, 0x08, 0x9a, 0x53, 0xe2, 0x29, 0x78, 0x55, 0x52, 0x2d, 0x49, 0xe4, 0x51, 0xb8, 0x20, + 0x00, 0x8d, 0xbd, 0x93, 0x93, 0xa3, 0x71, 0xc1, 0xb1, 0xf7, 0x13, 0x70, 0x6c, 0x16, 0xd1, 0x0c, + 0xe1, 0xd9, 0x18, 0xde, 0x3a, 0x99, 0xc0, 0x5b, 0xcd, 0x25, 0x58, 0xcc, 0x58, 0xa5, 0x16, 0xf0, + 0x2b, 0x58, 0xd9, 0xc5, 0xec, 0xb0, 0xfd, 0x33, 0xec, 0xb0, 0xad, 0x10, 0x59, 0x1b, 0x0f, 0xac, + 0xfe, 0x1f, 0x70, 0xab, 0x48, 0xf4, 0x08, 0x78, 0xfd, 0xf7, 0x25, 0x98, 0xdf, 0xf4, 0x88, 0x8f, + 0xf9, 0xfd, 0x75, 0x44, 0x88, 0x37, 0x0e, 0x07, 0x4e, 0x0d, 0x78, 0x1e, 0x91, 0x4a, 0xf9, 0xa5, + 0x65, 0x42, 0x85, 0xe0, 0xc7, 0x1c, 0x3d, 0x39, 0xca, 0xd1, 0xe6, 0x22, 0xdc, 0x48, 0x59, 0xa8, + 0x9c, 0xf9, 0x97, 0x12, 0x2c, 0x27, 0x38, 0xfb, 0x3e, 0xc3, 0xd4, 0xb7, 0x7f, 0xc2, 0x39, 0xe4, + 0x62, 0x1d, 0x93, 0xff, 0x02, 0xd6, 0xb1, 0x0a, 0x2b, 0x05, 0x53, 0xd0, 0xa8, 0x38, 0xf7, 0xc7, + 0xdb, 0x71, 0xa3, 0xe2, 0x59, 0xa1, 0x4a, 0xe1, 0x3b, 0xae, 0xd0, 0x17, 0x07, 0xe7, 0xd8, 0x14, + 0x8a, 0x1b, 0x14, 0x7b, 0x36, 0x73, 0xdf, 0x62, 0x79, 0x6d, 0xab, 0x57, 0x4b, 0x48, 0xe4, 0x97, + 0x98, 0xb4, 0x2a, 0xad, 0x59, 0x59, 0xf5, 0xcb, 0x12, 0x4f, 0xbe, 0x06, 0x9e, 0xeb, 0x8c, 0xb7, + 0x40, 0x80, 0x3e, 0x86, 0xb2, 0x5c, 0x94, 0x11, 0x10, 0x95, 0xea, 0x61, 0xae, 0xc0, 0xcd, 0x5c, + 0x1b, 0x94, 0x8d, 0xaf, 0x60, 0xe9, 0x70, 0xc0, 0xdc, 0xbe, 0xd8, 0x73, 0xe3, 0x5b, 0xac, 0x65, + 0x30, 0xf2, 0xc4, 0x4a, 0xa5, 0x4f, 0xfe, 0x7e, 0x4b, 0x54, 0x63, 0xc3, 0x72, 0x9a, 0x2c, 0x63, + 0xa3, 0xaf, 0xa1, 0x91, 0xae, 0x24, 0xa3, 0xd5, 0xac, 0xb6, 0x44, 0xe1, 0xda, 0xb8, 0x5d, 0xdc, + 0x41, 0xcd, 0xb0, 0xfc, 0x8f, 0xef, 0x1f, 0x4c, 0x54, 0x27, 0xd0, 0x37, 0x61, 0x05, 0x38, 0x56, + 0x1e, 0x46, 0xf1, 0xe1, 0xb9, 0xf5, 0x68, 0xe3, 0xce, 0x88, 0x1e, 0x09, 0x0d, 0x25, 0xf4, 0x1c, + 0x40, 0xd7, 0x7b, 0xd1, 0x52, 0x72, 0x60, 0xac, 0xee, 0x6c, 0x18, 0x79, 0xac, 0x94, 0xb0, 0x2f, + 0xe1, 0x5a, 0xb2, 0x5c, 0x8b, 0x56, 0xa2, 0xf7, 0x60, 0x5e, 0xf9, 0xd8, 0xb8, 0x55, 0xc4, 0x4e, + 0x09, 0xfe, 0x5a, 0x21, 0xbe, 0xb1, 0xc2, 0xac, 0x76, 0x73, 0x41, 0x1d, 0x58, 0xbb, 0xb9, 0xb0, + 0xa6, 0x1b, 0xb3, 0x3b, 0x59, 0x29, 0xd5, 0x76, 0xe7, 0x16, 0x65, 0xb5, 0xdd, 0xf9, 0x05, 0xd6, + 0x48, 0xb0, 0x03, 0x28, 0x5b, 0xe1, 0x44, 0xd1, 0xf2, 0x14, 0x16, 0x5c, 0x0d, 0x73, 0x54, 0x97, + 0x94, 0x92, 0x03, 0x98, 0x89, 0x95, 0xf9, 0x50, 0xb4, 0x50, 0xd9, 0xe2, 0xa9, 0x71, 0x33, 0x97, + 0x97, 0x75, 0x76, 0x3a, 0xe9, 0xd2, 0xce, 0x2e, 0xa8, 0x1c, 0x6a, 0x67, 0x17, 0x56, 0x01, 0x43, + 0xf1, 0x2f, 0x01, 0x74, 0xa5, 0x4a, 0x47, 0x5c, 0xa6, 0x0c, 0xa7, 0x23, 0x2e, 0x5b, 0xd8, 0x0a, + 0x85, 0x3d, 0x16, 0xd6, 0xa6, 0x2b, 0x4f, 0xda, 0xda, 0x82, 0x42, 0x97, 0xb6, 0xb6, 0xa8, 0x68, + 0x15, 0xdf, 0x81, 0x99, 0x52, 0x8e, 0xde, 0x81, 0x45, 0x05, 0x2c, 0xbd, 0x03, 0x0b, 0xeb, 0x40, + 0x91, 0x3f, 0xfe, 0x0b, 0xa6, 0x76, 0x02, 0xe7, 0x0c, 0xcd, 0x45, 0x43, 0x74, 0x15, 0xc8, 0x98, + 0x4f, 0x12, 0x53, 0x43, 0xb7, 0xa1, 0x1a, 0x16, 0x42, 0xd0, 0x62, 0x22, 0xda, 0x75, 0x51, 0xc7, + 0x68, 0x66, 0x19, 0x29, 0x31, 0x27, 0x70, 0x35, 0x51, 0xc5, 0x40, 0xcb, 0x91, 0xd6, 0x9c, 0x62, + 0x8a, 0xb1, 0x52, 0xc0, 0x4d, 0x79, 0xee, 0x39, 0x80, 0xae, 0x2e, 0xe8, 0x75, 0xce, 0x54, 0x40, + 0xf4, 0x3a, 0xe7, 0x14, 0x23, 0x62, 0x1b, 0x29, 0x5b, 0x20, 0xd0, 0x1b, 0xa9, 0xb0, 0x60, 0xa1, + 0x37, 0x52, 0x71, 0x7d, 0x21, 0xb2, 0x58, 0x28, 0x49, 0x43, 0xfa, 0x71, 0x25, 0x05, 0x25, 0x86, + 0xb8, 0x92, 0xa2, 0x8a, 0x40, 0xa4, 0x84, 0x66, 0xab, 0xef, 0x0a, 0x8a, 0x47, 0xf7, 0x8b, 0xf6, + 0x50, 0xb2, 0x32, 0x60, 0x7c, 0xf8, 0xa3, 0xfd, 0x52, 0xde, 0x3b, 0x86, 0x7a, 0x1c, 0x8a, 0x47, + 0x37, 0x93, 0x02, 0x12, 0x98, 0xa5, 0xb1, 0x9c, 0xcf, 0x4c, 0x4e, 0xe3, 0x71, 0x09, 0xfd, 0x1c, + 0x8c, 0x62, 0x34, 0x12, 0x7d, 0x34, 0xca, 0xc6, 0xa4, 0xc2, 0x8f, 0xdf, 0xa7, 0x6b, 0x72, 0x46, + 0x0f, 0x4a, 0x68, 0x0f, 0x6a, 0x11, 0x42, 0x8e, 0x9a, 0x45, 0xf8, 0xbe, 0xb1, 0x94, 0xc3, 0x49, + 0x79, 0xe7, 0x0b, 0xa8, 0xc7, 0x11, 0x6f, 0xed, 0x9d, 0x1c, 0xb0, 0x5d, 0x7b, 0x27, 0x17, 0x24, + 0x8f, 0x1f, 0xc9, 0x1a, 0x33, 0x8d, 0x1d, 0xc9, 0x19, 0x60, 0x36, 0x76, 0x24, 0x67, 0x41, 0xd6, + 0x28, 0x68, 0xda, 0xe2, 0x07, 0x8a, 0x24, 0xd0, 0x89, 0xe2, 0x7f, 0x30, 0xe4, 0x22, 0xab, 0xfa, + 0x14, 0x2a, 0x44, 0x49, 0x63, 0xeb, 0xf9, 0x0d, 0xcc, 0x66, 0x90, 0x4b, 0xad, 0xa3, 0x08, 0x2a, + 0xd5, 0x3a, 0x0a, 0x61, 0xcf, 0x68, 0x16, 0x1b, 0x50, 0x51, 0xbf, 0x3d, 0xa1, 0x85, 0x68, 0x54, + 0xe2, 0x9f, 0x2a, 0x63, 0x31, 0x43, 0x4f, 0x79, 0xf6, 0x08, 0x66, 0x62, 0xb0, 0x26, 0x8a, 0xdf, + 0x11, 0x29, 0xb8, 0x52, 0x7b, 0x36, 0x07, 0x07, 0x8d, 0xcd, 0xfb, 0x17, 0x3c, 0xbb, 0x19, 0x01, + 0x32, 0xa2, 0x4f, 0x46, 0xc5, 0x67, 0x5a, 0xe9, 0xc3, 0xf7, 0xeb, 0x9c, 0x9a, 0xd5, 0xff, 0xc3, + 0xd5, 0x04, 0x60, 0xa6, 0x4f, 0xe0, 0x3c, 0x54, 0x53, 0x9f, 0xc0, 0xb9, 0x28, 0x5b, 0x6c, 0x6e, + 0x67, 0x30, 0x9f, 0x87, 0x63, 0xa0, 0xbb, 0x7a, 0x57, 0x14, 0x22, 0x32, 0xc6, 0xbd, 0xd1, 0x9d, + 0x32, 0xca, 0xda, 0x30, 0x9b, 0x01, 0x85, 0x74, 0x00, 0x15, 0xa1, 0x58, 0x3a, 0x80, 0x0a, 0x11, + 0xa5, 0x98, 0x0e, 0x0c, 0x28, 0x5b, 0x1a, 0x42, 0xb1, 0xf7, 0x6e, 0x41, 0x85, 0x4a, 0x1f, 0xd1, + 0x23, 0x2a, 0x4b, 0xfa, 0x70, 0x69, 0xc3, 0x6c, 0xa6, 0x1a, 0xa4, 0xa7, 0x52, 0x54, 0x7e, 0xd2, + 0x53, 0x29, 0x2c, 0x25, 0xc5, 0xa6, 0xf2, 0x1a, 0xae, 0xa7, 0xd0, 0x0b, 0x74, 0x2b, 0xf1, 0x6a, + 0xc8, 0x80, 0x2d, 0xc6, 0x6a, 0x21, 0x3f, 0x15, 0x4f, 0x04, 0x16, 0xf2, 0x31, 0x0a, 0xf4, 0x41, + 0x2c, 0x74, 0x8a, 0xe1, 0x11, 0xe3, 0xfe, 0x8f, 0x75, 0x4b, 0x6d, 0xed, 0x13, 0xb8, 0x9a, 0x48, + 0xaf, 0x75, 0x00, 0xe7, 0x81, 0x1e, 0x3a, 0x80, 0xf3, 0x01, 0x87, 0x70, 0x1a, 0x5e, 0x0a, 0x91, + 0x08, 0x93, 0x76, 0x74, 0x2f, 0x77, 0x7c, 0x0a, 0x96, 0x30, 0x3e, 0xf8, 0x91, 0x5e, 0xd9, 0x77, + 0x6f, 0x3a, 0x59, 0x8f, 0xe7, 0x72, 0xb9, 0xd8, 0x40, 0x3c, 0x97, 0x2b, 0xc8, 0xf3, 0x13, 0xe2, + 0x93, 0x59, 0x77, 0x5c, 0x7c, 0x2e, 0x12, 0x10, 0x17, 0x5f, 0x90, 0xb0, 0x87, 0xe2, 0xbb, 0x30, + 0x97, 0x93, 0x33, 0xa3, 0x58, 0xdc, 0x17, 0x25, 0xf5, 0xc6, 0xdd, 0x91, 0x7d, 0xb2, 0x2f, 0xb1, + 0x6c, 0x96, 0xac, 0x77, 0x60, 0x61, 0x62, 0xae, 0x77, 0x60, 0x71, 0x92, 0x1d, 0x2a, 0xd9, 0x78, + 0xfc, 0x9a, 0x77, 0xf6, 0xec, 0xf6, 0x9a, 0x43, 0xfa, 0x8f, 0xe4, 0xe7, 0xa7, 0x84, 0x9e, 0x3e, + 0x92, 0x22, 0x1e, 0x89, 0x7f, 0xc3, 0x1f, 0x9d, 0x12, 0xd5, 0x1e, 0xb4, 0xdb, 0x65, 0x41, 0x7a, + 0xfa, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x19, 0xff, 0xfb, 0x6c, 0x2e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/repository-service.proto b/proto/repository-service.proto index 5138dfe6cbb0a53ce9608b4b3eca6cfc7bd87ac4..c390256ecee52da42879606e8769b7139f78486b 100644 --- a/proto/repository-service.proto +++ b/proto/repository-service.proto @@ -310,8 +310,16 @@ message GetArchiveRequest { string commit_id = 2; string prefix = 3; Format format = 4; - bytes path = 5; repeated bytes exclude = 6; + repeated bytes include = 8; + + // use `include` instead + bytes path = 5 [deprecated=true]; + + // If `subdirectory` is not empty, `include` and `exclude` are relative to it. + // Archive entries will be relative to `subdirectory` - entry file paths will + // not include `subdirectory`. + bytes subdirectory = 7; } message GetArchiveResponse { diff --git a/ruby/proto/gitaly/repository-service_pb.rb b/ruby/proto/gitaly/repository-service_pb.rb index cd462a770e06d2c0cbba6451a56a3474b3f120ab..dd044e6216ae0fa70e54016842c1e36841418dc3 100644 --- a/ruby/proto/gitaly/repository-service_pb.rb +++ b/ruby/proto/gitaly/repository-service_pb.rb @@ -74,8 +74,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :commit_id, :string, 2 optional :prefix, :string, 3 optional :format, :enum, 4, "gitaly.GetArchiveRequest.Format" - optional :path, :bytes, 5 repeated :exclude, :bytes, 6 + repeated :include, :bytes, 8 + optional :path, :bytes, 5 + optional :subdirectory, :bytes, 7 end add_enum "gitaly.GetArchiveRequest.Format" do value :ZIP, 0