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

git-p4: add config git-p4.pathEncoding

Browse Source 
Perforce keeps the encoding of a path as given by the originating OS.
Git expects paths encoded as UTF-8. Add a config to tell git-p4 what
encoding Perforce had used for the paths. This encoding is used to
transcode the paths to UTF-8. As an example, Perforce on Windows often
uses “cp1252” to encode path names.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Acked-by: Luke Diamand <luke@diamand.org>
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-03 11:14:07 +02:00 committed by Junio C Hamano
parent a17c56c056
commit a9e38359e3
3 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-p4.txt
View File

@ -510,6 +510,13 @@ git-p4.useClientSpec::
option '--use-client-spec'. See the "CLIENT SPEC" section above. option '--use-client-spec'. See the "CLIENT SPEC" section above.
This variable is a boolean, not the name of a p4 client. This variable is a boolean, not the name of a p4 client.
git-p4.pathEncoding::
Perforce keeps the encoding of a path as given by the originating OS.
Git expects paths encoded as UTF-8. Use this config to tell git-p4
what encoding Perforce had used for the paths. This encoding is used
to transcode the paths to UTF-8. As an example, Perforce on Windows
often uses “cp1252” to encode path names.
Submit variables Submit variables
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
git-p4.detectRenames:: git-p4.detectRenames::

11
git-p4.py
View File

@ -2213,6 +2213,17 @@ class P4Sync(Command, P4UserMap):
text = regexp.sub(r'$\1$', text) text = regexp.sub(r'$\1$', text)
contents = [ text ] contents = [ text ]
if gitConfig("git-p4.pathEncoding"):
relPath = relPath.decode(gitConfig("git-p4.pathEncoding")).encode('utf8', 'replace')
elif self.verbose:
try:
relPath.decode('ascii')
except:
print (
"Path with Non-ASCII characters detected and no path encoding defined. "
"Please check the encoding: %s" % relPath
)
self.gitStream.write("M %s inline %s\n" % (git_mode, relPath)) self.gitStream.write("M %s inline %s\n" % (git_mode, relPath))
# total length... # total length...

58
t/t9822-git-p4-path-encoding.sh Executable file
View File

@ -0,0 +1,58 @@
#!/bin/sh
test_description='Clone repositories with non ASCII paths'
. ./lib-git-p4.sh
UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
test_expect_success 'start p4d' '
start_p4d
'
test_expect_success 'Create a repo containing iso8859-1 encoded paths' '
(
cd "$cli" &&
ISO8859="$(printf "$ISO8859_ESCAPED")" &&
echo content123 >"$ISO8859" &&
p4 add "$ISO8859" &&
p4 submit -d "test commit"
)
'
test_expect_failure 'Clone auto-detects depot with iso8859-1 paths' '
git p4 clone --destination="$git" //depot &&
test_when_finished cleanup_git &&
(
cd "$git" &&
UTF8="$(printf "$UTF8_ESCAPED")" &&
echo "$UTF8" >expect &&
git -c core.quotepath=false ls-files >actual &&
test_cmp expect actual
)
'
test_expect_success 'Clone repo containing iso8859-1 encoded paths with git-p4.pathEncoding' '
test_when_finished cleanup_git &&
(
cd "$git" &&
git init . &&
git config git-p4.pathEncoding iso8859-1 &&
git p4 clone --use-client-spec --destination="$git" //depot &&
UTF8="$(printf "$UTF8_ESCAPED")" &&
echo "$UTF8" >expect &&
git -c core.quotepath=false ls-files >actual &&
test_cmp expect actual &&
echo content123 >expect &&
cat "$UTF8" >actual &&
test_cmp expect actual
)
'
test_expect_success 'kill p4d' '
kill_p4d
'
test_done