104932 2012-12-13 10:19:20 -0800 PrettyDiff.rb fails to render image diffs with Ruby 1.9.3p194 2012-12-30 13:23:13 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson aroben dbates dpranke eric webkit.review.bot zan oldest_to_newest 790726 0 mrobinson 2012-12-13 10:19:20 -0800 When rendering image diffs with Ruby 1.9.3p194, instead of the image diffs in the output, I see this: Exception raised during decoding git binary patch: invalid byte sequence in UTF-8 /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:680:in `match' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:680:in `match' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:680:in `read_checksum_from_png' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:589:in `block in initialize' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:589:in `collect' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:589:in `initialize' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:675:in `new' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:675:in `block in parse' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:675:in `collect' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:675:in `parse' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb:33:in `prettify' /home/martin/WebKit/Websites/bugs.webkit.org/PrettyPatch/prettify.rb:26:in `<main>' 791388 1 179433 mrobinson 2012-12-14 00:02:41 -0800 Created attachment 179433 Patch 791390 2 mrobinson 2012-12-14 00:03:11 -0800 See also: https://bugs.webkit.org/show_bug.cgi?id=91212 798077 3 179433 eric 2012-12-29 01:15:19 -0800 Comment on attachment 179433 Patch Seems reasonable. 798142 4 179433 webkit.review.bot 2012-12-29 08:25:42 -0800 Comment on attachment 179433 Patch Rejecting attachment 179433 from commit-queue. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', u'--status-host=queues.webkit.org', ..." exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: eidel']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Parsed 2 diffs from patch file(s). patching file Websites/bugs.webkit.org/ChangeLog patching file Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb Hunk #1 FAILED at 676. 1 out of 1 hunk FAILED -- saving rejects to file Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Eric Seidel']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/15591198 798257 5 mrobinson 2012-12-30 13:23:13 -0800 Committed r138585: <http://trac.webkit.org/changeset/138585> 179433 2012-12-14 00:02:41 -0800 2012-12-29 08:25:42 -0800 Patch bug-104932-20121214090000.patch text/plain 1770 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NTc2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBmN2RiOGU2YzU5ZmMzMDc2OTRhYWQ2NjA0OTcwMmRmNjEzZWFkNzBiLi5hOTA1NjI0ODRl NWY5NDVkZDE5YTg5NzA5MjJjYzY3ODg3NWE0YWM4IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdz LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0xMi0xMyAgTWFydGluIFJvYmluc29uICA8bXJv Ymluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUHJldHR5RGlmZi5yYiBmYWlscyB0byByZW5k ZXIgaW1hZ2UgZGlmZnMgd2l0aCBSdWJ5IDEuOS4zcDE5NAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0OTMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUnVieSAxLjkgYWRkZWQgdGhlIGNvbmNlcHQgb2Yg c3RyaW5nIGVuY29kaW5ncywgc28gdGhlIHVzZSBvZiBgbWF0Y2gnIHdpdGggYmluYXJ5IGRhdGEK KyAgICAgICAgdHJlYXRzIGl0IGFzIFVURi04LiBGb3JjaW5nIHRoZSBwbmdfYnl0ZXMgc3RyaW5n IHRvIGhhdmUgdGhlICJiaW5hcnkiIGVuY29kaW5nIGF2b2lkcworICAgICAgICB0aGlzIGVycm9y LgorCisgICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmI6IFVzZSBmb3JjZV9lbmNv ZGluZy4KKwogMjAxMi0xMi0wNiAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlldyBwYWdlIGlzIHN1cGVyIGZsYWtleSBub3cKZGlmZiAtLWdpdCBhL1dlYnNp dGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiBiL1dlYnNpdGVz L2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgppbmRleCBiMTRjMGU4 ZWYwZTI2MDgxOTMwNWIyNWI1NGQyODE5ODE0Yzk1Yjc4Li5mMTY0ZmRkMjQwMDNjOGNiOTAwZDYw MDJmOWE0ZjA4Njk0Y2UxMTMyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcv UHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKKysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3Jn L1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCkBAIC02NzYsNyArNjc2LDExIEBAIEVPRgogICAg ICAgICBlbmQKIAogICAgICAgICBkZWYgc2VsZi5yZWFkX2NoZWNrc3VtX2Zyb21fcG5nKHBuZ19i eXRlcykKLSAgICAgICAgICAgICNwbmdfYnl0ZXMuZm9yY2VfZW5jb2RpbmcoJ2JpbmFyeScpCisg ICAgICAgICAgICAjIFJ1YnkgMS45IGFkZGVkIHRoZSBjb25jZXB0IG9mIHN0cmluZyBlbmNvZGlu Z3MsIHNvIHRvIGF2b2lkIHRyZWF0aW5nIGJpbmFyeSBkYXRhIGFzIFVURi04LAorICAgICAgICAg ICAgIyB3ZSBjYW4gZm9yY2UgdGhlIGVuY29kaW5nIHRvIGJpbmFyeSBhdCB0aGlzIHBvaW50Lgor ICAgICAgICAgICAgaWYgUlVCWV9WRVJTSU9OID49ICIxLjkiCisgICAgICAgICAgICAgICAgcG5n X2J5dGVzLmZvcmNlX2VuY29kaW5nKCdiaW5hcnknKQorICAgICAgICAgICAgZW5kCiAgICAgICAg ICAgICBtYXRjaCA9IHBuZ19ieXRlcyAmJiBwbmdfYnl0ZXMubWF0Y2goL3RFWHRjaGVja3N1bVww KC57MzJ9KS9uKQogICAgICAgICAgICAgbWF0Y2ggPyBtYXRjaFsxXSA6IG5pbAogICAgICAgICBl bmQK