undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: handle "Translation of file content failed"

Browse Source 
A P4 repository can get into a state where it contains a file with
type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4
attempts to retrieve the file then the process crashes with a
"Translation of file content failed" error.

More info here: http://answers.perforce.com/articles/KB/3117

Fix this by detecting this error and retrieving the file as binary
instead. The result in Git is the same.

Known issue: This works only if git-p4 is executed in verbose mode.
In normal mode no exceptions are thrown and git-p4 just exits.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Schneider 2015-09-21 12:01:41 +02:00 committed by Junio C Hamano
parent fe18a0f279
commit 1f5f390711
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
git-p4.py
View File

@ -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 @@ class P4Sync(Command, P4UserMap):
# 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

2
t/t9825-git-p4-handle-utf16-without-bom.sh
View File

@ -29,7 +29,7 @@ test_expect_success 'init depot with UTF-16 encoded file and artificially remove
)
'
test_expect_failure 'clone depot with invalid UTF-16 file in verbose mode' '
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 &&
(