Bug 25881

Summary: Attachment causes PrettyPatch to fail
Product: WebKit Reporter: Eric Seidel (no email) <eric>
Component: Tools / TestsAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: aroben, mrowe
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Mac   
OS: OS X 10.5   
URL: https://bugs.webkit.org/attachment.cgi?id=30488&action=prettypatch
Attachments:
Description Flags
Make PrettyPatch understand quoted filenames in git diffs aroben: review+

Eric Seidel (no email)
Reported 2009-05-19 19:03:08 PDT
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
Attachments
Make PrettyPatch understand quoted filenames in git diffs (983 bytes, patch)
2009-05-19 19:23 PDT, Eric Seidel (no email) 		aroben: review+
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Eric Seidel (no email)
Comment 1 2009-05-19 19:19:29 PDT
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.
Eric Seidel (no email)
Comment 2 2009-05-19 19:23:26 PDT
Created attachment 30489 [details] Make PrettyPatch understand quoted filenames in git diffs 2 files changed, 10 insertions(+), 1 deletions(-)
Adam Roben (:aroben)
Comment 3 2009-05-19 19:48:48 PDT
Comment on attachment 30489 [details] 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
Eric Seidel (no email)
Comment 4 2009-05-19 20:56:30 PDT
Landed as r43884. Thanks!
Eric Seidel (no email)
Comment 5 2009-05-19 20:58:09 PDT
http://trac.webkit.org/changeset/43884
Eric Seidel (no email)
Comment 6 2009-05-19 21:03:23 PDT
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.
Adam Roben (:aroben)
Comment 7 2009-05-19 21:45:41 PDT
(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 ([^"]+)
Note You need to log in before you can comment on or make changes to this bug.