Status: Untriaged Owner: ---- Labels: Type-Bug Pri-3 OS-All Area-Infrastructure
New issue 28967 by sgje...@chromium.org: gcl does not deal with non-ASCII characters http://code.google.com/p/chromium/issues/detail?id=28967 Whilt merging WebKit revision 51407 into the chrome 4 branch using drover I experienced the following error related to non-ASCII characters in the description generated by gcl. --- Merging (from foreign repository) r51407 into 'WebCore/bindings/v8': U WebCore/bindings/v8/V8Proxy.h U WebCore/bindings/v8/V8Proxy.cpp svn merge -N -r 51406:51407 --ignore-ancestry http://svn.webkit.org/repository/webkit/trunk/webc...@51407 ./WebCore Conflict discovered in 'WebCore/ChangeLog'. Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: e Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, (h) help for more options: r --- Merging (from foreign repository) r51407 into 'WebCore': U WebCore/ChangeLog Merge 51407 - 20091126 Søren Gjesse <sgje...@chromium.org> Reviewed by Pavel Feldman. [V8] Avoid using JavaScript objects as context data https://bugs.webkit.org/show_bug.cgi?id=31873 Change the context "data" from a JavaScript object holding the two properties type and value to a string holding type and value separated by a comma. * bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::setInjectedScriptContextDebugId): (WebCore::V8Proxy::setContextDebugId): (WebCore::V8Proxy::contextDebugId): tbr=e...@webkit.org ---All lines above this line become the description. ---Repository Root: /usr/local/google/home/sgjesse/chrome/drover/webkit/working/249 ---Paths in this changelist (51407): Traceback (most recent call last): File "/home/sgjesse/depot_tools/gcl.py", line 1293, in <module> sys.exit(main()) File "/home/sgjesse/depot_tools/gcl.py", line 1260, in main Change(change_info, argv[3:]) File "/home/sgjesse/depot_tools/gcl.py", line 1033, in Change separator2) UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 25: ordinal not in range(128) It turned out that I had out the character ø (ø) in the WebKit/WebCore/ChangeLog (or rather the WebKit tool for generating the change log entry had done that). The encoding of the change log is UTF-8, which is revealed in some editors. I made the following small change to gcl.py to make gcl ignore the default description making it possible for me to enter it by handl and get the merge through. Index: /home/sgjesse/depot_tools/gcl.py =================================================================== --- /home/sgjesse/depot_tools/gcl.py (revision 33276) +++ /home/sgjesse/depot_tools/gcl.py (working copy) @@ -1021,8 +1021,9 @@ "---Repository Root: " + change_info.GetLocalRoot() + "\n" "---Paths in this changelist (" + change_info.name + "):\n") separator2 = "\n\n---Paths modified but not in any changelist:\n\n" - text = (description + separator1 + '\n' + + text = ('xxx' + separator1 + '\n' + '\n'.join([f[0] + f[1] for f in change_info.GetFiles()])) + print text if change_info.Exists(): text += (separator2 + -- You received this message because you are listed in the owner or CC fields of this issue, or because you starred this issue. You may adjust your issue notification preferences at: http://code.google.com/hosting/settings -- Automated mail from issue updates at http://crbug.com/ Subscription options: http://groups.google.com/group/chromium-bugs
