130609 2014-03-21 10:56:20 -0700 fix-blink-commit: new script to fix up renamed directory paths 2014-03-21 11:56:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer bfulgham commit-queue darin rniwa oldest_to_newest 993203 0 ddkilzer 2014-03-21 10:56:20 -0700 I created a tiny tool that just fixes up Blink directory paths in patches so they match back up with WebKit. We could add class renames to this as well if we find it useful. Nominal use: cat blink.patch | fix-blink-patch | svn-apply 993214 1 ddkilzer 2014-03-21 11:09:49 -0700 Hmm, I wonder if adding a "--blink" switch to svn-apply would be better: cat blink.patch | svn-apply --blink 993217 2 227462 ddkilzer 2014-03-21 11:11:15 -0700 Created attachment 227462 Patch v1 993227 3 ddkilzer 2014-03-21 11:21:21 -0700 (In reply to comment #1) > Hmm, I wonder if adding a "--blink" switch to svn-apply would be better: > > cat blink.patch | svn-apply --blink I think I want to hold off on this for now since svn-apply doesn't parse the patches itself--it calls parsePatch() in VCSUtils.pm, so there isn't a clear place to do it in svn-apply. 993241 4 227462 commit-queue 2014-03-21 11:56:51 -0700 Comment on attachment 227462 Patch v1 Clearing flags on attachment: 227462 Committed r166081: <http://trac.webkit.org/changeset/166081> 993242 5 commit-queue 2014-03-21 11:56:54 -0700 All reviewed patches have been landed. Closing bug. 227462 2014-03-21 11:11:15 -0700 2014-03-21 11:56:51 -0700 Patch v1 bug-130609-20140321111053.patch text/plain 2898 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MDYyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmU3NzliYzQ5MTFhMjRkOTRjODRjMTc4OTE5MTc5OGMw M2YzM2RjOS4uMzgxZTc4Y2FlZjEyM2Y3ZTg4ZTIwOTFkYzU2YWIzZjkyMDdlZTk2OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE0LTAzLTIxICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgZml4LWJsaW5rLXBhdGNoOiB0b29sIHRvIGZpeCB1cCByZW5hbWVkIGRpcmVjdG9yeSBw YXRocyBpbiBCbGluaworICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xMzA2MDk+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNhZ2U6IGNhdCBi bGluay5wYXRjaCB8IGZpeC1ibGluay1wYXRjaCB8IHN2bi1hcHBseQorCisgICAgICAgICogU2Ny aXB0cy9maXgtYmxpbmstcGF0Y2g6IEFkZGVkLgorCiAyMDE0LTAzLTIxICBFdmEgQmFsYXpzZmFs dmkgIDxldmFiLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW3dlYmtp dHB5XSBGaXggaGFzX3ZhbGlkX3Jldmlld2VyKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv Zml4LWJsaW5rLXBhdGNoIGIvVG9vbHMvU2NyaXB0cy9maXgtYmxpbmstcGF0Y2gKbmV3IGZpbGUg bW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMzczM2FkMTE1N2Y3ZDBlN2IyYzBlZTAxZTYyZWJhMmNhODNlNGJiNQotLS0gL2Rldi9udWxs CisrKyBiL1Rvb2xzL1NjcmlwdHMvZml4LWJsaW5rLXBhdGNoCkBAIC0wLDAgKzEsNTEgQEAKKyMh L3Vzci9iaW4vcGVybCAtdworCisjIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJlIG1ldDoK KyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQgQU5ZCisjIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg VEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKKyMg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05T RVFVRU5USUFMIERBTUFHRVMKKyMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9D VVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOworIyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04KKyMgQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMKKyMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CisKKyMgZml4LWJsaW5rLXBhdGNoIC0tIGZpeGVzIHBhdGhzIG9mIGEgQmxpbmsgY29tbWl0IHNv IHRoZXkgbWF0Y2ggdXAgd2l0aCBXZWJLaXQKKwordXNlIHN0cmljdDsKK3VzZSB3YXJuaW5nczsK KwordXNlIEZpbGU6OkJhc2VuYW1lOwordXNlIEdldG9wdDo6TG9uZzsKKworbXkgJHNob3dIZWxw ID0gMDsKKworbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRPcHRpb25zKAorICAgICdoZWxwJyAg ICAgICA9PiBcJHNob3dIZWxwLAorKTsKKworaWYgKCEkZ2V0T3B0aW9uc1Jlc3VsdCB8fCAkc2hv d0hlbHApIHsKKyAgICBwcmludCBTVERFUlIgIlVzYWdlOiAiLCBiYXNlbmFtZSgkMCksICIgW29w dGlvbnNdIDwgcGF0Y2hcbiI7CisgICAgcHJpbnQgU1RERVJSICIgIC1ofC0taGVscCAgICAgU2hv dyBoZWxwXG4iOworICAgIGV4aXQgMTsKK30KKword2hpbGUgKG15ICRsaW5lID0gPD4pIHsKKyAg ICAkbGluZSA9fiBzIyhbYWJdL3wgKVNvdXJjZS9jb3JlLyMkMVNvdXJjZS9XZWJDb3JlLyNtZzsK KyAgICAkbGluZSA9fiBzIyhbYWJdL3wgKVNvdXJjZS9iaW5kaW5ncy8jJDFTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy8jbWc7CisgICAgcHJpbnQgJGxpbmU7Cit9CisKK2V4aXQgMDsK