Merge branch 'ls/p4-translation-failure'

Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.

* ls/p4-translation-failure:
git-p4: handle "Translation of file content failed"
git-p4: add test case for "Translation of file content failed" error

diff --git a/git-p4.py b/git-p4.py
index 215f556c13a72cf7b0cb49ae2a651d43a0b2623b..4915e83d7655fbd948b958c7bb9e48582a6963fc 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -134,13 +134,11 @@ def read_pipe(c, ignore_error=False):
         sys.stderr.write('Reading pipe: %s\n' % str(c))
 
     expand = isinstance(c,basestring)
-    p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
-    pipe = p.stdout
-    val = pipe.read()
-    if p.wait() and not ignore_error:
-        die('Command failed: %s' % str(c))
-
-    return val
+    p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
+    (out, err) = p.communicate()
+    if p.returncode != 0 and not ignore_error:
+        die('Command failed: %s\nError: %s' % (str(c), err))
+    return out
 
 def p4_read_pipe(c, ignore_error=False):
     real_cmd = p4_build_cmd(c)
@@ -2193,10 +2191,17 @@ def streamOneP4File(self, file, contents):
             # them back too.  This is not needed to the cygwin windows version,
             # just the native "NT" type.
             #
-            text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ])
-            if p4_version_string().find("/NT") >= 0:
-                text = text.replace("\r\n", "\n")
-            contents = [ text ]
+            try:
+                text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (file['depotFile'], file['change'])])
+            except Exception as e:
+                if 'Translation of file content failed' in str(e):
+                    type_base = 'binary'
+                else:
+                    raise e
+            else:
+                if p4_version_string().find('/NT') >= 0:
+                    text = text.replace('\r\n', '\n')
+                contents = [ text ]
 
         if type_base == "apple":
             # Apple filetype files will be streamed as a concatenation of

diff --git a/t/t9825-git-p4-handle-utf16-without-bom.sh b/t/t9825-git-p4-handle-utf16-without-bom.sh
new file mode 100755 (executable)
index 0000000..1551845
--- /dev/null
+++ b/t/t9825-git-p4-handle-utf16-without-bom.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+test_description='git p4 handling of UTF-16 files without BOM'
+
+. ./lib-git-p4.sh
+
+UTF16="\227\000\227\000"
+
+test_expect_success 'start p4d' '
+       start_p4d
+'
+
+test_expect_success 'init depot with UTF-16 encoded file and artificially remove BOM' '
+       (
+               cd "$cli" &&
+               printf "$UTF16" >file1 &&
+               p4 add -t utf16 file1 &&
+               p4 submit -d "file1"
+       ) &&
+
+       (
+               cd db &&
+               p4d -jc &&
+               # P4D automatically adds a BOM. Remove it here to make the file invalid.
+               sed -e "\$d" depot/file1,v >depot/file1,v.new &&
+               mv depot/file1,v.new depot/file1,v &&
+               printf "@$UTF16@" >>depot/file1,v &&
+               p4d -jrF checkpoint.1
+       )
+'
+
+test_expect_success 'clone depot with invalid UTF-16 file in verbose mode' '
+       git p4 clone --dest="$git" --verbose //depot &&
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               printf "$UTF16" >expect &&
+               test_cmp_bin expect file1
+       )
+'
+
+test_expect_failure 'clone depot with invalid UTF-16 file in non-verbose mode' '
+       git p4 clone --dest="$git" //depot
+'
+
+test_expect_success 'kill p4d' '
+       kill_p4d
+'
+
+test_done