From a9e38359e356de7d6397395bdde8af61440262d0 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Thu, 3 Sep 2015 11:14:07 +0200 Subject: git-p4: add config git-p4.pathEncoding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Luke Diamand Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- git-p4.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'git-p4.py') diff --git a/git-p4.py b/git-p4.py index 073f87bbfd..b1ad86de7f 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2213,6 +2213,17 @@ class P4Sync(Command, P4UserMap): text = regexp.sub(r'$\1$', 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)) # total length... -- cgit v1.2.1