{"thread":{"id":"40363","subject":"[PATCH v2] git-p4: improve path encoding verbose output","startedAt":"2015-09-16T12:37:03Z","lastAt":"2015-09-16T12:37:04Z","messageCount":2,"participants":["larsxschneider@gmail.com"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"270121","messageId":"1442407024-33516-1-git-send-email-larsxschneider@gmail.com","threadId":"40363","inReplyTo":null,"subject":"[PATCH v2] git-p4: improve path encoding verbose output","fromName":"","fromEmail":"larsxschneider@gmail.com","sentAt":"2015-09-16T12:37:03Z","receivedAt":"2015-09-16T12:37:03Z","isPatch":true,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"From: Lars Schneider <larsxschneider@gmail.com>\n\nFollow up patch for a9e38359 (git-p4: add config git-p4.pathEncoding,\n2015-09-03) which is already on 'next'.\n\ndiff to v1 (wrongly called v7 in \"[PATCH v7] git-p4: add config git-p4.pathEncoding\")\n* make path encoding for utf-8 default case more explicit (thanks Junio!)\n* improve commit message (thanks Luke!)\n\nCheers,\nLars\n\nLars Schneider (1):\n  git-p4: improve path encoding verbose output\n\n git-p4.py | 19 +++++++++----------\n 1 file changed, 9 insertions(+), 10 deletions(-)\n\n--\n2.5.1\n"},{"id":"270122","messageId":"1442407024-33516-2-git-send-email-larsxschneider@gmail.com","threadId":"40363","inReplyTo":"1442407024-33516-1-git-send-email-larsxschneider@gmail.com","subject":"[PATCH v2] git-p4: improve path encoding verbose output","fromName":"","fromEmail":"larsxschneider@gmail.com","sentAt":"2015-09-16T12:37:04Z","receivedAt":"2015-09-16T12:37:04Z","isPatch":true,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"From: Lars Schneider <larsxschneider@gmail.com>\n\nIf a path with non-ASCII characters is detected then print the\nencoding and the encoded string in verbose mode.\n\nSigned-off-by: Lars Schneider <larsxschneider@gmail.com>\n---\n git-p4.py | 19 +++++++++----------\n 1 file changed, 9 insertions(+), 10 deletions(-)\n\ndiff --git a/git-p4.py b/git-p4.py\nindex d45cf2b..e7510a9 100755\n--- a/git-p4.py\n+++ b/git-p4.py\n@@ -2220,16 +2220,15 @@ class P4Sync(Command, P4UserMap):\n             text = regexp.sub(r'$\\1$', text)\n             contents = [ text ]\n \n-        if gitConfig(\"git-p4.pathEncoding\"):\n-            relPath = relPath.decode(gitConfig(\"git-p4.pathEncoding\")).encode('utf8', 'replace')\n-        elif self.verbose:\n-            try:\n-                relPath.decode('ascii')\n-            except:\n-                print (\n-                    \"Path with Non-ASCII characters detected and no path encoding defined. \"\n-                    \"Please check the encoding: %s\" % relPath\n-                )\n+        try:\n+            relPath.decode('ascii')\n+        except:\n+            encoding = 'utf8'\n+            if gitConfig('git-p4.pathEncoding'):\n+                encoding = gitConfig('git-p4.pathEncoding')\n+            relPath = relPath.decode(encoding).encode('utf8', 'replace')\n+            if self.verbose:\n+                print 'Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, relPath)\n \n         self.gitStream.write(\"M %s inline %s\\n\" % (git_mode, relPath))\n \n-- \n2.5.1\n"}]}