[PATCH v2] git-p4: improve path encoding verbose output

larsxschneider@gmail.com· Sep 16, 2015, 12:37 UTC · lore

From: Lars Schneider <larsxschneider@gmail.com>

Follow up patch for a9e38359 (git-p4: add config git-p4.pathEncoding, 2015-09-03) which is already on 'next'.

diff to v1 (wrongly called v7 in "[PATCH v7] git-p4: add config git-p4.pathEncoding")
* make path encoding for utf-8 default case more explicit (thanks Junio!)
* improve commit message (thanks Luke!)

Cheers, Lars

Lars Schneider (1):
  git-p4: improve path encoding verbose output

 git-p4.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

-- 2.5.1

larsxschneider@gmail.com· Sep 16, 2015, 12:37 UTC · re: larsxschneider@gmail.com · lore

From: Lars Schneider <larsxschneider@gmail.com>

If a path with non-ASCII characters is detected then print the encoding and the encoded string in verbose mode.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
 git-p4.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Show changes to git-p4.py +9 −10

diff --git a/git-p4.py b/git-p4.py
index d45cf2b..e7510a9 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')
+            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))

-- 
2.5.1

v2git-p4: improve path encoding verbose output