26210 2009-06-05 01:09:24 -0700 PrettyPatch should display added images inline 2009-06-09 15:52:09 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned aroben ddkilzer oldest_to_newest 124492 0 eric 2009-06-05 01:09:24 -0700 PrettyPatch should display added images inline Cause it'd be cool? 124493 1 30996 eric 2009-06-05 01:11:23 -0700 Created attachment 30996 Hackish first pass, currently svn only, png only 1 files changed, 16 insertions(+), 2 deletions(-) 124494 2 30996 eric 2009-06-05 01:11:53 -0700 Comment on attachment 30996 Hackish first pass, currently svn only, png only I didn't actually mean to mark this for review. Old habits... 124495 3 eric 2009-06-05 01:15:24 -0700 I guess this will have to be SVN only for now. git-send-bugzilla patches don't include image data: https://bugs.webkit.org/attachment.cgi?id=30012 124496 4 30997 eric 2009-06-05 01:19:02 -0700 Created attachment 30997 Add support for inline display of png files from svn-create-patch patches 2 files changed, 28 insertions(+), 2 deletions(-) 124514 5 aroben 2009-06-05 07:33:14 -0700 (In reply to comment #3) > I guess this will have to be SVN only for now. git-send-bugzilla patches don't > include image data: > https://bugs.webkit.org/attachment.cgi?id=30012 If git-send-bugzilla works like git-send-email, then it just sends whatever is in the .patch file generated by git-format-patch. So git-send-bugzilla has no opinion about image data. You just need to pass --binary to git-format-patch. 124515 6 30997 aroben 2009-06-05 07:38:35 -0700 Comment on attachment 30997 Add support for inline display of png files from svn-create-patch patches > +.image { > + border: 2px solid black; > +} Why not just key this off the img tag? > + > .context, .context .lineNumber { > color: #849; > background-color: #fef; > @@ -191,17 +197,25 @@ EOF > break > when BINARY_FILE_MARKER_FORMAT > @binary = true > + if (IMAGE_FILE_MARKER_FORMAT.match(lines[i + 1])) then This will probably do something bad on the last iteration of the loop when i == lines.length - 1. But maybe we know that isn't the case given that we just saw a binary file marker? > + lines_with_contents = lines[startOfSections...lines.length] > + @sections = DiffSection.parse(lines_with_contents) unless @binary > + @image_url = "data:image/png;base64," + lines_with_contents.join if @image I'm surprised you didn't have to chomp the newlines off each line. > + if @image then > + str += "<img class='image' src='" + @image_url + "' />" No need for the space or the slash before the right angle bracket. r=me 125029 7 bfulgham 2009-06-09 15:47:43 -0700 Landed in @r44547. 125030 8 zimmermann 2009-06-09 15:52:09 -0700 Wow, this is so useful, thanks for that! :-) 30996 2009-06-05 01:11:23 -0700 2009-06-05 01:19:15 -0700 Hackish first pass, currently svn only, png only Hackish-first-pass-currently-svn-only-png-only.patch text/plain 2033 eric ZTNmMzU3YjllODYyZmViZDEyY2E1NzA0ODU2M2E3NGFkMjFlYmU0YQpkaWZmIC0tZ2l0IGEvQnVn c1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIgYi9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9Q cmV0dHlQYXRjaC5yYgppbmRleCA1YmI0ODFjLi43Mzg1ZjY1IDEwMDY0NAotLS0gYS9CdWdzU2l0 ZS9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgorKysgYi9CdWdzU2l0ZS9QcmV0dHlQYXRjaC9Q cmV0dHlQYXRjaC5yYgpAQCAtNDAsNiArNDAsOCBAQCBwcml2YXRlCiAKICAgICBCSU5BUllfRklM RV9NQVJLRVJfRk9STUFUID0gL14oPzpDYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBi aW5hcnkgdHlwZS4pfCg/OkdJVCBiaW5hcnkgcGF0Y2gpJC8KIAorICAgIElNQUdFX0ZJTEVfTUFS S0VSX0ZPUk1BVCA9IC9ec3ZuOm1pbWUtdHlwZSA9IGltYWdlXC9wbmckLworCiAgICAgU1RBUlRf T0ZfU0VDVElPTl9GT1JNQVQgPSAvXkBAIC0oXGQrKSg/OixcZCspPyBcKyhcZCspKD86LFxkKyk/ IEBAXHMqKC4qKS8KIAogICAgIFNUQVJUX09GX0VYVEVOVF9TVFJJTkcgPSAiJWMiICUgMApAQCAt MTQyLDYgKzE0NCwxMCBAQCBoMSA6aG92ZXIgewogICAgIHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsK IH0KIAorLmltYWdlIHsKKyAgICBib3JkZXI6IDJweCBzb2xpZCBibGFjazsKK30KKwogLmNvbnRl eHQsIC5jb250ZXh0IC5saW5lTnVtYmVyIHsKICAgICBjb2xvcjogIzg0OTsKICAgICBiYWNrZ3Jv dW5kLWNvbG9yOiAjZmVmOwpAQCAtMTkxLDE3ICsxOTcsMjUgQEAgRU9GCiAgICAgICAgICAgICAg ICAgICAgIGJyZWFrCiAgICAgICAgICAgICAgICAgd2hlbiBCSU5BUllfRklMRV9NQVJLRVJfRk9S TUFUCiAgICAgICAgICAgICAgICAgICAgIEBiaW5hcnkgPSB0cnVlCisgICAgICAgICAgICAgICAg ICAgIGlmIChJTUFHRV9GSUxFX01BUktFUl9GT1JNQVQubWF0Y2gobGluZXNbaSArIDFdKSkgdGhl bgorICAgICAgICAgICAgICAgICAgICAgICAgQGltYWdlID0gdHJ1ZQorICAgICAgICAgICAgICAg ICAgICAgICAgc3RhcnRPZlNlY3Rpb25zID0gaSArIDIKKyAgICAgICAgICAgICAgICAgICAgZW5k CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICAgICAgZW5kCiAgICAgICAg ICAgICBlbmQKLSAgICAgICAgICAgIEBzZWN0aW9ucyA9IERpZmZTZWN0aW9uLnBhcnNlKGxpbmVz W3N0YXJ0T2ZTZWN0aW9ucy4uLmxpbmVzLmxlbmd0aF0pIHVubGVzcyBAYmluYXJ5CisgICAgICAg ICAgICBsaW5lc193aXRoX2NvbnRlbnRzID0gbGluZXNbc3RhcnRPZlNlY3Rpb25zLi4ubGluZXMu bGVuZ3RoXQorICAgICAgICAgICAgQHNlY3Rpb25zID0gRGlmZlNlY3Rpb24ucGFyc2UobGluZXNf d2l0aF9jb250ZW50cykgdW5sZXNzIEBiaW5hcnkKKyAgICAgICAgICAgIEBpbWFnZV91cmwgPSAi ZGF0YTppbWFnZS9wbmc7YmFzZTY0LCIgKyBsaW5lc193aXRoX2NvbnRlbnRzLmpvaW4gaWYgQGlt YWdlCiAgICAgICAgICAgICBuaWwKICAgICAgICAgZW5kCiAKICAgICAgICAgZGVmIHRvX2h0bWwK ICAgICAgICAgICAgIHN0ciA9ICI8ZGl2IGNsYXNzPSdGaWxlRGlmZic+XG4iCiAgICAgICAgICAg ICBzdHIgKz0gIjxoMT4je1ByZXR0eVBhdGNoLmxpbmtpZnlGaWxlbmFtZShAZmlsZW5hbWUpfTwv aDE+XG4iCi0gICAgICAgICAgICBpZiBAYmluYXJ5IHRoZW4KKyAgICAgICAgICAgIGlmIEBpbWFn ZSB0aGVuCisgICAgICAgICAgICAgICAgc3RyICs9ICI8aW1nIGNsYXNzPSdpbWFnZScgc3JjPSci ICsgQGltYWdlX3VybCArICInIC8+IgorICAgICAgICAgICAgZWxzaWYgQGJpbmFyeSB0aGVuCiAg ICAgICAgICAgICAgICAgc3RyICs9ICI8c3BhbiBjbGFzcz0ndGV4dCc+QmluYXJ5IGZpbGUsIG5v dGhpbmcgdG8gc2VlIGhlcmU8L3NwYW4+IgogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAg ICAgIHN0ciArPSBAc2VjdGlvbnMuY29sbGVjdHsgfHNlY3Rpb258IHNlY3Rpb24udG9faHRtbCB9 LmpvaW4oIjxicj5cbiIpIHVubGVzcyBAc2VjdGlvbnMubmlsPwo= 30997 2009-06-05 01:19:02 -0700 2009-06-05 07:38:35 -0700 Add support for inline display of png files from svn-create-patch patches Add-support-for-inline-display-of-png-files-from-svn-create-patch-patches.patch text/plain 2703 eric MTJiOGY5NTRmYWUwYTBkYzJhNDFhNzBlOGE4ODkwNThkOTUyNTM5NgpkaWZmIC0tZ2l0IGEvQnVn c1NpdGUvQ2hhbmdlTG9nIGIvQnVnc1NpdGUvQ2hhbmdlTG9nCmluZGV4IDMwODhjMTAuLmVkZTgz ODggMTAwNjQ0Ci0tLSBhL0J1Z3NTaXRlL0NoYW5nZUxvZworKysgYi9CdWdzU2l0ZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNi0wNSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtp dC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIHN1cHBvcnQgZm9yIGRpc3BsYXlpbmcgYWRkZWQgcG5nIGZpbGVzIGluIFByZXR0eVBhdGNo IGRpZmZzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NjIxMAorCisgICAgICAgIEN1cnJlbnRseSB0aGlzIGlzIFNWTiBvbmx5IChnaXQtc2VuZC1idWd6 aWxsYSBwYXRjaGVzIGV4Y2x1ZGUgYmluYXJ5IGRhdGEpCisgICAgICAgIGFuZCBvbmx5IHdvcmtz IGZvciBQTkcgZmlsZXMgYnV0IGNvdWxkIGVhc2lseSBiZSBtYWRlIHRvIHdvcmsgZm9yIG90aGVy IGltYWdlcyBhcyBuZWVkZWQuCisKKyAgICAgICAgKiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5y YjoKKwogMjAwOS0wNS0xOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL0J1Z3NTaXRlL1ByZXR0eVBh dGNoL1ByZXR0eVBhdGNoLnJiIGIvQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIK aW5kZXggNWJiNDgxYy4uNzM4NWY2NSAxMDA2NDQKLS0tIGEvQnVnc1NpdGUvUHJldHR5UGF0Y2gv UHJldHR5UGF0Y2gucmIKKysrIGIvQnVnc1NpdGUvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIK QEAgLTQwLDYgKzQwLDggQEAgcHJpdmF0ZQogCiAgICAgQklOQVJZX0ZJTEVfTUFSS0VSX0ZPUk1B VCA9IC9eKD86Q2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuKXwo PzpHSVQgYmluYXJ5IHBhdGNoKSQvCiAKKyAgICBJTUFHRV9GSUxFX01BUktFUl9GT1JNQVQgPSAv XnN2bjptaW1lLXR5cGUgPSBpbWFnZVwvcG5nJC8KKwogICAgIFNUQVJUX09GX1NFQ1RJT05fRk9S TUFUID0gL15AQCAtKFxkKykoPzosXGQrKT8gXCsoXGQrKSg/OixcZCspPyBAQFxzKiguKikvCiAK ICAgICBTVEFSVF9PRl9FWFRFTlRfU1RSSU5HID0gIiVjIiAlIDAKQEAgLTE0Miw2ICsxNDQsMTAg QEAgaDEgOmhvdmVyIHsKICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7CiB9CiAKKy5pbWFnZSB7 CisgICAgYm9yZGVyOiAycHggc29saWQgYmxhY2s7Cit9CisKIC5jb250ZXh0LCAuY29udGV4dCAu bGluZU51bWJlciB7CiAgICAgY29sb3I6ICM4NDk7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogI2Zl ZjsKQEAgLTE5MSwxNyArMTk3LDI1IEBAIEVPRgogICAgICAgICAgICAgICAgICAgICBicmVhawog ICAgICAgICAgICAgICAgIHdoZW4gQklOQVJZX0ZJTEVfTUFSS0VSX0ZPUk1BVAogICAgICAgICAg ICAgICAgICAgICBAYmluYXJ5ID0gdHJ1ZQorICAgICAgICAgICAgICAgICAgICBpZiAoSU1BR0Vf RklMRV9NQVJLRVJfRk9STUFULm1hdGNoKGxpbmVzW2kgKyAxXSkpIHRoZW4KKyAgICAgICAgICAg ICAgICAgICAgICAgIEBpbWFnZSA9IHRydWUKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0 T2ZTZWN0aW9ucyA9IGkgKyAyCisgICAgICAgICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAg ICAgICAgICBicmVhawogICAgICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAgZW5kCi0gICAg ICAgICAgICBAc2VjdGlvbnMgPSBEaWZmU2VjdGlvbi5wYXJzZShsaW5lc1tzdGFydE9mU2VjdGlv bnMuLi5saW5lcy5sZW5ndGhdKSB1bmxlc3MgQGJpbmFyeQorICAgICAgICAgICAgbGluZXNfd2l0 aF9jb250ZW50cyA9IGxpbmVzW3N0YXJ0T2ZTZWN0aW9ucy4uLmxpbmVzLmxlbmd0aF0KKyAgICAg ICAgICAgIEBzZWN0aW9ucyA9IERpZmZTZWN0aW9uLnBhcnNlKGxpbmVzX3dpdGhfY29udGVudHMp IHVubGVzcyBAYmluYXJ5CisgICAgICAgICAgICBAaW1hZ2VfdXJsID0gImRhdGE6aW1hZ2UvcG5n O2Jhc2U2NCwiICsgbGluZXNfd2l0aF9jb250ZW50cy5qb2luIGlmIEBpbWFnZQogICAgICAgICAg ICAgbmlsCiAgICAgICAgIGVuZAogCiAgICAgICAgIGRlZiB0b19odG1sCiAgICAgICAgICAgICBz dHIgPSAiPGRpdiBjbGFzcz0nRmlsZURpZmYnPlxuIgogICAgICAgICAgICAgc3RyICs9ICI8aDE+ I3tQcmV0dHlQYXRjaC5saW5raWZ5RmlsZW5hbWUoQGZpbGVuYW1lKX08L2gxPlxuIgotICAgICAg ICAgICAgaWYgQGJpbmFyeSB0aGVuCisgICAgICAgICAgICBpZiBAaW1hZ2UgdGhlbgorICAgICAg ICAgICAgICAgIHN0ciArPSAiPGltZyBjbGFzcz0naW1hZ2UnIHNyYz0nIiArIEBpbWFnZV91cmwg KyAiJyAvPiIKKyAgICAgICAgICAgIGVsc2lmIEBiaW5hcnkgdGhlbgogICAgICAgICAgICAgICAg IHN0ciArPSAiPHNwYW4gY2xhc3M9J3RleHQnPkJpbmFyeSBmaWxlLCBub3RoaW5nIHRvIHNlZSBo ZXJlPC9zcGFuPiIKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBzdHIgKz0gQHNl Y3Rpb25zLmNvbGxlY3R7IHxzZWN0aW9ufCBzZWN0aW9uLnRvX2h0bWwgfS5qb2luKCI8YnI+XG4i KSB1bmxlc3MgQHNlY3Rpb25zLm5pbD8K