231450 2021-10-08 13:54:02 -0700 [webkitscmpy] Allow caller to differentiate remote branches 2021-10-08 16:02:27 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu slewis webkit-bug-importer oldest_to_newest 1802226 0 jbedard 2021-10-08 13:54:02 -0700 As we start working with pull-requests, engineers will have more remotes. We should allow Python code to easily differentiate between branches on different remotes. 1802227 1 webkit-bug-importer 2021-10-08 13:54:18 -0700 <rdar://problem/84042400> 1802232 2 440669 jbedard 2021-10-08 13:57:34 -0700 Created attachment 440669 Patch 1802244 3 440669 dewei_zhu 2021-10-08 14:13:42 -0700 Comment on attachment 440669 Patch r=me 1802265 4 440677 jbedard 2021-10-08 15:00:13 -0700 Created attachment 440677 Patch for landing 1802295 5 ews-feeder 2021-10-08 16:02:26 -0700 Committed r283847 (242726@main): <https://commits.webkit.org/242726@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440677. 440669 2021-10-08 13:57:34 -0700 2021-10-08 15:00:11 -0700 Patch bug-231450-20211008135733.patch text/plain 4921 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2QwOTA3ZDAwNDdhYTFhYTJiODNiYjMyNzk1Y2RlNjRl YjhkYmI4My4uYTJmYjQ4NzMyZWY1YTkzOTk5YTU4ZTc0M2EwNzAwNTVmYTY0MTFjZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFsbG93IGNhbGxlciB0byBkaWZmZXJlbnRpYXRlIHJlbW90 ZSBicmFuY2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMxNDUwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDA0MjQwMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5icmFu Y2hlcyk6IENoYW5nZSBfYnJhbmNoZXNfZm9yIHRvIGJyYW5jaGVzX2Zvci4KKyAgICAgICAgKEdp dC5icmFuY2hlc19mb3IpOiBBbGxvdyBjYWxsIHRvIGRpZmZlcmVudGlhdGUgcmVtb3RlIGJyYW5j aGVzCisgICAgICAgIHRvIGJlIHJldHVybmVkLCBvciByZXR1cm4gZGljdGlvbmFyeSBvZiBhbGwg cmVtb3Rlcy4KKyAgICAgICAgKEdpdC5jb21taXQpOiBDaGFuZ2UgX2JyYW5jaGVzX2ZvciB0byBi cmFuY2hlc19mb3IuCisgICAgICAgIChHaXQuX2JyYW5jaGVzX2Zvcik6IFJlbmFtZWQgYnJhbmNo ZXNfZm9yLgorCiAyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KIAogICAgICAgICBbY29udHJpYnV0b3JzLmpzb25dIFN1cHBvcnQgR2l0SHViIHVzZXJuYW1l cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbG9jYWwvZ2l0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CmluZGV4IGE4MzlmYTA1OGY1ZTIyMDZiODBhODFlYTA5 YTZmOTkxNjYyOGYxZTAuLjAzYjJhNzJjMzVmOWI3YjJiNjg0NzUxMmI4OThjM2I2ZmIxZTZiNDcg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L2xvY2FsL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKQEAgLTMxLDYgKzMxLDcgQEAgaW1wb3J0IHN5cwog aW1wb3J0IHRpbWUKIAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUsIHRpbWVkZWx0YQor ZnJvbSBjb2xsZWN0aW9ucyBpbXBvcnQgZGVmYXVsdGRpY3QKIAogZnJvbSB3ZWJraXRjb3JlcHkg aW1wb3J0IHJ1biwgZGVjb3JhdG9ycywgTmVzdGVkRnV6enlEaWN0CiBmcm9tIHdlYmtpdHNjbXB5 LmxvY2FsIGltcG9ydCBTY20KQEAgLTI3NSw2ICsyNzYsNyBAQCBjbGFzcyBHaXQoU2NtKToKICAg ICBHSVRfQ09NTUlUID0gcmUuY29tcGlsZShyJ2NvbW1pdCAoP1A8aGFzaD5bMC05YS1mXSspJykK ICAgICBTU0hfUkVNT1RFID0gcmUuY29tcGlsZSgnKHNzaDovLyk/Z2l0QCg/UDxob3N0PlteOi9d KylbOi9dKD9QPHBhdGg+LispLmdpdCcpCiAgICAgSFRUUF9SRU1PVEUgPSByZS5jb21waWxlKCco P1A8cHJvdG9jb2w+aHR0cHM/KTovLyg/UDxob3N0Pi4rKS8oP1A8cGF0aD4uKykuZ2l0JykKKyAg ICBSRU1PVEVfQlJBTkNIID0gcmUuY29tcGlsZShyJ3JlbW90ZXNcLyg/UDxyZW1vdGU+W15cL10r KVwvKD9QPGJyYW5jaD4uKyknKQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgQGRlY29yYXRvcnMu TWVtb2l6ZSgpCkBAIC0zODgsNyArMzkwLDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAKICAgICBAcHJv cGVydHkKICAgICBkZWYgYnJhbmNoZXMoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9icmFu Y2hlc19mb3IoKQorICAgICAgICByZXR1cm4gc2VsZi5icmFuY2hlc19mb3IoKQogCiAgICAgQHBy b3BlcnR5CiAgICAgZGVmIHRhZ3Moc2VsZik6CkBAIC00MzQsNyArNDM2LDcgQEAgY2xhc3MgR2l0 KFNjbSk6CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIHJldHJp ZXZlIHJldmlzaW9uIGNvdW50IGZvciB7fScuZm9ybWF0KG5hdGl2ZV9wYXJhbWV0ZXIpKQogICAg ICAgICByZXR1cm4gaW50KHJldmlzaW9uX2NvdW50LnN0ZG91dCkKIAotICAgIGRlZiBfYnJhbmNo ZXNfZm9yKHNlbGYsIGhhc2g9Tm9uZSk6CisgICAgZGVmIGJyYW5jaGVzX2ZvcihzZWxmLCBoYXNo PU5vbmUsIHJlbW90ZT1UcnVlKToKICAgICAgICAgYnJhbmNoID0gcnVuKAogICAgICAgICAgICAg W3NlbGYuZXhlY3V0YWJsZSgpLCAnYnJhbmNoJywgJy1hJ10gKyAoWyctLWNvbnRhaW5zJywgaGFz aF0gaWYgaGFzaCBlbHNlIFtdKSwKICAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3RfcGF0aCwKQEAg LTQ0Myw4ICs0NDUsMjEgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICkKICAgICAgICAgaWYg YnJhbmNoLnJldHVybmNvZGU6CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignRmFp bGVkIHRvIHJldHJpZXZlIGJyYW5jaCBsaXN0IGZvciB7fScuZm9ybWF0KHNlbGYucm9vdF9wYXRo KSkKLSAgICAgICAgcmVzdWx0ID0gW2JyYW5jaC5sc3RyaXAoJyAqJykgZm9yIGJyYW5jaCBpbiBm aWx0ZXIobGFtYmRhIGJyYW5jaDogJy0+JyBub3QgaW4gYnJhbmNoLCBicmFuY2guc3Rkb3V0LnNw bGl0bGluZXMoKSldCi0gICAgICAgIHJldHVybiBzb3J0ZWQoc2V0KFsnLycuam9pbihicmFuY2gu c3BsaXQoJy8nKVsyOl0pIGlmIGJyYW5jaC5zdGFydHN3aXRoKCdyZW1vdGVzL29yaWdpbi8nKSBl bHNlIGJyYW5jaCBmb3IgYnJhbmNoIGluIHJlc3VsdF0pKQorICAgICAgICByZXN1bHQgPSBkZWZh dWx0ZGljdChzZXQpCisgICAgICAgIGZvciBicmFuY2ggaW4gW2JyYW5jaC5sc3RyaXAoJyAqJykg Zm9yIGJyYW5jaCBpbiBmaWx0ZXIobGFtYmRhIGJyYW5jaDogJy0+JyBub3QgaW4gYnJhbmNoLCBi cmFuY2guc3Rkb3V0LnNwbGl0bGluZXMoKSldOgorICAgICAgICAgICAgbWF0Y2ggPSBzZWxmLlJF TU9URV9CUkFOQ0gubWF0Y2goYnJhbmNoKQorICAgICAgICAgICAgaWYgbWF0Y2g6CisgICAgICAg ICAgICAgICAgcmVzdWx0W21hdGNoLmdyb3VwKCdyZW1vdGUnKV0uYWRkKG1hdGNoLmdyb3VwKCdi cmFuY2gnKSkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgcmVzdWx0W05vbmVd LmFkZChicmFuY2gpCisKKyAgICAgICAgaWYgcmVtb3RlIGlzIEZhbHNlOgorICAgICAgICAgICAg cmV0dXJuIHNvcnRlZChyZXN1bHRbTm9uZV0pCisgICAgICAgIGlmIHJlbW90ZSBpcyBUcnVlOgor ICAgICAgICAgICAgcmV0dXJuIHNvcnRlZChzZXQudW5pb24oKnJlc3VsdC52YWx1ZXMoKSkpCisg ICAgICAgIGlmIGlzaW5zdGFuY2UocmVtb3RlLCBzdHIpOgorICAgICAgICAgICAgcmV0dXJuIHNv cnRlZChyZXN1bHRbcmVtb3RlXSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAgICAgZGVmIGNv bW1pdChzZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJh bmNoPU5vbmUsIHRhZz1Ob25lLCBpbmNsdWRlX2xvZz1UcnVlLCBpbmNsdWRlX2lkZW50aWZpZXI9 VHJ1ZSk6CiAgICAgICAgICMgT25seSBnaXQtc3ZuIGNoZWNrb3V0cyBjYW4gY29udmVydCByZXZp c2lvbnMgdG8gZnVsbHkgcXVhbGlmaWVkIGNvbW1pdHMsIHVubGVzcyB3ZSBoYXBwZW4gdG8gaGF2 ZSBhIFNWTiBjYWNoZSBidWlsdApAQCAtNTE0LDcgKzUyOSw3IEBAIGNsYXNzIEdpdChTY20pOgog ICAgICAgICAgICAgICAgIGJhc2VsaW5lID0gYnJhbmNoIG9yICdIRUFEJwogICAgICAgICAgICAg ICAgIGlzX2RlZmF1bHQgPSBiYXNlbGluZSA9PSBkZWZhdWx0X2JyYW5jaAogICAgICAgICAgICAg ICAgIGlmIGJhc2VsaW5lID09ICdIRUFEJzoKLSAgICAgICAgICAgICAgICAgICAgaXNfZGVmYXVs dCA9IGRlZmF1bHRfYnJhbmNoIGluIHNlbGYuX2JyYW5jaGVzX2ZvcihiYXNlbGluZSkKKyAgICAg ICAgICAgICAgICAgICAgaXNfZGVmYXVsdCA9IGRlZmF1bHRfYnJhbmNoIGluIHNlbGYuYnJhbmNo ZXNfZm9yKGJhc2VsaW5lKQogCiAgICAgICAgICAgICAgICAgaWYgaXNfZGVmYXVsdCBhbmQgcGFy c2VkX2JyYW5jaF9wb2ludDoKICAgICAgICAgICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRp b24oJ0Nhbm5vdCBwcm92aWRlIGEgYnJhbmNoIHBvaW50IGZvciBhIGNvbW1pdCBvbiB0aGUgZGVm YXVsdCBicmFuY2gnKQpAQCAtNTY1LDcgKzU4MCw3IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAg ICBicmFuY2hfcG9pbnQgPSBOb25lCiAgICAgICAgICMgQSBjb21taXQgaXMgb2Z0ZW4gb24gbXVs dGlwbGUgYnJhbmNoZXMsIHRoZSBjYW5vbmljYWwgYnJhbmNoIGlzIHRoZSBvbmUgd2l0aCB0aGUg aGlnaGVzdCBwcmlvcml0eQogICAgICAgICBpZiBicmFuY2ggIT0gZGVmYXVsdF9icmFuY2g6Ci0g ICAgICAgICAgICBicmFuY2ggPSBzZWxmLnByaW9yaXRpemVfYnJhbmNoZXMoc2VsZi5fYnJhbmNo ZXNfZm9yKGhhc2gpKQorICAgICAgICAgICAgYnJhbmNoID0gc2VsZi5wcmlvcml0aXplX2JyYW5j aGVzKHNlbGYuYnJhbmNoZXNfZm9yKGhhc2gpKQogCiAgICAgICAgIGlmIG5vdCBpZGVudGlmaWVy IGFuZCBpbmNsdWRlX2lkZW50aWZpZXI6CiAgICAgICAgICAgICBjYWNoZWRfaWRlbnRpZmllciA9 IHNlbGYuY2FjaGUudG9faWRlbnRpZmllcihoYXNoPWhhc2gsIGJyYW5jaD1icmFuY2gpIGlmIHNl bGYuY2FjaGUgZWxzZSBOb25lCg== 440677 2021-10-08 15:00:13 -0700 2021-10-08 16:02:27 -0700 Patch for landing bug-231450-20211008150013.patch text/plain 6339 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTA2MWZkZjA0MDdhNzk3NzI1MDg3YWFmYmM5Y2EwMDUz ZjdmYzExNi4uNGIyN2Y3Yjc0NmI0Y2JjZWIyZjgxNGEwMjc1MTUyMmMwYjVhNzk2ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIxLTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEFsbG93IGNhbGxlciB0byBkaWZmZXJlbnRpYXRlIHJlbW90 ZSBicmFuY2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMxNDUwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NDA0MjQwMD4KKworICAgICAgICBS ZXZpZXdlZCBieSBEZXdlaSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS9zZXR1cC5weTogQnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6 CisgICAgICAgIChHaXQuYnJhbmNoZXMpOiBDaGFuZ2UgX2JyYW5jaGVzX2ZvciB0byBicmFuY2hl c19mb3IuCisgICAgICAgIChHaXQuYnJhbmNoZXNfZm9yKTogQWxsb3cgY2FsbCB0byBkaWZmZXJl bnRpYXRlIHJlbW90ZSBicmFuY2hlcworICAgICAgICB0byBiZSByZXR1cm5lZCwgb3IgcmV0dXJu IGRpY3Rpb25hcnkgb2YgYWxsIHJlbW90ZXMuCisgICAgICAgIChHaXQuY29tbWl0KTogQ2hhbmdl IF9icmFuY2hlc19mb3IgdG8gYnJhbmNoZXNfZm9yLgorICAgICAgICAoR2l0Ll9icmFuY2hlc19m b3IpOiBSZW5hbWVkIGJyYW5jaGVzX2Zvci4KKwogMjAyMS0xMC0wOCAgRnVqaWkgSGlyb25vcmkg IDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXVtNaW5pQnJvd3Nlcl1b V0syXSBJbXBsZW1lbnQgU2hvdyBMYXllciBUcmVlIHRvIGR1bXAgdGhlIEdyYXBoaWNzTGF5ZXIg dHJlZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0 dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQppbmRl eCBkMDdkYmU2ZGVhYzI3YTRmY2E5NjQxNmYyMjM2MDFlNTFhOTA5NjMyLi4yMGE3ZGM3ZjJjYTI5 YThhMTE1NTVkODc5MjQwOTcwOTM3MTkzMGVhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAK IHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScyLjIuNycsCisg ICAgdmVyc2lvbj0nMi4yLjgnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRv IGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNj cmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5 CmluZGV4IGU1OWFlOWQxODFkMDdmN2I4MzI0OWZkM2Y0NDM3MDQ1NDNjMzc2MjEuLjIzYjQ2OWNk MTc2MGIzYjIyMTE3MDYyY2RiY2NmNzA4N2YyYzA3MDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5 CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBp bnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRy YS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVy c2lvbigyLCAyLCA3KQordmVyc2lvbiA9IFZlcnNpb24oMiwgMiwgOCkKIAogQXV0b0luc3RhbGwu cmVnaXN0ZXIoUGFja2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0lu c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9naXQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9sb2NhbC9naXQucHkKaW5kZXggYTgzOWZhMDU4ZjVlMjIwNmI4MGE4MWVhMDlhNmY5OTE2 NjI4ZjFlMC4uMDNiMmE3MmMzNWY5YjdiMmI2ODQ3NTEyYjg5OGMzYjZmYjFlNmI0NyAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2xvY2FsL2dpdC5weQpAQCAtMzEsNiArMzEsNyBAQCBpbXBvcnQgc3lzCiBpbXBvcnQg dGltZQogCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRldGltZSwgdGltZWRlbHRhCitmcm9tIGNv bGxlY3Rpb25zIGltcG9ydCBkZWZhdWx0ZGljdAogCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQg cnVuLCBkZWNvcmF0b3JzLCBOZXN0ZWRGdXp6eURpY3QKIGZyb20gd2Via2l0c2NtcHkubG9jYWwg aW1wb3J0IFNjbQpAQCAtMjc1LDYgKzI3Niw3IEBAIGNsYXNzIEdpdChTY20pOgogICAgIEdJVF9D T01NSVQgPSByZS5jb21waWxlKHInY29tbWl0ICg/UDxoYXNoPlswLTlhLWZdKyknKQogICAgIFNT SF9SRU1PVEUgPSByZS5jb21waWxlKCcoc3NoOi8vKT9naXRAKD9QPGhvc3Q+W146L10rKVs6L10o P1A8cGF0aD4uKykuZ2l0JykKICAgICBIVFRQX1JFTU9URSA9IHJlLmNvbXBpbGUoJyg/UDxwcm90 b2NvbD5odHRwcz8pOi8vKD9QPGhvc3Q+LispLyg/UDxwYXRoPi4rKS5naXQnKQorICAgIFJFTU9U RV9CUkFOQ0ggPSByZS5jb21waWxlKHIncmVtb3Rlc1wvKD9QPHJlbW90ZT5bXlwvXSspXC8oP1A8 YnJhbmNoPi4rKScpCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBAZGVjb3JhdG9ycy5NZW1vaXpl KCkKQEAgLTM4OCw3ICszOTAsNyBAQCBjbGFzcyBHaXQoU2NtKToKIAogICAgIEBwcm9wZXJ0eQog ICAgIGRlZiBicmFuY2hlcyhzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2JyYW5jaGVzX2Zv cigpCisgICAgICAgIHJldHVybiBzZWxmLmJyYW5jaGVzX2ZvcigpCiAKICAgICBAcHJvcGVydHkK ICAgICBkZWYgdGFncyhzZWxmKToKQEAgLTQzNCw3ICs0MzYsNyBAQCBjbGFzcyBHaXQoU2NtKToK ICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdGYWlsZWQgdG8gcmV0cmlldmUgcmV2 aXNpb24gY291bnQgZm9yIHt9Jy5mb3JtYXQobmF0aXZlX3BhcmFtZXRlcikpCiAgICAgICAgIHJl dHVybiBpbnQocmV2aXNpb25fY291bnQuc3Rkb3V0KQogCi0gICAgZGVmIF9icmFuY2hlc19mb3Io c2VsZiwgaGFzaD1Ob25lKToKKyAgICBkZWYgYnJhbmNoZXNfZm9yKHNlbGYsIGhhc2g9Tm9uZSwg cmVtb3RlPVRydWUpOgogICAgICAgICBicmFuY2ggPSBydW4oCiAgICAgICAgICAgICBbc2VsZi5l eGVjdXRhYmxlKCksICdicmFuY2gnLCAnLWEnXSArIChbJy0tY29udGFpbnMnLCBoYXNoXSBpZiBo YXNoIGVsc2UgW10pLAogICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLApAQCAtNDQzLDgg KzQ0NSwyMSBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgKQogICAgICAgICBpZiBicmFuY2gu cmV0dXJuY29kZToKICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdGYWlsZWQgdG8g cmV0cmlldmUgYnJhbmNoIGxpc3QgZm9yIHt9Jy5mb3JtYXQoc2VsZi5yb290X3BhdGgpKQotICAg ICAgICByZXN1bHQgPSBbYnJhbmNoLmxzdHJpcCgnIConKSBmb3IgYnJhbmNoIGluIGZpbHRlcihs YW1iZGEgYnJhbmNoOiAnLT4nIG5vdCBpbiBicmFuY2gsIGJyYW5jaC5zdGRvdXQuc3BsaXRsaW5l cygpKV0KLSAgICAgICAgcmV0dXJuIHNvcnRlZChzZXQoWycvJy5qb2luKGJyYW5jaC5zcGxpdCgn LycpWzI6XSkgaWYgYnJhbmNoLnN0YXJ0c3dpdGgoJ3JlbW90ZXMvb3JpZ2luLycpIGVsc2UgYnJh bmNoIGZvciBicmFuY2ggaW4gcmVzdWx0XSkpCisgICAgICAgIHJlc3VsdCA9IGRlZmF1bHRkaWN0 KHNldCkKKyAgICAgICAgZm9yIGJyYW5jaCBpbiBbYnJhbmNoLmxzdHJpcCgnIConKSBmb3IgYnJh bmNoIGluIGZpbHRlcihsYW1iZGEgYnJhbmNoOiAnLT4nIG5vdCBpbiBicmFuY2gsIGJyYW5jaC5z dGRvdXQuc3BsaXRsaW5lcygpKV06CisgICAgICAgICAgICBtYXRjaCA9IHNlbGYuUkVNT1RFX0JS QU5DSC5tYXRjaChicmFuY2gpCisgICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAg ICByZXN1bHRbbWF0Y2guZ3JvdXAoJ3JlbW90ZScpXS5hZGQobWF0Y2guZ3JvdXAoJ2JyYW5jaCcp KQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICByZXN1bHRbTm9uZV0uYWRkKGJy YW5jaCkKKworICAgICAgICBpZiByZW1vdGUgaXMgRmFsc2U6CisgICAgICAgICAgICByZXR1cm4g c29ydGVkKHJlc3VsdFtOb25lXSkKKyAgICAgICAgaWYgcmVtb3RlIGlzIFRydWU6CisgICAgICAg ICAgICByZXR1cm4gc29ydGVkKHNldC51bmlvbigqcmVzdWx0LnZhbHVlcygpKSkKKyAgICAgICAg aWYgaXNpbnN0YW5jZShyZW1vdGUsIHN0cik6CisgICAgICAgICAgICByZXR1cm4gc29ydGVkKHJl c3VsdFtyZW1vdGVdKQorICAgICAgICByZXR1cm4gcmVzdWx0CiAKICAgICBkZWYgY29tbWl0KHNl bGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9u ZSwgdGFnPU5vbmUsIGluY2x1ZGVfbG9nPVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToK ICAgICAgICAgIyBPbmx5IGdpdC1zdm4gY2hlY2tvdXRzIGNhbiBjb252ZXJ0IHJldmlzaW9ucyB0 byBmdWxseSBxdWFsaWZpZWQgY29tbWl0cywgdW5sZXNzIHdlIGhhcHBlbiB0byBoYXZlIGEgU1ZO IGNhY2hlIGJ1aWx0CkBAIC01MTQsNyArNTI5LDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAg ICAgICAgICAgYmFzZWxpbmUgPSBicmFuY2ggb3IgJ0hFQUQnCiAgICAgICAgICAgICAgICAgaXNf ZGVmYXVsdCA9IGJhc2VsaW5lID09IGRlZmF1bHRfYnJhbmNoCiAgICAgICAgICAgICAgICAgaWYg YmFzZWxpbmUgPT0gJ0hFQUQnOgotICAgICAgICAgICAgICAgICAgICBpc19kZWZhdWx0ID0gZGVm YXVsdF9icmFuY2ggaW4gc2VsZi5fYnJhbmNoZXNfZm9yKGJhc2VsaW5lKQorICAgICAgICAgICAg ICAgICAgICBpc19kZWZhdWx0ID0gZGVmYXVsdF9icmFuY2ggaW4gc2VsZi5icmFuY2hlc19mb3Io YmFzZWxpbmUpCiAKICAgICAgICAgICAgICAgICBpZiBpc19kZWZhdWx0IGFuZCBwYXJzZWRfYnJh bmNoX3BvaW50OgogICAgICAgICAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignQ2Fu bm90IHByb3ZpZGUgYSBicmFuY2ggcG9pbnQgZm9yIGEgY29tbWl0IG9uIHRoZSBkZWZhdWx0IGJy YW5jaCcpCkBAIC01NjUsNyArNTgwLDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgIGJyYW5j aF9wb2ludCA9IE5vbmUKICAgICAgICAgIyBBIGNvbW1pdCBpcyBvZnRlbiBvbiBtdWx0aXBsZSBi cmFuY2hlcywgdGhlIGNhbm9uaWNhbCBicmFuY2ggaXMgdGhlIG9uZSB3aXRoIHRoZSBoaWdoZXN0 IHByaW9yaXR5CiAgICAgICAgIGlmIGJyYW5jaCAhPSBkZWZhdWx0X2JyYW5jaDoKLSAgICAgICAg ICAgIGJyYW5jaCA9IHNlbGYucHJpb3JpdGl6ZV9icmFuY2hlcyhzZWxmLl9icmFuY2hlc19mb3Io aGFzaCkpCisgICAgICAgICAgICBicmFuY2ggPSBzZWxmLnByaW9yaXRpemVfYnJhbmNoZXMoc2Vs Zi5icmFuY2hlc19mb3IoaGFzaCkpCiAKICAgICAgICAgaWYgbm90IGlkZW50aWZpZXIgYW5kIGlu Y2x1ZGVfaWRlbnRpZmllcjoKICAgICAgICAgICAgIGNhY2hlZF9pZGVudGlmaWVyID0gc2VsZi5j YWNoZS50b19pZGVudGlmaWVyKGhhc2g9aGFzaCwgYnJhbmNoPWJyYW5jaCkgaWYgc2VsZi5jYWNo ZSBlbHNlIE5vbmUK