From 9629a9245fdd08a855fb1df46ec23db63dc40461 Mon Sep 17 00:00:00 2001 From: Ethan Reesor Date: Thu, 2 Jul 2020 15:54:55 -0500 Subject: [PATCH] GetArchive: Support path elision --- .../unreleased/2867-elide-archive-path.yml | 5 + internal/service/repository/archive.go | 36 +- internal/service/repository/archive_test.go | 68 ++- proto/go/gitalypb/repository-service.pb.go | 407 +++++++++--------- proto/repository-service.proto | 7 + ruby/proto/gitaly/repository-service_pb.rb | 1 + 6 files changed, 308 insertions(+), 216 deletions(-) create mode 100644 changelogs/unreleased/2867-elide-archive-path.yml diff --git a/changelogs/unreleased/2867-elide-archive-path.yml b/changelogs/unreleased/2867-elide-archive-path.yml new file mode 100644 index 0000000000..611d61de45 --- /dev/null +++ b/changelogs/unreleased/2867-elide-archive-path.yml @@ -0,0 +1,5 @@ +--- +title: 'GetArchive: Support path elision' +merge_request: 2342 +author: Ethan Reesor (@firelizzard) +type: added diff --git a/internal/service/repository/archive.go b/internal/service/repository/archive.go index 2a6f6e63ba..803de21ca3 100644 --- a/internal/service/repository/archive.go +++ b/internal/service/repository/archive.go @@ -3,7 +3,9 @@ package repository import ( "context" "io" + "os" "os/exec" + "strings" "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/git" @@ -45,6 +47,18 @@ func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.Repo return err } + if in.GetElidePath() { + // `git archive :` expects exclusions to be relative to path + pathSlash := path + string(os.PathSeparator) + for i := range exclude { + if !strings.HasPrefix(exclude[i], pathSlash) { + return helper.ErrInvalidArgumentf("invalid exclude: %q is not a subdirectory of %q", exclude[i], path) + } + + exclude[i] = exclude[i][len(pathSlash):] + } + } + writer := streamio.NewWriter(func(p []byte) error { return stream.Send(&gitalypb.GetArchiveResponse{Data: p}) }) @@ -118,16 +132,28 @@ func findGetArchivePath(f *commit.TreeEntryFinder, commitID, path string) (ok bo } 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 + var args []string + pathspecs := make([]string, 0, len(exclude)+1) + if !in.GetElidePath() { + // git archive [options] -- [exclude*] + args = []string{in.GetCommitId()} + pathspecs = append(pathspecs, path) + } else if path != "." { + // git archive [options] : -- [exclude*] + args = []string{in.GetCommitId() + ":" + path} + } else { + // git archive [options] -- [exclude*] + args = []string{in.GetCommitId()} + } + + for _, exclude := range exclude { + pathspecs = append(pathspecs, ":(exclude)"+exclude) } 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 87436d4a5d..ffbc8540c6 100644 --- a/internal/service/repository/archive_test.go +++ b/internal/service/repository/archive_test.go @@ -33,13 +33,14 @@ 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 + exclude [][]byte + elidePath bool + contents []string + excluded []string }{ { desc: "without-prefix", @@ -89,6 +90,31 @@ func TestGetArchiveSuccess(t *testing.T) { contents: []string{"/.gitignore", "/LICENSE", "/README.md"}, excluded: []string{"/files/whitespace", "/files/html/500.html"}, }, + { + desc: "with path elision", + commitID: "1e292f8fedd741b75372e19097c76d327140c312", + prefix: "my-prefix", + elidePath: true, + path: []byte("files/"), + contents: []string{"/whitespace", "/html/500.html"}, + }, + { + desc: "with path elision and exclusion", + commitID: "1e292f8fedd741b75372e19097c76d327140c312", + prefix: "my-prefix", + elidePath: true, + path: []byte("files/"), + exclude: [][]byte{[]byte("files/images")}, + contents: []string{"/whitespace", "/html/500.html"}, + excluded: []string{"/images/emoji.png"}, + }, + { + desc: "with path elision at root", + commitID: "1e292f8fedd741b75372e19097c76d327140c312", + prefix: "my-prefix", + elidePath: true, + contents: []string{"/files/whitespace", "/files/html/500.html"}, + }, } for _, tc := range testCases { @@ -106,6 +132,7 @@ func TestGetArchiveSuccess(t *testing.T) { Format: format, Path: tc.path, Exclude: tc.exclude, + ElidePath: tc.elidePath, } stream, err := client.GetArchive(ctx, req) require.NoError(t, err) @@ -147,14 +174,15 @@ func TestGetArchiveFailure(t *testing.T) { commitID := "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863" testCases := []struct { - desc string - repo *gitalypb.Repository - prefix string - commitID string - format gitalypb.GetArchiveRequest_Format - path []byte - exclude [][]byte - code codes.Code + desc string + repo *gitalypb.Repository + prefix string + commitID string + format gitalypb.GetArchiveRequest_Format + path []byte + exclude [][]byte + elidePath bool + code codes.Code }{ { desc: "Repository doesn't exist", @@ -233,6 +261,15 @@ func TestGetArchiveFailure(t *testing.T) { path: []byte("Here is a string...."), code: codes.InvalidArgument, }, + { + desc: "with path is file and path elision", + repo: testRepo, + commitID: "1e292f8fedd741b75372e19097c76d327140c312", + prefix: "my-prefix", + elidePath: true, + path: []byte("files/html/500.html"), + code: codes.Unknown, + }, } for _, tc := range testCases { @@ -247,6 +284,7 @@ func TestGetArchiveFailure(t *testing.T) { Format: tc.format, Path: tc.path, Exclude: tc.exclude, + ElidePath: tc.elidePath, } 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 0af7c9ef8a..f5939f5099 100644 --- a/proto/go/gitalypb/repository-service.pb.go +++ b/proto/go/gitalypb/repository-service.pb.go @@ -901,15 +901,22 @@ 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"` + Path []byte `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` + Exclude [][]byte `protobuf:"bytes,6,rep,name=exclude,proto3" json:"exclude,omitempty"` + // If `elide_path` is true and `path` refers to a subdirectory, that + // subdirectory will be elided from archive entries. For example, if `dir` + // contains `README.md`, with `elide_path = false` the corresponding entry + // will be `dir/README.md`; with `elide_path = true`, the entry will be + // `README.md`. `elide_path` has no effect if `path` refers to the repository + // root. `elide_path = true` is not supported if `path` refers to a file. + ElidePath bool `protobuf:"varint,7,opt,name=elide_path,json=elidePath,proto3" json:"elide_path,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetArchiveRequest) Reset() { *m = GetArchiveRequest{} } @@ -979,6 +986,13 @@ func (m *GetArchiveRequest) GetExclude() [][]byte { return nil } +func (m *GetArchiveRequest) GetElidePath() bool { + if m != nil { + return m.ElidePath + } + return false +} + type GetArchiveResponse struct { Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -3990,197 +4004,198 @@ func init() { func init() { proto.RegisterFile("repository-service.proto", fileDescriptor_e9b1768cf174c79b) } var fileDescriptor_e9b1768cf174c79b = []byte{ - // 3029 bytes of a gzipped FileDescriptorProto + // 3044 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, + 0xbd, 0xa2, 0x68, 0x20, 0x0f, 0x09, 0x90, 0x57, 0x03, 0x01, 0x82, 0x38, 0x8f, 0x79, 0xce, 0x2f, + 0xc8, 0x4b, 0x12, 0xe4, 0x25, 0xff, 0xc1, 0x7f, 0x21, 0x3f, 0x21, 0x4f, 0x41, 0x5f, 0x66, 0x7a, + 0xae, 0x6b, 0x05, 0x5c, 0x38, 0x6f, 0xd3, 0xd5, 0xdd, 0x55, 0xd5, 0xd5, 0x55, 0xdd, 0x5d, 0x5f, + 0x0d, 0x34, 0x29, 0x1e, 0x90, 0xc0, 0x65, 0x84, 0x5e, 0x7c, 0x1a, 0x60, 0xfa, 0xd6, 0x75, 0xf0, + 0xda, 0x80, 0x12, 0x46, 0x50, 0xf9, 0xd4, 0x65, 0xb6, 0x77, 0x61, 0x80, 0xe7, 0xfa, 0x4c, 0xd2, + 0x8c, 0x7a, 0xd0, 0xb3, 0x29, 0xee, 0xc8, 0x96, 0x79, 0x0c, 0x8b, 0x56, 0x34, 0x7b, 0xfb, 0x9d, + 0x1b, 0xb0, 0xc0, 0xc2, 0x6f, 0x86, 0x38, 0x60, 0xe8, 0x73, 0x00, 0xcd, 0xb8, 0x59, 0xba, 0x5d, + 0x7a, 0x30, 0xf3, 0x04, 0xad, 0x49, 0x8e, 0x6b, 0x7a, 0xd2, 0xc6, 0xd4, 0xef, 0xfe, 0xf6, 0xb0, + 0x64, 0xc5, 0xc6, 0x9a, 0x4f, 0xa0, 0x99, 0x65, 0x1a, 0x0c, 0x88, 0x1f, 0x60, 0xb4, 0x00, 0x65, + 0x2c, 0x28, 0x82, 0x63, 0xd5, 0x52, 0x2d, 0xf3, 0x44, 0xcc, 0xb1, 0x9d, 0xb3, 0x7d, 0xdf, 0xa1, + 0xb8, 0x8f, 0x7d, 0x66, 0x7b, 0x97, 0xd7, 0xe4, 0x26, 0x2c, 0xe5, 0x70, 0x95, 0xaa, 0x98, 0x14, + 0x66, 0x65, 0xe7, 0xce, 0xd0, 0xbb, 0xbc, 0x2c, 0x74, 0x17, 0xae, 0x3a, 0x14, 0xdb, 0x0c, 0xb7, + 0xda, 0x2e, 0xeb, 0xdb, 0x83, 0xe6, 0x84, 0x58, 0x60, 0x5d, 0x12, 0x37, 0x04, 0xcd, 0x9c, 0x07, + 0x14, 0x97, 0xa9, 0x34, 0x79, 0x0b, 0x37, 0x76, 0x6d, 0xda, 0xb6, 0x4f, 0xf1, 0x26, 0xf1, 0x3c, + 0xec, 0xb0, 0x9f, 0x48, 0x9b, 0x26, 0x2c, 0xa4, 0xe5, 0x2a, 0x8d, 0x8e, 0x61, 0xf1, 0x4b, 0xea, + 0x32, 0xbc, 0x49, 0xfa, 0x7d, 0x97, 0xed, 0x52, 0x7b, 0xd0, 0xbb, 0xfc, 0x6e, 0x18, 0xd0, 0xcc, + 0x32, 0x55, 0x02, 0x9f, 0xc1, 0xb5, 0x4d, 0x0f, 0xdb, 0xfe, 0x70, 0x70, 0x79, 0x39, 0xb3, 0x70, + 0x3d, 0xe2, 0xa5, 0xd8, 0x7f, 0x01, 0x37, 0xf4, 0x94, 0x63, 0xf7, 0x5b, 0x7c, 0x79, 0x29, 0x0f, + 0x61, 0x21, 0xcd, 0x52, 0xf9, 0x38, 0x82, 0xa9, 0xc0, 0xfd, 0x16, 0x0b, 0x6e, 0x93, 0x96, 0xf8, + 0x36, 0xdf, 0xc0, 0xd2, 0xfa, 0x60, 0xe0, 0x5d, 0xec, 0xba, 0xcc, 0x66, 0x8c, 0xba, 0xed, 0x21, + 0xc3, 0x97, 0x0f, 0x35, 0x64, 0x40, 0x95, 0xe2, 0xb7, 0x6e, 0xe0, 0x12, 0x5f, 0xec, 0x70, 0xdd, + 0x8a, 0xda, 0xe6, 0x32, 0x18, 0x79, 0x22, 0x95, 0x45, 0xfe, 0x32, 0x01, 0x68, 0x07, 0x33, 0xa7, + 0x67, 0xe1, 0x3e, 0x61, 0x97, 0xb7, 0x07, 0x8f, 0x6c, 0x2a, 0x58, 0x09, 0x45, 0x6a, 0x96, 0x6a, + 0xa1, 0x79, 0x98, 0xee, 0x12, 0xea, 0xe0, 0xe6, 0xa4, 0xf0, 0x40, 0xd9, 0x40, 0x8b, 0x50, 0xf1, + 0x49, 0x8b, 0xd9, 0xa7, 0x41, 0x73, 0x4a, 0x1e, 0x04, 0x3e, 0x39, 0xb1, 0x4f, 0x03, 0xd4, 0x84, + 0x0a, 0x73, 0xfb, 0x98, 0x0c, 0x59, 0x73, 0xfa, 0x76, 0xe9, 0xc1, 0xb4, 0x15, 0x36, 0xf9, 0x94, + 0x20, 0xe8, 0xb5, 0xce, 0xf0, 0x45, 0xb3, 0x2c, 0x25, 0x04, 0x41, 0xef, 0x39, 0xbe, 0x40, 0xab, + 0x30, 0x73, 0xe6, 0x93, 0x73, 0xbf, 0xd5, 0x23, 0xfc, 0x60, 0xa9, 0x88, 0x4e, 0x10, 0xa4, 0x3d, + 0x4e, 0x41, 0x4b, 0x50, 0xf5, 0x49, 0x6b, 0x40, 0x87, 0x3e, 0x6e, 0xd6, 0x84, 0xb4, 0x8a, 0x4f, + 0x8e, 0x78, 0x13, 0x3d, 0x85, 0xab, 0x52, 0xcf, 0xd6, 0xc0, 0xa6, 0x76, 0x3f, 0x68, 0x82, 0x58, + 0xf2, 0x35, 0xbd, 0x64, 0x61, 0x9d, 0xba, 0x1c, 0x74, 0x24, 0xc6, 0x3c, 0x9b, 0xaa, 0x56, 0x1b, + 0x35, 0xf3, 0x06, 0xcc, 0x25, 0x0c, 0xa8, 0x43, 0x67, 0x53, 0x04, 0x99, 0xb6, 0xd6, 0x58, 0x42, + 0x27, 0xcb, 0x54, 0x09, 0xfc, 0xf3, 0x04, 0xcc, 0xee, 0x62, 0xb6, 0x4e, 0x9d, 0x9e, 0xfb, 0x76, + 0x0c, 0x1b, 0x79, 0x13, 0x6a, 0x8e, 0x88, 0xd0, 0x96, 0xdb, 0x51, 0x7b, 0x59, 0x95, 0x84, 0xfd, + 0x0e, 0xdf, 0xe5, 0x01, 0xc5, 0x5d, 0xf7, 0x9d, 0xd8, 0xce, 0x9a, 0xa5, 0x5a, 0xe8, 0x73, 0x28, + 0x77, 0x09, 0xed, 0xdb, 0x4c, 0x6c, 0xe7, 0xb5, 0x27, 0xb7, 0x43, 0x51, 0x19, 0xcd, 0xd6, 0x76, + 0xc4, 0x38, 0x4b, 0x8d, 0xe7, 0xd1, 0x32, 0xb0, 0x59, 0x4f, 0xec, 0x76, 0xdd, 0x12, 0xdf, 0xdc, + 0x09, 0xf0, 0x3b, 0xc7, 0x1b, 0x76, 0x70, 0xb3, 0x7c, 0x7b, 0xf2, 0x41, 0xdd, 0x0a, 0x9b, 0x68, + 0x05, 0x00, 0x7b, 0x6e, 0x87, 0x6f, 0x17, 0xeb, 0x89, 0xad, 0xae, 0x5a, 0x35, 0x41, 0x39, 0xb2, + 0x59, 0xcf, 0x7c, 0x0a, 0x65, 0xc9, 0x1e, 0x55, 0x60, 0xf2, 0xf5, 0xfe, 0x51, 0xe3, 0x0a, 0xff, + 0x38, 0x59, 0xb7, 0x1a, 0x25, 0x04, 0x50, 0x3e, 0x59, 0xb7, 0x5a, 0xbb, 0xaf, 0x1b, 0x13, 0x68, + 0x06, 0x2a, 0xfc, 0x7b, 0xe3, 0xf5, 0x93, 0xc6, 0xa4, 0xf9, 0x00, 0x50, 0x5c, 0x4b, 0x1d, 0xc5, + 0x1d, 0x9b, 0xd9, 0xc2, 0x74, 0x75, 0x4b, 0x7c, 0xf3, 0xbd, 0xdd, 0xb3, 0x83, 0x17, 0xc4, 0xb1, + 0xbd, 0x0d, 0x6a, 0xfb, 0x4e, 0x6f, 0x0c, 0x31, 0x6c, 0x3e, 0x86, 0x66, 0x96, 0xa9, 0x52, 0x62, + 0x1e, 0xa6, 0xdf, 0xda, 0xde, 0x10, 0xab, 0xdb, 0x52, 0x36, 0xcc, 0x1f, 0x4a, 0xd0, 0x14, 0xae, + 0x77, 0x4c, 0x86, 0xd4, 0xc1, 0x72, 0xd6, 0xe5, 0x37, 0xfe, 0xff, 0x60, 0x36, 0x10, 0x0c, 0x5b, + 0x31, 0x06, 0x13, 0x45, 0x0c, 0xac, 0x86, 0x1c, 0x6c, 0x25, 0x2e, 0x1d, 0xc5, 0xa0, 0x2d, 0x54, + 0x12, 0x3e, 0x52, 0xb7, 0xea, 0x41, 0x4c, 0x4d, 0xbe, 0x83, 0xcc, 0xa6, 0xa7, 0x98, 0xb5, 0x28, + 0xee, 0x0a, 0x6f, 0xa9, 0x5b, 0x35, 0x49, 0xb1, 0x70, 0xd7, 0x7c, 0x0a, 0x4b, 0x39, 0x4b, 0xd3, + 0xaf, 0x07, 0x8a, 0x83, 0xa1, 0xc7, 0xc2, 0xd7, 0x83, 0x6c, 0x99, 0xbb, 0x30, 0xb3, 0x13, 0x38, + 0x67, 0x97, 0xdf, 0x8b, 0x7b, 0x50, 0x97, 0x8c, 0xb4, 0xfd, 0x31, 0xa5, 0x84, 0x2a, 0x2f, 0x90, + 0x0d, 0xf3, 0x8f, 0x25, 0xb8, 0x2e, 0x6e, 0x32, 0x0b, 0x77, 0x2f, 0x6f, 0xf6, 0x06, 0x4c, 0x72, + 0x4b, 0xc8, 0xe3, 0x9b, 0x7f, 0x26, 0x4e, 0xf5, 0xc9, 0xe4, 0xa9, 0x8e, 0xee, 0x40, 0x9d, 0x78, + 0x9d, 0x56, 0xd4, 0x2f, 0x0d, 0x38, 0x43, 0xbc, 0x8e, 0x15, 0x0e, 0x89, 0x4e, 0xdc, 0xe9, 0xd8, + 0x89, 0xfb, 0x6c, 0xaa, 0x5a, 0x6e, 0x54, 0xcc, 0x26, 0x34, 0xb4, 0xe6, 0x72, 0x91, 0xcf, 0xa6, + 0xaa, 0xa5, 0xc6, 0x84, 0xe9, 0xc3, 0xfc, 0x8e, 0xeb, 0x77, 0x5e, 0x62, 0x7a, 0x8a, 0x37, 0xec, + 0x60, 0x0c, 0x07, 0xc9, 0x32, 0xd4, 0x42, 0x35, 0x83, 0xe6, 0x84, 0x88, 0x63, 0x4d, 0x30, 0x3f, + 0x81, 0x1b, 0x29, 0x79, 0x3a, 0xf0, 0xda, 0x76, 0x20, 0x5d, 0xbe, 0x66, 0x89, 0x6f, 0xf3, 0xbb, + 0x12, 0xcc, 0xca, 0x03, 0x70, 0x87, 0xd0, 0xb3, 0x7f, 0xbf, 0xab, 0xf3, 0x87, 0x5c, 0x5c, 0x9f, + 0xe8, 0x49, 0xb9, 0xb4, 0x1f, 0x58, 0x98, 0xab, 0xbc, 0xef, 0x1f, 0x51, 0x72, 0x4a, 0x71, 0x10, + 0x8c, 0xe5, 0x44, 0xa6, 0x82, 0x69, 0xec, 0x44, 0x96, 0x84, 0xfd, 0x8e, 0xf9, 0xbf, 0x60, 0xe4, + 0xc9, 0x54, 0xc6, 0x5c, 0x85, 0x19, 0xd7, 0x6f, 0x0d, 0x14, 0x59, 0x85, 0x0d, 0xb8, 0xd1, 0x40, + 0xa9, 0xf2, 0xf1, 0x9b, 0xa1, 0x1d, 0xf4, 0xc6, 0xac, 0x72, 0x20, 0x98, 0xc6, 0x54, 0x96, 0x84, + 0x50, 0xe5, 0xac, 0xcc, 0xf7, 0x55, 0xd9, 0x83, 0x5b, 0xe9, 0xcb, 0x70, 0x87, 0x92, 0xfe, 0x2b, + 0xeb, 0xc5, 0x58, 0x82, 0x71, 0x48, 0x3d, 0xa5, 0x31, 0xff, 0x34, 0xef, 0xc0, 0x6a, 0xa1, 0x34, + 0xb5, 0xed, 0x87, 0x30, 0x27, 0x87, 0x6c, 0x0c, 0xfd, 0x8e, 0x37, 0x86, 0xb7, 0xe5, 0xc7, 0x30, + 0x9f, 0x64, 0x38, 0xe2, 0x4e, 0xfa, 0x6e, 0x02, 0x1a, 0xc7, 0x98, 0x6d, 0x12, 0xbf, 0xeb, 0x9e, + 0x5e, 0xde, 0x00, 0x9f, 0x43, 0x05, 0xfb, 0x8c, 0xba, 0x58, 0x86, 0xec, 0xcc, 0x93, 0x5b, 0xe1, + 0xb4, 0xb4, 0x90, 0xb5, 0x6d, 0x9f, 0xd1, 0x0b, 0x2b, 0x1c, 0x6e, 0xfc, 0xaa, 0x04, 0xd3, 0x82, + 0xc4, 0x8d, 0xc8, 0x5f, 0x69, 0x32, 0x80, 0xf9, 0x27, 0x5a, 0x81, 0x9a, 0xb8, 0xba, 0x5a, 0x01, + 0xa3, 0xd2, 0xb8, 0x7b, 0x57, 0xac, 0xaa, 0x20, 0x1d, 0x33, 0x8a, 0xee, 0xc0, 0x8c, 0xec, 0x76, + 0x7d, 0xf6, 0xf4, 0x89, 0x38, 0xf3, 0xa6, 0xf7, 0xae, 0x58, 0x20, 0x88, 0xfb, 0x9c, 0x86, 0x56, + 0x41, 0xb6, 0x5a, 0x6d, 0x42, 0x3c, 0xf9, 0x66, 0xdc, 0xbb, 0x62, 0x49, 0xae, 0x1b, 0x84, 0x78, + 0x1b, 0x15, 0x75, 0x55, 0x9a, 0x73, 0x30, 0x1b, 0x53, 0x55, 0x6d, 0x91, 0x03, 0x73, 0x5b, 0xd8, + 0xc3, 0x3c, 0xf9, 0x18, 0x8f, 0x9d, 0x10, 0x4c, 0x9d, 0xe1, 0x0b, 0x69, 0xa4, 0x9a, 0x25, 0xbe, + 0xcd, 0x05, 0x98, 0x4f, 0x0a, 0x51, 0xc2, 0x5d, 0x9e, 0x86, 0x06, 0x8c, 0x50, 0xbc, 0x39, 0x0c, + 0x18, 0xe9, 0xef, 0x11, 0x72, 0x16, 0x8c, 0x45, 0x05, 0xe1, 0x0d, 0x13, 0x31, 0x6f, 0x58, 0x06, + 0x23, 0x4f, 0x94, 0x52, 0xe4, 0x04, 0x9a, 0x1b, 0xb6, 0x73, 0x36, 0x1c, 0x8c, 0x53, 0x0f, 0xf3, + 0x11, 0x2c, 0xe5, 0x70, 0x1d, 0xe1, 0xb2, 0x6f, 0xe0, 0x4e, 0x5e, 0x48, 0x8d, 0x29, 0x7a, 0x72, + 0xed, 0x72, 0x0f, 0xcc, 0x51, 0x22, 0x95, 0x7d, 0x0e, 0x00, 0xf1, 0x3b, 0xe9, 0x85, 0xeb, 0x60, + 0x7f, 0x0c, 0x37, 0xa0, 0xb9, 0x09, 0x73, 0x09, 0x7e, 0xca, 0x26, 0x0f, 0x01, 0x79, 0x92, 0xd4, + 0x0a, 0x7a, 0x84, 0xb2, 0x96, 0x6f, 0xf7, 0xc3, 0xfb, 0xae, 0xa1, 0x7a, 0x8e, 0x79, 0xc7, 0x81, + 0xdd, 0x17, 0x9b, 0xb6, 0x8b, 0xd9, 0xbe, 0xdf, 0x25, 0xeb, 0xe3, 0xcb, 0x1c, 0xcd, 0xff, 0x81, + 0xa5, 0x1c, 0xae, 0x4a, 0xc1, 0x5b, 0x00, 0x3a, 0x65, 0x54, 0x5b, 0x17, 0xa3, 0x70, 0x95, 0x36, + 0x6d, 0xcf, 0x19, 0x7a, 0x36, 0xc3, 0x9b, 0x3d, 0xec, 0x9c, 0x05, 0xc3, 0xfe, 0xe5, 0x55, 0xfa, + 0x4f, 0x58, 0xca, 0xe1, 0xaa, 0x54, 0x32, 0xa0, 0xea, 0x28, 0x9a, 0xb2, 0x54, 0xd4, 0xe6, 0xdb, + 0xb6, 0x8b, 0xd9, 0xb1, 0x6f, 0x0f, 0x82, 0x1e, 0xb9, 0x3c, 0x78, 0x62, 0x7e, 0x04, 0x73, 0x09, + 0x7e, 0x23, 0x5c, 0xf9, 0xfb, 0x12, 0xdc, 0xcd, 0x73, 0xac, 0xb1, 0x29, 0xc3, 0x93, 0xd7, 0x1e, + 0x63, 0x83, 0x96, 0xbe, 0x96, 0x2a, 0xbc, 0xfd, 0x8a, 0x7a, 0xfc, 0x92, 0x15, 0x5d, 0xf6, 0x90, + 0xf5, 0x54, 0x3e, 0x26, 0xc6, 0xae, 0x0f, 0x59, 0xcf, 0xbc, 0x0f, 0xf7, 0x46, 0x2b, 0xa6, 0x7c, + 0xfe, 0xb7, 0x25, 0x98, 0xdf, 0xc5, 0xcc, 0xb2, 0xcf, 0x37, 0x7b, 0xb6, 0x7f, 0x3a, 0x0e, 0x54, + 0xe2, 0x2e, 0x5c, 0xed, 0x52, 0xd2, 0x6f, 0x25, 0xa0, 0x89, 0x9a, 0x55, 0xe7, 0xc4, 0xe8, 0x95, + 0xba, 0x0a, 0x33, 0x8c, 0xb4, 0x12, 0xef, 0xdc, 0x9a, 0x05, 0x8c, 0x84, 0x03, 0xcc, 0x3f, 0x4d, + 0xc1, 0x8d, 0x94, 0x62, 0x6a, 0x23, 0xf6, 0x60, 0x86, 0xda, 0xe7, 0x2d, 0x47, 0x92, 0x9b, 0x25, + 0x71, 0x4f, 0x7d, 0x18, 0xcb, 0x38, 0xb3, 0x73, 0xd6, 0x22, 0x92, 0x05, 0x34, 0xea, 0x35, 0x7e, + 0x98, 0x84, 0x5a, 0xd4, 0x83, 0x16, 0xa1, 0xd2, 0xf6, 0x48, 0x9b, 0x3f, 0x59, 0xa4, 0x8b, 0x95, + 0x79, 0x73, 0xbf, 0x13, 0x21, 0x3a, 0x13, 0x1a, 0xd1, 0x41, 0x2b, 0x50, 0xf5, 0xf1, 0xb9, 0xcc, + 0x43, 0x85, 0xf2, 0x1b, 0x13, 0xcd, 0x92, 0x55, 0xf1, 0xf1, 0x39, 0xcf, 0x44, 0x79, 0x37, 0x7f, + 0xa7, 0x8b, 0xee, 0x29, 0xdd, 0x4d, 0xbc, 0x8e, 0xe8, 0x3e, 0x84, 0x1a, 0x19, 0x60, 0x6a, 0x33, + 0xbe, 0xf6, 0x69, 0x91, 0x32, 0x7f, 0xf6, 0x9e, 0x0b, 0x58, 0x3b, 0x0c, 0x27, 0x5a, 0x9a, 0x07, + 0xb7, 0x39, 0xb7, 0x89, 0x66, 0x2a, 0x31, 0x92, 0x3a, 0xb5, 0xcf, 0xa3, 0xf1, 0xdc, 0x97, 0xb8, + 0x52, 0x7d, 0xd2, 0xc1, 0x22, 0x77, 0x9e, 0x16, 0x0a, 0xbd, 0x24, 0x1d, 0x2c, 0x30, 0x12, 0x7c, + 0x2e, 0xbb, 0xaa, 0xb2, 0xcb, 0xc7, 0xe7, 0xa2, 0xeb, 0x1e, 0x5c, 0x0b, 0x57, 0xda, 0x6a, 0x5f, + 0xf0, 0x13, 0xa1, 0x26, 0xf3, 0x3a, 0xb5, 0xd6, 0x0d, 0x4e, 0xe3, 0xa3, 0xc2, 0x05, 0xab, 0x51, + 0x20, 0x47, 0xa9, 0x25, 0x8b, 0x51, 0xa6, 0x0b, 0x35, 0xad, 0xce, 0x0c, 0x54, 0x5e, 0x1d, 0x3c, + 0x3f, 0x38, 0xfc, 0xf2, 0xa0, 0x71, 0x05, 0xd5, 0x60, 0x7a, 0x7d, 0x6b, 0x6b, 0x7b, 0x4b, 0x66, + 0xea, 0x9b, 0x87, 0x47, 0xfb, 0xdb, 0x5b, 0x32, 0x53, 0xdf, 0xda, 0x7e, 0xb1, 0x7d, 0xb2, 0xbd, + 0xd5, 0x98, 0x44, 0x75, 0xa8, 0xbe, 0x3c, 0xdc, 0xda, 0xdf, 0xe1, 0x5d, 0x53, 0xbc, 0xcb, 0xda, + 0x3e, 0x58, 0x7f, 0xb9, 0xbd, 0xd5, 0x98, 0x46, 0x0d, 0xa8, 0x9f, 0x7c, 0x75, 0xb4, 0xdd, 0xda, + 0xdc, 0x5b, 0x3f, 0xd8, 0xdd, 0xde, 0x6a, 0x94, 0xcd, 0xdf, 0x94, 0xa0, 0x79, 0x8c, 0x6d, 0xea, + 0xf4, 0x76, 0x5c, 0x0f, 0x07, 0x1b, 0x17, 0xfc, 0x34, 0xbd, 0xbc, 0x73, 0xcf, 0xc3, 0xf4, 0x9b, + 0x21, 0x56, 0xe9, 0x42, 0xcd, 0x92, 0x8d, 0x30, 0x89, 0x9b, 0xd4, 0x49, 0xdc, 0x02, 0x94, 0xbb, + 0xae, 0xc7, 0x30, 0x95, 0xdb, 0x6f, 0xa9, 0x96, 0xf9, 0x19, 0x2c, 0xe5, 0x68, 0xa5, 0xf3, 0xcd, + 0x2e, 0x27, 0x0b, 0x9f, 0xae, 0x5b, 0xb2, 0x61, 0xfe, 0xa1, 0x04, 0x37, 0x13, 0x73, 0x36, 0x89, + 0xcf, 0xb0, 0xcf, 0x7e, 0xba, 0xc5, 0x7c, 0x04, 0x0d, 0xa7, 0x37, 0xf4, 0xcf, 0x30, 0xcf, 0x3c, + 0xa5, 0xae, 0x0a, 0xb7, 0xbb, 0xae, 0xe8, 0xd1, 0x79, 0x72, 0x01, 0xcb, 0xf9, 0xba, 0xaa, 0x25, + 0x36, 0xa1, 0xd2, 0xb7, 0x99, 0xd3, 0x8b, 0x16, 0x19, 0x36, 0xd1, 0x0a, 0x80, 0xf8, 0x6c, 0xc5, + 0x6e, 0xef, 0x9a, 0xa0, 0x6c, 0xd9, 0xcc, 0x46, 0xb7, 0xa1, 0x8e, 0xfd, 0x4e, 0x8b, 0x74, 0x5b, + 0x82, 0xa6, 0xf0, 0x44, 0xc0, 0x7e, 0xe7, 0xb0, 0xfb, 0x92, 0x53, 0xcc, 0x5f, 0x97, 0xa0, 0x2c, + 0xd1, 0xb8, 0xf0, 0x1d, 0x5f, 0x8a, 0xde, 0xf1, 0x3c, 0x86, 0xc5, 0x35, 0x2b, 0x57, 0x2a, 0xbe, + 0xd1, 0x7f, 0xc3, 0x52, 0x74, 0x80, 0x12, 0xea, 0x7e, 0x2b, 0xdc, 0xb2, 0xd5, 0xc3, 0x76, 0x07, + 0x53, 0x75, 0x22, 0x2d, 0x86, 0x07, 0x6a, 0xd4, 0xbf, 0x27, 0xba, 0xd1, 0x07, 0x70, 0xad, 0xef, + 0x52, 0x4a, 0x68, 0x8b, 0xe2, 0x6e, 0xdf, 0x1e, 0x04, 0xcd, 0x29, 0xf1, 0x14, 0xbc, 0x2a, 0xa9, + 0x96, 0x24, 0x72, 0x2f, 0x5c, 0x10, 0x80, 0xc6, 0xde, 0xc9, 0xc9, 0xd1, 0xb8, 0xb0, 0xd6, 0xfb, + 0x09, 0xac, 0x35, 0x0b, 0x57, 0x86, 0xd8, 0x6b, 0x0c, 0x4c, 0x9d, 0x4c, 0x80, 0xa9, 0xe6, 0x12, + 0x2c, 0x66, 0xb4, 0x52, 0x1b, 0xf8, 0x15, 0xac, 0xec, 0x62, 0x76, 0xd8, 0xfe, 0x19, 0x76, 0xd8, + 0x96, 0x4b, 0xb1, 0x33, 0x3e, 0xcc, 0xfc, 0x3f, 0xe0, 0x56, 0x11, 0xeb, 0x11, 0xd8, 0xf9, 0xef, + 0x4b, 0x30, 0xbf, 0xe9, 0x11, 0x1f, 0xf3, 0xfb, 0xeb, 0x88, 0x10, 0x6f, 0x1c, 0x06, 0x9c, 0x1a, + 0xf0, 0x3c, 0x22, 0x95, 0xf2, 0x4b, 0xcd, 0x84, 0x08, 0xd1, 0x1f, 0x33, 0xf4, 0xe4, 0x28, 0x43, + 0x9b, 0x8b, 0x70, 0x23, 0xa5, 0xa1, 0x32, 0xe6, 0x5f, 0x4b, 0xb0, 0x9c, 0xe8, 0xd9, 0xf7, 0x19, + 0xa6, 0xbe, 0xfd, 0x13, 0xae, 0x21, 0x17, 0xeb, 0x98, 0xfc, 0x17, 0xb0, 0x8e, 0x55, 0x58, 0x29, + 0x58, 0x82, 0x86, 0xbc, 0xb9, 0x3d, 0xde, 0x8e, 0x1b, 0xf2, 0xce, 0x32, 0x55, 0x02, 0xdf, 0x71, + 0x81, 0xbe, 0x38, 0x38, 0xc7, 0x26, 0x50, 0xdc, 0xa0, 0xd8, 0xb3, 0x99, 0xfb, 0x56, 0xa1, 0xcb, + 0xea, 0xd5, 0x12, 0x12, 0x05, 0xc0, 0x2c, 0xb4, 0x4a, 0x4b, 0x56, 0x5a, 0xfd, 0xb2, 0xc4, 0x93, + 0xaf, 0x81, 0xe7, 0x3a, 0xe3, 0x45, 0xff, 0xd1, 0xc7, 0x50, 0x96, 0x9b, 0x32, 0x02, 0xa2, 0x52, + 0x23, 0xcc, 0x15, 0xb8, 0x99, 0xab, 0x83, 0xd2, 0xf1, 0x15, 0x2c, 0x1d, 0x0e, 0x98, 0xdb, 0x17, + 0x31, 0x37, 0xbe, 0xcd, 0x5a, 0x06, 0x23, 0x8f, 0xad, 0x14, 0xfa, 0xe4, 0xef, 0xb7, 0x44, 0xa9, + 0x35, 0xac, 0x95, 0xc9, 0x1a, 0x35, 0xfa, 0x1a, 0x1a, 0xe9, 0x32, 0x31, 0x5a, 0xcd, 0x4a, 0x4b, + 0x54, 0xa5, 0x8d, 0xdb, 0xc5, 0x03, 0xd4, 0x0a, 0xcb, 0xff, 0xf8, 0xfe, 0xc1, 0x44, 0x75, 0x02, + 0x7d, 0x13, 0x96, 0x77, 0x63, 0xb5, 0x5f, 0x14, 0x9f, 0x9e, 0x5b, 0x6c, 0x36, 0xee, 0x8c, 0x18, + 0x91, 0x90, 0x50, 0x42, 0xcf, 0x01, 0x74, 0x31, 0x17, 0x2d, 0x25, 0x27, 0xc6, 0x8a, 0xca, 0x86, + 0x91, 0xd7, 0x95, 0x62, 0xf6, 0x25, 0x5c, 0x4b, 0xd6, 0x62, 0xd1, 0x4a, 0xf4, 0x1e, 0xcc, 0xab, + 0x0d, 0x1b, 0xb7, 0x8a, 0xba, 0x53, 0x8c, 0xbf, 0x56, 0x88, 0x6f, 0xac, 0xea, 0xaa, 0xcd, 0x5c, + 0x50, 0xe4, 0xd5, 0x66, 0x2e, 0x2c, 0xd8, 0xc6, 0xf4, 0x4e, 0x96, 0x41, 0xb5, 0xde, 0xb9, 0x15, + 0x57, 0xad, 0x77, 0x7e, 0xf5, 0x34, 0x62, 0xec, 0x00, 0xca, 0x96, 0x2f, 0x51, 0xb4, 0x3d, 0x85, + 0xd5, 0x54, 0xc3, 0x1c, 0x35, 0x24, 0x25, 0xe4, 0x00, 0x66, 0x62, 0x35, 0x3c, 0x14, 0x6d, 0x54, + 0xb6, 0x32, 0x6a, 0xdc, 0xcc, 0xed, 0xcb, 0x1a, 0x3b, 0x9d, 0x74, 0x69, 0x63, 0x17, 0x94, 0x05, + 0xb5, 0xb1, 0x0b, 0x4b, 0x7c, 0x21, 0xfb, 0x97, 0x00, 0xba, 0x52, 0xa5, 0x3d, 0x2e, 0x53, 0x63, + 0xd3, 0x1e, 0x97, 0x2d, 0x6c, 0x85, 0xcc, 0x1e, 0x0b, 0x6d, 0xd3, 0x95, 0x27, 0xad, 0x6d, 0x41, + 0xa1, 0x4b, 0x6b, 0x5b, 0x54, 0xb4, 0x8a, 0x47, 0x60, 0xa6, 0x94, 0xa3, 0x23, 0xb0, 0xa8, 0x80, + 0xa5, 0x23, 0xb0, 0xb0, 0x0e, 0x14, 0xd9, 0xe3, 0xbf, 0x60, 0x6a, 0x27, 0x70, 0xce, 0xd0, 0x5c, + 0x34, 0x45, 0x57, 0x81, 0x8c, 0xf9, 0x24, 0x31, 0x35, 0x75, 0x1b, 0xaa, 0x61, 0x21, 0x04, 0x2d, + 0x26, 0xbc, 0x5d, 0x17, 0x75, 0x8c, 0x66, 0xb6, 0x23, 0xc5, 0xe6, 0x04, 0xae, 0x26, 0xaa, 0x18, + 0x68, 0x39, 0x92, 0x9a, 0x53, 0x4c, 0x31, 0x56, 0x0a, 0x7a, 0x53, 0x96, 0x7b, 0x0e, 0xa0, 0xab, + 0x0b, 0x7a, 0x9f, 0x33, 0x15, 0x10, 0xbd, 0xcf, 0x39, 0xc5, 0x88, 0x58, 0x20, 0x65, 0x0b, 0x04, + 0x3a, 0x90, 0x0a, 0x0b, 0x16, 0x3a, 0x90, 0x8a, 0xeb, 0x0b, 0x91, 0xc6, 0x42, 0x48, 0x1a, 0xd2, + 0x8f, 0x0b, 0x29, 0x28, 0x31, 0xc4, 0x85, 0x14, 0x55, 0x04, 0x22, 0x21, 0x34, 0x5b, 0x5a, 0x57, + 0x50, 0x3c, 0xba, 0x5f, 0x14, 0x43, 0xc9, 0xca, 0x80, 0xf1, 0xe1, 0x8f, 0x8e, 0x4b, 0x59, 0xef, + 0x18, 0xea, 0x71, 0x28, 0x1e, 0xdd, 0x4c, 0x32, 0x48, 0x60, 0x96, 0xc6, 0x72, 0x7e, 0x67, 0x72, + 0x19, 0x8f, 0x4b, 0xe8, 0xe7, 0x60, 0x14, 0xa3, 0x91, 0xe8, 0xa3, 0x51, 0x3a, 0x26, 0x05, 0x7e, + 0xfc, 0x3e, 0x43, 0x93, 0x2b, 0x7a, 0x50, 0x42, 0x7b, 0x50, 0x8b, 0x10, 0x72, 0xd4, 0x2c, 0xc2, + 0xf7, 0x8d, 0xa5, 0x9c, 0x9e, 0x94, 0x75, 0xbe, 0x80, 0x7a, 0x1c, 0xf1, 0xd6, 0xd6, 0xc9, 0x01, + 0xdb, 0xb5, 0x75, 0x72, 0x41, 0xf2, 0xf8, 0x91, 0xac, 0x31, 0xd3, 0xd8, 0x91, 0x9c, 0x01, 0x66, + 0x63, 0x47, 0x72, 0x16, 0x64, 0x8d, 0x9c, 0xa6, 0x2d, 0xfe, 0x8e, 0x48, 0x02, 0x9d, 0x28, 0xfe, + 0x7b, 0x42, 0x2e, 0xb2, 0xaa, 0x4f, 0xa1, 0x42, 0x94, 0x34, 0xb6, 0x9f, 0xdf, 0xc0, 0x6c, 0x06, + 0xb9, 0xd4, 0x32, 0x8a, 0xa0, 0x52, 0x2d, 0xa3, 0x10, 0xf6, 0x8c, 0x56, 0xb1, 0x01, 0x15, 0xf5, + 0x4f, 0x13, 0x5a, 0x88, 0x66, 0x25, 0x7e, 0x98, 0x32, 0x16, 0x33, 0xf4, 0x94, 0x65, 0x8f, 0x60, + 0x26, 0x06, 0x6b, 0xa2, 0xf8, 0x1d, 0x91, 0x82, 0x2b, 0xb5, 0x65, 0x73, 0x70, 0xd0, 0xd8, 0xba, + 0x7f, 0xc1, 0xb3, 0x9b, 0x11, 0x20, 0x23, 0xfa, 0x64, 0x94, 0x7f, 0xa6, 0x85, 0x3e, 0x7c, 0xbf, + 0xc1, 0xa9, 0x55, 0xfd, 0x3f, 0x5c, 0x4d, 0x00, 0x66, 0xfa, 0x04, 0xce, 0x43, 0x35, 0xf5, 0x09, + 0x9c, 0x8b, 0xb2, 0xc5, 0xd6, 0x76, 0x06, 0xf3, 0x79, 0x38, 0x06, 0xba, 0xab, 0xa3, 0xa2, 0x10, + 0x91, 0x31, 0xee, 0x8d, 0x1e, 0x94, 0x11, 0xd6, 0x86, 0xd9, 0x0c, 0x28, 0xa4, 0x1d, 0xa8, 0x08, + 0xc5, 0xd2, 0x0e, 0x54, 0x88, 0x28, 0xc5, 0x64, 0x60, 0x40, 0xd9, 0xd2, 0x10, 0x8a, 0xbd, 0x77, + 0x0b, 0x2a, 0x54, 0xfa, 0x88, 0x1e, 0x51, 0x59, 0xd2, 0x87, 0x4b, 0x1b, 0x66, 0x33, 0xd5, 0x20, + 0xbd, 0x94, 0xa2, 0xf2, 0x93, 0x5e, 0x4a, 0x61, 0x29, 0x29, 0xb6, 0x94, 0xd7, 0x70, 0x3d, 0x85, + 0x5e, 0xa0, 0x5b, 0x89, 0x57, 0x43, 0x06, 0x6c, 0x31, 0x56, 0x0b, 0xfb, 0x53, 0xfe, 0x44, 0x60, + 0x21, 0x1f, 0xa3, 0x40, 0x1f, 0xc4, 0x5c, 0xa7, 0x18, 0x1e, 0x31, 0xee, 0xff, 0xd8, 0xb0, 0x54, + 0x68, 0x9f, 0xc0, 0xd5, 0x44, 0x7a, 0xad, 0x1d, 0x38, 0x0f, 0xf4, 0xd0, 0x0e, 0x9c, 0x0f, 0x38, + 0x84, 0xcb, 0xf0, 0x52, 0x88, 0x44, 0x98, 0xb4, 0xa3, 0x7b, 0xb9, 0xf3, 0x53, 0xb0, 0x84, 0xf1, + 0xc1, 0x8f, 0x8c, 0xca, 0xbe, 0x7b, 0xd3, 0xc9, 0x7a, 0x3c, 0x97, 0xcb, 0xc5, 0x06, 0xe2, 0xb9, + 0x5c, 0x41, 0x9e, 0x9f, 0x60, 0x9f, 0xcc, 0xba, 0xe3, 0xec, 0x73, 0x91, 0x80, 0x38, 0xfb, 0x82, + 0x84, 0x3d, 0x64, 0xdf, 0x85, 0xb9, 0x9c, 0x9c, 0x19, 0xc5, 0xfc, 0xbe, 0x28, 0xa9, 0x37, 0xee, + 0x8e, 0x1c, 0x93, 0x7d, 0x89, 0x65, 0xb3, 0x64, 0x1d, 0x81, 0x85, 0x89, 0xb9, 0x8e, 0xc0, 0xe2, + 0x24, 0x3b, 0x14, 0xb2, 0xf1, 0xf8, 0x35, 0x1f, 0xec, 0xd9, 0xed, 0x35, 0x87, 0xf4, 0x1f, 0xc9, + 0xcf, 0x4f, 0x09, 0x3d, 0x7d, 0x24, 0x59, 0x3c, 0x12, 0x3f, 0x7e, 0x3f, 0x3a, 0x25, 0xaa, 0x3d, + 0x68, 0xb7, 0xcb, 0x82, 0xf4, 0xf4, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x2b, 0x53, 0x99, + 0x49, 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 5138dfe6cb..3b886d858d 100644 --- a/proto/repository-service.proto +++ b/proto/repository-service.proto @@ -312,6 +312,13 @@ message GetArchiveRequest { Format format = 4; bytes path = 5; repeated bytes exclude = 6; + // If `elide_path` is true and `path` refers to a subdirectory, that + // subdirectory will be elided from archive entries. For example, if `dir` + // contains `README.md`, with `elide_path = false` the corresponding entry + // will be `dir/README.md`; with `elide_path = true`, the entry will be + // `README.md`. `elide_path` has no effect if `path` refers to the repository + // root. `elide_path = true` is not supported if `path` refers to a file. + bool elide_path = 7; } message GetArchiveResponse { diff --git a/ruby/proto/gitaly/repository-service_pb.rb b/ruby/proto/gitaly/repository-service_pb.rb index 399f0836fa..375c275e41 100644 --- a/ruby/proto/gitaly/repository-service_pb.rb +++ b/ruby/proto/gitaly/repository-service_pb.rb @@ -77,6 +77,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do optional :format, :enum, 4, "gitaly.GetArchiveRequest.Format" optional :path, :bytes, 5 repeated :exclude, :bytes, 6 + optional :elide_path, :bool, 7 end add_enum "gitaly.GetArchiveRequest.Format" do value :ZIP, 0 -- GitLab