21222 2008-09-29 15:00:20 -0700 Formatted Diff for attachment 23920 is mangled 2011-03-10 16:57:07 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED https://bugs.webkit.org/attachment.cgi?id=23920&action=prettypatch P2 Normal --- 1 mrowe webkit-unassigned abarth aroben cmarcelo commit-queue dbates eric oldest_to_newest 93290 0 mrowe 2008-09-29 15:00:20 -0700 The formatted diff for attachment 23920 is mangled. The raw diff is at <https://bugs.webkit.org/attachment.cgi?id=23920&action=view>, with the mangled formatting at <https://bugs.webkit.org/attachment.cgi?id=23920&action=prettypatch>. 93645 1 mrowe 2008-10-01 18:48:10 -0700 *** Bug 21291 has been marked as a duplicate of this bug. *** 364300 2 85129 cmarcelo 2011-03-08 20:50:30 -0800 Created attachment 85129 patch 364306 3 85129 eric 2011-03-08 21:14:33 -0800 Comment on attachment 85129 patch Shouldn't this be done at a lower layer? Or shouldn't prettyify ASSERT that it has the proper line endings? 364307 4 eric 2011-03-08 21:14:59 -0800 How do we unit test this? (I'm not sure we have unit tests for the ruby code?) 364446 5 85129 aroben 2011-03-09 05:23:04 -0800 Comment on attachment 85129 patch I agree with Eric that the line-ending normalization should happen in PrettyPatch itself. prettify.rb is just supposed to be a thin wrapper around PrettyPatch. 364447 6 aroben 2011-03-09 05:23:43 -0800 (In reply to comment #4) > How do we unit test this? (I'm not sure we have unit tests for the ruby code?) We don't have unit tests. It would be pretty easy to add some, though! 364618 7 85197 cmarcelo 2011-03-09 11:04:50 -0800 Created attachment 85197 patch v2, moved normalization to lower layer 364628 8 cmarcelo 2011-03-09 11:13:06 -0800 (In reply to comment #6) > We don't have unit tests. It would be pretty easy to add some, though! What kind of tests are you thinking about, one that gets a set of patches to run prettify and compare with some expected files? Or something different? Any guidance on where to put those is welcome too :) 364632 9 eric 2011-03-09 11:14:20 -0800 (In reply to comment #8) > (In reply to comment #6) > > We don't have unit tests. It would be pretty easy to add some, though! > > What kind of tests are you thinking about, one that gets a set of patches to run prettify and compare with some expected files? Or something different? > > Any guidance on where to put those is welcome too :) I was thinking more along the lines of the python unit tests: *_unittest.py under http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/ 365670 10 85197 commit-queue 2011-03-10 16:57:03 -0800 Comment on attachment 85197 patch v2, moved normalization to lower layer Clearing flags on attachment: 85197 Committed r80795: <http://trac.webkit.org/changeset/80795> 365671 11 commit-queue 2011-03-10 16:57:07 -0800 All reviewed patches have been landed. Closing bug. 85129 2011-03-08 20:50:30 -0800 2011-03-09 11:04:50 -0800 patch 0001-Formatted-Diff-for-attachment-23920-is-mangled.patch text/plain 2313 cmarcelo RnJvbSAzNDU0ZjRmZGJkNTQ0ZTI5NGRhYTAwMjJlNTU2ZGFiNDBlZGM2MDBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCA5IE1hciAyMDExIDAxOjQ5OjA5IC0w MzAwClN1YmplY3Q6IFtQQVRDSF0gRm9ybWF0dGVkIERpZmYgZm9yIGF0dGFjaG1lbnQgMjM5MjAg aXMgbWFuZ2xlZAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjIy CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoZSBtYW5nbGVkIGRpZmYgZmlsZXMgbWVu dGlvbmVkIGluIHRoZSBidWcgd2VyZSB1c2luZyBNYWMgbGluZQplbmRpbmcgYW5kIHRoaXMgd2Fz IGNhdXNpbmcgcHJvYmxlbXMgZm9yIFN0cmluZyNlYWNoX2xpbmUuIE5vdyB3ZQpub3JtYWxpemUg dGhlIGxpbmUgZW5kaW5ncyBpbiBwYXRjaCBkYXRhIGJlZm9yZSBwcm9jZXNzaW5nIGl0LgoKKiBQ cmV0dHlQYXRjaC9wcmV0dGlmeS5yYjoKLS0tCiBXZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvQ2hh bmdlTG9nICAgICAgICAgICAgICAgfCAgIDEzICsrKysrKysrKysrKysKIFdlYnNpdGVzL2J1Z3Mu d2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9wcmV0dGlmeS5yYiB8ICAgIDYgKysrKystCiAyIGZpbGVz IGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0 Lm9yZy9DaGFuZ2VMb2cKaW5kZXggYTNhZDMyNy4uMjQyYWY4ZiAxMDA2NDQKLS0tIGEvV2Vic2l0 ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZworKysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5v cmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMDggIENhaW8gTWFyY2VsbyBk ZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3JtYXR0ZWQgRGlmZiBm b3IgYXR0YWNobWVudCAyMzkyMCBpcyBtYW5nbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIyMgorCisgICAgICAgIFRoZSBtYW5nbGVkIGRpZmYg ZmlsZXMgbWVudGlvbmVkIGluIHRoZSBidWcgd2VyZSB1c2luZyBNYWMgbGluZQorICAgICAgICBl bmRpbmcgYW5kIHRoaXMgd2FzIGNhdXNpbmcgcHJvYmxlbXMgZm9yIFN0cmluZyNlYWNoX2xpbmUu IE5vdyB3ZQorICAgICAgICBub3JtYWxpemUgdGhlIGxpbmUgZW5kaW5ncyBpbiBwYXRjaCBkYXRh IGJlZm9yZSBwcm9jZXNzaW5nIGl0LgorCisgICAgICAgICogUHJldHR5UGF0Y2gvcHJldHRpZnku cmI6CisKIDIwMTEtMDItMjUgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53 ZWJraXQub3JnL1ByZXR0eVBhdGNoL3ByZXR0aWZ5LnJiIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQu b3JnL1ByZXR0eVBhdGNoL3ByZXR0aWZ5LnJiCmluZGV4IDA3ZDQxZmUuLjk3MjM3NjAgMTAwNzU1 Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9wcmV0dGlmeS5yYgor KysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvcHJldHRpZnkucmIKQEAg LTE1LDYgKzE1LDEwIEBAIE9wdGlvblBhcnNlci5uZXcgZG8gfG9wdHN8CiAgICAgb3B0cy5vbigi LS1odG1sLWV4Y2VwdGlvbnMiLCAiUHJpbnQgZXhjZXB0aW9ucyB0byBzdGRvdXQgYXMgSFRNTCIp IHsgfGh8IG9wdGlvbnNbOmh0bWxfZXhjZXB0aW9uc10gPSBoIH0KIGVuZC5wYXJzZSEKIAorZGVm IG5vcm1hbGl6ZV9saW5lX2VuZGluZyhzKQorICAgIHMuZ3N1YiAvXHJcbj8vLCAiXG4iCitlbmQK KwogcGF0Y2hfZGF0YSA9IG5pbAogaWYgQVJHVi5sZW5ndGggPT0gMCB8fCBBUkdWWzBdID09ICct JyB0aGVuCiAgICAgcGF0Y2hfZGF0YSA9ICRzdGRpbi5yZWFkCkBAIC0yMyw3ICsyNyw3IEBAIGVs c2UKIGVuZAogCiBiZWdpbgotICAgIHB1dHMgUHJldHR5UGF0Y2gucHJldHRpZnkocGF0Y2hfZGF0 YSkKKyAgICBwdXRzIFByZXR0eVBhdGNoLnByZXR0aWZ5KG5vcm1hbGl6ZV9saW5lX2VuZGluZyhw YXRjaF9kYXRhKSkKIHJlc2N1ZSA9PiBleGNlcHRpb24KICAgICByYWlzZSB1bmxlc3Mgb3B0aW9u c1s6aHRtbF9leGNlcHRpb25zXQogCi0tIAoxLjcuMQoK 85197 2011-03-09 11:04:50 -0800 2011-03-10 16:57:03 -0800 patch v2, moved normalization to lower layer 0001-Formatted-Diff-for-attachment-23920-is-mangled.patch text/plain 2325 cmarcelo RnJvbSBhM2E4YmMyODEwMmNkNTg1YTk2YTQ3NWMxN2ZjODMzODQxYmZjYzAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogV2VkLCA5IE1hciAyMDExIDE2OjAzOjA0IC0w MzAwClN1YmplY3Q6IFtQQVRDSF0gRm9ybWF0dGVkIERpZmYgZm9yIGF0dGFjaG1lbnQgMjM5MjAg aXMgbWFuZ2xlZAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjIy CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoZSBtYW5nbGVkIGRpZmYgZmlsZXMgbWVu dGlvbmVkIGluIHRoZSBidWcgd2VyZSB1c2luZyBNYWMgbGluZQplbmRpbmcgYW5kIHRoaXMgd2Fz IGNhdXNpbmcgcHJvYmxlbXMgZm9yIFN0cmluZyNlYWNoX2xpbmUuIE5vdyB3ZQpub3JtYWxpemUg dGhlIGxpbmUgZW5kaW5ncyBpbiBwYXRjaCBkYXRhIGJlZm9yZSBwcm9jZXNzaW5nIGl0LgoKKiBQ cmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjoKLS0tCiBXZWJzaXRlcy9idWdzLndlYmtpdC5vcmcv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysrKysrKwogLi4uL2J1Z3Mu d2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiAgICAgfCAgICA1ICsrKysrCiAy IGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL2J1Z3Mu d2Via2l0Lm9yZy9DaGFuZ2VMb2cKaW5kZXggYTNhZDMyNy4uZDZkMDRhMSAxMDA2NDQKLS0tIGEv V2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZworKysgYi9XZWJzaXRlcy9idWdzLndl YmtpdC5vcmcvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMDkgIENhaW8gTWFy Y2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3JtYXR0ZWQg RGlmZiBmb3IgYXR0YWNobWVudCAyMzkyMCBpcyBtYW5nbGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIyMgorCisgICAgICAgIFRoZSBtYW5nbGVk IGRpZmYgZmlsZXMgbWVudGlvbmVkIGluIHRoZSBidWcgd2VyZSB1c2luZyBNYWMgbGluZQorICAg ICAgICBlbmRpbmcgYW5kIHRoaXMgd2FzIGNhdXNpbmcgcHJvYmxlbXMgZm9yIFN0cmluZyNlYWNo X2xpbmUuIE5vdyB3ZQorICAgICAgICBub3JtYWxpemUgdGhlIGxpbmUgZW5kaW5ncyBpbiBwYXRj aCBkYXRhIGJlZm9yZSBwcm9jZXNzaW5nIGl0LgorCisgICAgICAgICogUHJldHR5UGF0Y2gvUHJl dHR5UGF0Y2gucmI6CisKIDIwMTEtMDItMjUgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2Vic2l0 ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiIGIvV2Vic2l0ZXMv YnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCmluZGV4IGVkYzQzYzQu LjkyYzU2NTAgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRj aC9QcmV0dHlQYXRjaC5yYgorKysgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0 Y2gvUHJldHR5UGF0Y2gucmIKQEAgLTEyLDYgKzEyLDcgQEAgcHVibGljCiAgICAgR0lUX1BBVEgg PSAiZ2l0IgogCiAgICAgZGVmIHNlbGYucHJldHRpZnkoc3RyaW5nKQorICAgICAgICBzdHJpbmcg PSBub3JtYWxpemVfbGluZV9lbmRpbmcoc3RyaW5nKQogICAgICAgICBmaWxlRGlmZnMgPSBGaWxl RGlmZi5wYXJzZShzdHJpbmcpCiAKICAgICAgICAgc3RyID0gSEVBREVSICsgIlxuIgpAQCAtODUs NiArODYsMTAgQEAgcHJpdmF0ZQogICAgICAgICBXZWJzaXRlcwogICAgIF0KIAorICAgIGRlZiBz ZWxmLm5vcm1hbGl6ZV9saW5lX2VuZGluZyhzKQorICAgICAgICBzLmdzdWIgL1xyXG4/LywgIlxu IgorICAgIGVuZAorCiAgICAgZGVmIHNlbGYuZmluZF91cmxfYW5kX3BhdGgoZmlsZV9wYXRoKQog ICAgICAgICAjIFNlYXJjaCBmaWxlX3BhdGggZnJvbSB0aGUgYm90dG9tIHVwLCBhdCBlYWNoIGxl dmVsIGNoZWNraW5nIHdoZXRoZXIKICAgICAgICAgIyB3ZSd2ZSBmb3VuZCBhIGRpcmVjdG9yeSB3 ZSBrbm93IGV4aXN0cyBpbiB0aGUgc291cmNlIHRyZWUuCi0tIAoxLjcuNAoK