25881 2009-05-19 19:03:08 -0700 Attachment causes PrettyPatch to fail 2009-05-19 21:45:41 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED https://bugs.webkit.org/attachment.cgi?id=30488&action=prettypatch P2 Normal --- 1 eric webkit-unassigned aroben mrowe oldest_to_newest 122003 0 eric 2009-05-19 19:03:08 -0700 Attachment causes PrettyPatch to fail ./PrettyPatch/PrettyPatch.rb:72:in `split': can't convert nil into String (TypeError) from ./PrettyPatch/PrettyPatch.rb:72:in `find_url_and_path' from ./PrettyPatch/PrettyPatch.rb:85:in `linkifyFilename' from ./PrettyPatch/PrettyPatch.rb:203:in `to_html' from ./PrettyPatch/PrettyPatch.rb:14:in `prettify' from ./PrettyPatch/PrettyPatch.rb:14:in `collect' from ./PrettyPatch/PrettyPatch.rb:14:in `prettify' from PrettyPatch/prettify.rb:26 122005 1 eric 2009-05-19 19:19:29 -0700 Reduction: diff --git "a/LayoutTests/editing/pasteboard/resources/File With Spaces! For Dra\314\210gging?.gif" "b/LayoutTests/editing/pasteboard/resources/File With Spaces! For Dra\314\210gging?.gif" new file mode 100644 index 0000000..55844c8 Binary files /dev/null and "b/LayoutTests/editing/pasteboard/resources/File With Spaces! For Dra\314\210gging?.gif" differ The quotes are throwing the diff parsing off. Patch coming up. 122009 2 30489 eric 2009-05-19 19:23:26 -0700 Created attachment 30489 Make PrettyPatch understand quoted filenames in git diffs 2 files changed, 10 insertions(+), 1 deletions(-) 122013 3 30489 aroben 2009-05-19 19:48:48 -0700 Comment on attachment 30489 Make PrettyPatch understand quoted filenames in git diffs I guess this will allow mismatched quotes through (i.e., a/foo"), but that's probably fine. r=me 122036 4 eric 2009-05-19 20:56:30 -0700 Landed as r43884. Thanks! 122037 5 eric 2009-05-19 20:58:09 -0700 http://trac.webkit.org/changeset/43884 122038 6 eric 2009-05-19 21:03:23 -0700 Interesting. Well, so the fix worked, but leaves a trailing " in the filename. It's OK, but less than ideal. I could find a way to use: (")? and \1 I guess. 122054 7 aroben 2009-05-19 21:45:41 -0700 (In reply to comment #6) > Interesting. Well, so the fix worked, but leaves a trailing " in the filename. > It's OK, but less than ideal. I could find a way to use: > > (")? and \1 I guess. Assuming the filename can't contain a quote, you could replace (.+) with ([^"]+) 30489 2009-05-19 19:23:26 -0700 2009-05-19 19:48:48 -0700 Make PrettyPatch understand quoted filenames in git diffs Make-PrettyPatch-understand-quoted-filenames-in-git-diffs.patch text/plain 983 eric NmFkNWMwNWYxZWEzNGQzOWYzNjhkNGFhYzA0MjBhYmU0ZGNhOTUxZQpkaWZmIC0tZ2l0IGEvQnVn c1NpdGUvQ2hhbmdlTG9nIGIvQnVnc1NpdGUvQ2hhbmdlTG9nCmluZGV4IGI3MzVlZjAuLjk0MDBk NTIgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL0NoYW5nZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0wNS0xOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtp dC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TWFrZSBQcmV0dHlQYXRjaCB1bmRlcnN0YW5kIHF1b3RlZCBmaWxlbmFtZXMgaW4gZ2l0IGRpZmZz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4ODEK KworICAgICAgICAqIFByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiOgorCiAyMDA5LTA1LTE1ICBT aW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENhcnJ5aW5n IGZvcndhcmRzIERhcmluIEFkbGVyJ3MgcnViYmVyIHN0YW1wCmRpZmYgLS1naXQgYS9CdWdzU2l0 ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0 eVBhdGNoLnJiCmluZGV4IGUxOTFhNTEuLjViYjQ4MWMgMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL1By ZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCisrKyBiL0J1Z3NTaXRlL1ByZXR0eVBhdGNoL1ByZXR0 eVBhdGNoLnJiCkBAIC0yOSw3ICsyOSw3IEBAIHB1YmxpYwogcHJpdmF0ZQogICAgIERJRkZfSEVB REVSX0ZPUk1BVFMgPSBbCiAgICAgICAgIC9eSW5kZXg6ICguKilccj8kLywKLSAgICAgICAgL15k aWZmIC0tZ2l0IGFcLy4rIGJcLyguKylccj8kLywKKyAgICAgICAgL15kaWZmIC0tZ2l0ICI/YVwv LisiPyAiP2JcLyguKykiP1xyPyQvLAogICAgICAgICAvXlwrXCtcKyAoW15cdF0rKShcdC4qKT9c cj8kLwogICAgIF0KIAo=