| Summary: | PrettyPatch.pretty_diff("") should not hang | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> | ||||||
| Component: | New Bugs | Assignee: | Nobody <webkit-unassigned> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | abarth, cjerdonek, commit-queue, dpranke, ojan | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Other | ||||||||
| OS: | OS X 10.5 | ||||||||
| Bug Depends on: | |||||||||
| Bug Blocks: | 38505 | ||||||||
| Attachments: |
|
||||||||
|
Description
Eric Seidel (no email)
2010-05-04 15:48:34 PDT
Created attachment 55066 [details]
Patch
Comment on attachment 55066 [details]
Patch
Can we just make the Mac port set _pretty_patch_available to false instead of returning a dummy text string?
That will cause it to return a different dummy text string, but that's totally doable too. Dirk the change you're suggesting would look like this:
chromium_mac.py:
import base
__init__...
# FIXME: Remove this hack.
_log.warn("Disabling pretty patch support due to bug 38552");
base._pretty_patch_available = False
I'm happy to make such. But I think it's kinda a wash. They're both pretty hackish.
Ah, I see. It would be nice if there was an overridable way of determining if pretty patch was available, but there isn't. Also, I see that what you return from pretty_diff_text() - an error string -- is different than what we return from wdiff_text() -- an empty string -- if it isn't available. So your first change is fine. Just going to fix the pretty_diff hang for now. Created attachment 55085 [details]
Patch
Comment on attachment 55085 [details]
Patch
LGTM (although I'm not a reviewer).
Comment on attachment 55085 [details]
Patch
Looks like a nice fix.
Comment on attachment 55085 [details] Patch Clearing flags on attachment: 55085 Committed r58803: <http://trac.webkit.org/changeset/58803> All reviewed patches have been landed. Closing bug. |