# [PATCH] git-p4: fix syncing file types with pattern 2 messages from 2020-12-23 to 2020-12-23. Participants: Daniel Levin via GitGitGadget. Thread: https://gitlist.dev/t/54873 ## Daniel Levin via GitGitGadget, 2020-12-23 12:48 Subject: [PATCH] git-p4: fix syncing file types with pattern Message-ID: URL: https://gitlist.dev/e/pull.823.git.1608727731733.gitgitgadget%40gmail.com ``` From: Daniel Levin Example of pattern file type: text+k Text filtered through the p4 pattern regexp must be converted from string back to bytes, otherwise 'data' command for the fast-import will receive extra invalid characters, followed by the fast-import process error. CC: Yang Zhao Signed-off-by: Daniel Levin --- git-p4: fix syncing file types with pattern Example of pattern file type: text+k Text filtered through the p4 pattern regexp must be converted from string back to bytes, otherwise 'data' command for the fast-import will receive extra invalid characters, followed by the fast-import process error. Signed-off-by: Daniel Levin dendy.ua@gmail.com Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-823%2Fdendy%2Fp4-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-823/dendy/p4-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/823 git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index 4433ca53de7..90b02f6b22c 100755 --- a/git-p4.py +++ b/git-p4.py @@ -3031,7 +3031,7 @@ def streamOneP4File(self, file, contents): regexp = re.compile(pattern, re.VERBOSE) text = ''.join(decode_text_stream(c) for c in contents) text = regexp.sub(r'$\1$', text) - contents = [ text ] + contents = [ encode_text_stream(text) ] if self.largeFileSystem: (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents) base-commit: 898f80736c75878acc02dc55672317fcc0e0a5a6 -- gitgitgadget ``` ## Daniel Levin via GitGitGadget, 2020-12-23 14:37 Subject: [PATCH v2] git-p4: fix syncing file types with pattern Message-ID: URL: https://gitlist.dev/e/pull.823.v2.git.1608734248194.gitgitgadget%40gmail.com In-Reply-To: ``` From: Daniel Levin Example of pattern file type: text+k Text filtered through the p4 pattern regexp must be converted from string back to bytes, otherwise 'data' command for the fast-import will receive extra invalid characters, followed by the fast-import process error. CC: Yang Zhao Signed-off-by: Daniel Levin --- git-p4: fix syncing file types with pattern Example of pattern file type: text+k Text filtered through the p4 pattern regexp must be converted from string back to bytes, otherwise 'data' command for the fast-import will receive extra invalid characters, followed by the fast-import process error. Signed-off-by: Daniel Levin dendy.ua@gmail.com Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-823%2Fdendy%2Fp4-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-823/dendy/p4-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/823 Range-diff vs v1: 1: 109fdb6df91 ! 1: 78729f51f3b git-p4: fix syncing file types with pattern @@ ## Metadata ## -Author: Daniel Levin +Author: Daniel Levin ## Commit message ## git-p4: fix syncing file types with pattern git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index 4433ca53de7..90b02f6b22c 100755 --- a/git-p4.py +++ b/git-p4.py @@ -3031,7 +3031,7 @@ def streamOneP4File(self, file, contents): regexp = re.compile(pattern, re.VERBOSE) text = ''.join(decode_text_stream(c) for c in contents) text = regexp.sub(r'$\1$', text) - contents = [ text ] + contents = [ encode_text_stream(text) ] if self.largeFileSystem: (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents) base-commit: 898f80736c75878acc02dc55672317fcc0e0a5a6 -- gitgitgadget ```