On 14/09/15 18:10, larsxschnei...@gmail.com wrote:
From: Lars Schneider <larsxschnei...@gmail.com>
If a path with non-ASCII characters is detected then print always the
s/print always/print/
encoding and the encoded string in verbose mode.
Signed-off-by: Lars Schneider <larsxschnei...@gmail.com>
---
git-p4.py | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index d45cf2b..da25d3f 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2220,16 +2220,15 @@ 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
- )
+ try:
+ relPath.decode('ascii')
+ except:
+ encoding = 'utf8'
+ if gitConfig('git-p4.pathEncoding'):
+ encoding = gitConfig('git-p4.pathEncoding')
It would be better to query this once at startup. Otherwise we're
potentially forking "git config" twice per file which on a large repo
could become significant. Make it an instance variable perhaps?
+ relPath = relPath.decode(encoding).encode('utf8', 'replace')
+ if self.verbose:
+ print 'Path with non-ASCII characters detected. Used %s to
encode: %s ' % (encoding, relPath)
self.gitStream.write("M %s inline %s\n" % (git_mode, relPath))
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
