209965 2020-04-03 07:25:57 -0700 [ews] Improve error message when patch fails to apply to trunk 2020-04-03 09:27:13 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1637346 0 aakash_jain 2020-04-03 07:25:57 -0700 [ews] Improve error message when patch fails to apply to trunk. Current error message is 'Patch does not apply', this might be confusing for few people (especially new contributors). Better wording would be: 'Tools/Scripts/svn-apply failed to apply patch 123456 to trunk'. 1637348 1 395374 aakash_jain 2020-04-03 07:30:37 -0700 Created attachment 395374 Patch 1637349 2 aakash_jain 2020-04-03 07:31:33 -0700 Sample run: https://ews-build.webkit-uat.org/#/builders/34/builds/137 Sample bug comment: https://bugs.webkit.org/show_bug.cgi?id=179531#c35 1637384 3 ews-feeder 2020-04-03 09:26:57 -0700 Committed r259464: <https://trac.webkit.org/changeset/259464> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395374. 1637385 4 webkit-bug-importer 2020-04-03 09:27:13 -0700 <rdar://problem/61262348> 395374 2020-04-03 07:30:37 -0700 2020-04-03 09:26:57 -0700 Patch bug-209965-20200403103036.patch text/plain 3982 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1OTQ1NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTA0LTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBJbXByb3ZlIGVycm9yIG1lc3NhZ2Ugd2hlbiBwYXRjaCBmYWls cyB0byBhcHBseSB0byB0cnVuaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA5OTY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6CisgICAg ICAgIChBcHBseVBhdGNoLmdldFJlc3VsdFN1bW1hcnkpOiBJbXByb3ZlZCBlcnJvciBtZXNzYWdl LgorICAgICAgICAoQXBwbHlQYXRjaC5ldmFsdWF0ZUNvbW1hbmQpOiBEaXR0by4KKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6IFVwZGF0ZWQg dW5pdC10ZXN0cy4KKwogMjAyMC0wNC0wMyAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW2V3c10gRGlzcGxheSBsaXN0IG9mIHRlc3QgZmFpbHVyZXMgYWxv bmctd2l0aCB0aGUgbGF5b3V0LXRlc3QgYnVpbGQgc3RlcApJbmRleDogVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjU5NDU3KQorKysgVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y MjIsMTYgKzIyMiwxNyBAQCBjbGFzcyBBcHBseVBhdGNoKHNoZWxsLlNoZWxsQ29tbWFuZCwgQ29t CiAKICAgICBkZWYgZ2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAgaWYgc2VsZi5yZXN1 bHRzICE9IFNVQ0NFU1M6Ci0gICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnUGF0Y2ggZG9l cyBub3QgYXBwbHknfQorICAgICAgICAgICAgcmV0dXJuIHt1J3N0ZXAnOiB1J3N2bi1hcHBseSBm YWlsZWQgdG8gYXBwbHkgcGF0Y2ggdG8gdHJ1bmsnfQogICAgICAgICByZXR1cm4gc3VwZXIoQXBw bHlQYXRjaCwgc2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCiAKICAgICBkZWYgZXZhbHVhdGVDb21t YW5kKHNlbGYsIGNtZCk6CiAgICAgICAgIHJjID0gc2hlbGwuU2hlbGxDb21tYW5kLmV2YWx1YXRl Q29tbWFuZChzZWxmLCBjbWQpCiAgICAgICAgIHBhdGNoX2lkID0gc2VsZi5nZXRQcm9wZXJ0eSgn cGF0Y2hfaWQnLCAnJykKICAgICAgICAgaWYgcmMgPT0gRkFJTFVSRToKLSAgICAgICAgICAgIG1l c3NhZ2UgPSAnUGF0Y2gge30gZG9lcyBub3QgYXBwbHknLmZvcm1hdChwYXRjaF9pZCkKKyAgICAg ICAgICAgIG1lc3NhZ2UgPSAnVG9vbHMvU2NyaXB0cy9zdm4tYXBwbHkgZmFpbGVkIHRvIGFwcGx5 IHBhdGNoIHt9IHRvIHRydW5rJy5mb3JtYXQocGF0Y2hfaWQpCiAgICAgICAgICAgICBpZiBzZWxm LmdldFByb3BlcnR5KCdidWlsZGVybmFtZScsICcnKS5sb3dlcigpID09ICdjb21taXQtcXVldWUn OgotICAgICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1Z3ppbGxhX2NvbW1lbnRfdGV4 dCcsIG1lc3NhZ2UucmVwbGFjZSgnUGF0Y2gnLCAnQXR0YWNobWVudCcpKQorICAgICAgICAgICAg ICAgIGNvbW1lbnRfdGV4dCA9ICd7fS5cblBsZWFzZSByZXNvbHZlIHRoZSBjb25mbGljdHMgYW5k IHVwbG9hZCBhIG5ldyBwYXRjaC4nLmZvcm1hdChtZXNzYWdlLnJlcGxhY2UoJ3BhdGNoJywgJ2F0 dGFjaG1lbnQnKSkKKyAgICAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWd6aWxsYV9j b21tZW50X3RleHQnLCBjb21tZW50X3RleHQpCiAgICAgICAgICAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnknLCBtZXNzYWdlKQogICAgICAgICAgICAgICAgIHNl bGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtDb21tZW50T25CdWcoKSwgU2V0Q29t bWl0UXVldWVNaW51c0ZsYWdPblBhdGNoKCldKQogICAgICAgICAgICAgZWxzZToKSW5kZXg6IFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3Qu cHkJKHJldmlzaW9uIDI1OTQ1NykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjA4MSw3ICsyMDgxLDcgQEAg Y2xhc3MgVGVzdEFwcGx5UGF0Y2goQnVpbGRTdGVwTWl4aW5BZGRpdAogICAgICAgICAgICAgRXhw ZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlLicpICsKICAg ICAgICAgICAgIDIsCiAgICAgICAgICkKLSAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3Vs dD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J1BhdGNoIGRvZXMgbm90IGFwcGx5JykKKyAgICAgICAg c2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J3N2bi1hcHBs eSBmYWlsZWQgdG8gYXBwbHkgcGF0Y2ggdG8gdHJ1bmsnKQogICAgICAgICByYyA9IHNlbGYucnVu U3RlcCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0eSgnYnVnemls bGFfY29tbWVudF90ZXh0JyksIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5n ZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnknKSwgTm9uZSkKQEAgLTIxMDAsMTAgKzIx MDAsMTAgQEAgY2xhc3MgVGVzdEFwcGx5UGF0Y2goQnVpbGRTdGVwTWl4aW5BZGRpdAogICAgICAg ICAgICAgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJl LicpICsKICAgICAgICAgICAgIDIsCiAgICAgICAgICkKLSAgICAgICAgc2VsZi5leHBlY3RPdXRj b21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J1BhdGNoIGRvZXMgbm90IGFwcGx5JykK KyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9 J3N2bi1hcHBseSBmYWlsZWQgdG8gYXBwbHkgcGF0Y2ggdG8gdHJ1bmsnKQogICAgICAgICByYyA9 IHNlbGYucnVuU3RlcCgpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0 eSgnYnVnemlsbGFfY29tbWVudF90ZXh0JyksICdBdHRhY2htZW50IDEyMzQgZG9lcyBub3QgYXBw bHknKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkX2Zp bmlzaF9zdW1tYXJ5JyksICdQYXRjaCAxMjM0IGRvZXMgbm90IGFwcGx5JykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWd6aWxsYV9jb21tZW50X3RleHQnKSwg J1Rvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5IGZhaWxlZCB0byBhcHBseSBhdHRhY2htZW50IDEyMzQg dG8gdHJ1bmsuXG5QbGVhc2UgcmVzb2x2ZSB0aGUgY29uZmxpY3RzIGFuZCB1cGxvYWQgYSBuZXcg cGF0Y2guJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWls ZF9maW5pc2hfc3VtbWFyeScpLCAnVG9vbHMvU2NyaXB0cy9zdm4tYXBwbHkgZmFpbGVkIHRvIGFw cGx5IHBhdGNoIDEyMzQgdG8gdHJ1bmsnKQogICAgICAgICByZXR1cm4gcmMKIAogCg==