diff mbox series

[v2] git-p4: fix syncing file types with pattern

Message ID pull.823.v2.git.1608734248194.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 8fce17d9982b23a9b916adfcb741709b7aa4267f
Headers show
Series [v2] git-p4: fix syncing file types with pattern | expand

Commit Message

Daniel Levin Dec. 23, 2020, 2:37 p.m. UTC 
From: Daniel Levin <dendy.ua@gmail.com>

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 <yang.zhao@skyboxlabs.com>
Signed-off-by: Daniel Levin <dendy.ua@gmail.com>
---
    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 <dlevin@roku.com>
     +Author: Daniel Levin <dendy.ua@gmail.com>
      
       ## Commit message ##
          git-p4: fix syncing file types with pattern


 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 898f80736c75878acc02dc55672317fcc0e0a5a6
diff mbox series

Patch

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)