219432 2020-12-02 07:52:15 -0800 [webkitscmpy] Handle adding, modifying and deleting files on branches 2020-12-02 09:06:03 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218827 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1711335 0 jbedard 2020-12-02 07:52:15 -0800 As I was importing some old branches, I realized our code did not handle changes which add and delete files on branches without modifying files. 1711336 1 webkit-bug-importer 2020-12-02 07:52:37 -0800 <rdar://problem/71894089> 1711337 2 415224 jbedard 2020-12-02 07:55:00 -0800 Created attachment 415224 Patch 1711341 3 415224 aakash_jain 2020-12-02 08:09:41 -0800 Comment on attachment 415224 Patch rs=me 1711344 4 415226 jbedard 2020-12-02 08:27:21 -0800 Created attachment 415226 Patch for landing 1711349 5 ews-feeder 2020-12-02 09:06:01 -0800 Committed r270349: <https://trac.webkit.org/changeset/270349> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415226. 415224 2020-12-02 07:55:00 -0800 2020-12-02 08:27:18 -0800 Patch bug-219432-20201202095459.patch text/plain 6301 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDM0NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTEyLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBhZGRpbmcsIG1vZGlmeWluZyBhbmQg ZGVsZXRpbmcgZmlsZXMgb24gYnJhbmNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxOTQzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzE4OTQw ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHk6IEJ1 bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4uX2JyYW5jaF9mb3IpOiBTdXBwb3J0 IGJyYW5jaCBkZXRlY3Rpb24gd2hlbiBmaWxlcyBhcmUgYWRkZWQgb3IgZGVsZXRlZC4KKyAgICAg ICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2Nh bC9zdm4ucHk6CisgICAgICAgIChTdm4uX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9zdm4ucHk6CisgICAg ICAgIChTdm4ucmVxdWVzdCk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weToKKyAgICAgICAgKFN2bi5fYnJhbmNoX2Zvcik6 IFN1cHBvcnQgYnJhbmNoIGRldGVjdGlvbiB3aGVuIGZpbGVzIGFyZSBkZWxldGVkLgorCiAyMDIw LTEyLTAyICBUZXRzdWhhcnUgT2h6ZWtpICA8dGV0c3VoYXJ1Lm9oemVraUBnbWFpbC5jb20+CiAK ICAgICAgICAgQWRkIFRldHN1aGFydSBPaHpla2kgdG8gY29udHJpYnV0b3JzLmpzb24KSW5kZXg6 IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9f LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNzAzNDUpCisrKyBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBj b3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVh c2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0t ZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9 IFZlcnNpb24oMCwgNCwgMSkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDQsIDIpCiAKIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2RhdGV1dGlsJywgVmVyc2lvbigyLCA4LCAxKSwgcHlwaV9u YW1lPSdweXRob24tZGF0ZXV0aWwnKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zh c3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4u cHkJKHJldmlzaW9uIDI3MDM0NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMjQxLDE1ICsy NDEsMTUgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICBpZiBwYXJ0aWFsIGlzIE5vbmUg YW5kIGxpbmUgPT0gJ0NoYW5nZWQgcGF0aHM6JzoKICAgICAgICAgICAgICAgICBwYXJ0aWFsID0g JycKICAgICAgICAgICAgIGVsaWYgcGFydGlhbCA9PSAnJzoKLSAgICAgICAgICAgICAgICBwYXJ0 aWFsID0gbGluZS5sc3RyaXAoKQorICAgICAgICAgICAgICAgIHBhcnRpYWwgPSBsaW5lLmxzdHJp cCgpWzI6XQogICAgICAgICAgICAgZWxpZiBwYXJ0aWFsOgogICAgICAgICAgICAgICAgIGxpbmUg PSBsaW5lLmxzdHJpcCgpCi0gICAgICAgICAgICAgICAgd2hpbGUgbGluZS5zdGFydHN3aXRoKCdN ICcpIGFuZCBub3QgbGluZS5zdGFydHN3aXRoKHBhcnRpYWwpOgorICAgICAgICAgICAgICAgIHdo aWxlIGxpbmUuc3RhcnRzd2l0aCgoJ0EgJywgJ0QgJywgJ00gJykpIGFuZCBub3QgbGluZVsyOl0u c3RhcnRzd2l0aChwYXJ0aWFsKToKICAgICAgICAgICAgICAgICAgICAgcGFydGlhbCA9IHBhcnRp YWxbOi0xXQogCiAgICAgICAgIGlmIGxlbihwYXJ0aWFsKSA8PSAzOgogICAgICAgICAgICAgcmFp c2Ugc2VsZi5FeGNlcHRpb24oJ01hbGZvcm1lZCBzZXQgIG9mIGVkaXRlZCBmaWxlcycpCi0gICAg ICAgIHBhcnRpYWwgPSBwYXJ0aWFsWzI6XS5zcGxpdCgnICcpWzBdCisgICAgICAgIHBhcnRpYWwg PSBwYXJ0aWFsLnNwbGl0KCcgJylbMF0KICAgICAgICAgY2FuZGlkYXRlID0gcGFydGlhbC5zcGxp dCgnLycpWzIgaWYgcGFydGlhbC5zdGFydHN3aXRoKCcvYnJhbmNoZXMnKSBlbHNlIDFdCiAKICAg ICAgICAgIyBUYWdzIGFyZSBhIHVuaXF1ZSBjYXNlIGZvciBTVk4sIGJlY2F1c2UgdGhleSdyZSB0 cmVhdGVkIGFzIGJyYW5jaGVzIGluIG5hdGl2ZSBTVk4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL3N2bi5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9t b2Nrcy9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI3MDM0NSkKKysrIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL3N2bi5weQkod29ya2lu ZyBjb3B5KQpAQCAtMTc5LDcgKzE3OSw5IEBAIGNsYXNzIFN2bihtb2Nrcy5TdWJwcm9jZXNzKToK ICAgICAgICAgICAgICAgICAgICAgICAgICd7bGluZX1cbicKICAgICAgICAgICAgICAgICAgICAg ICAgICdDaGFuZ2VkIHBhdGhzOlxuJwogICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBNIC97 YnJhbmNofS9DaGFuZ2VMb2dcbicKLSAgICAgICAgICAgICAgICAgICAgICAgICcgICAgTSAve2Jy YW5jaH0vZmlsZS5jcHBcbicuZm9ybWF0KAorICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBN IC97YnJhbmNofS9maWxlLmNwcFxuJworICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBEIC97 YnJhbmNofS9kZWxldGVkLmNwcFxuJworICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBBIC97 YnJhbmNofS9hZGRlZC5jcHBcbicuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxpbmU9c2VsZi5sb2dfbGluZShzZWxmLmZpbmQocmV2aXNpb249YXJnc1s2XSkpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJyYW5jaD1zZWxmLmZpbmQocmV2aXNpb249YXJnc1s2XSku YnJhbmNoIGlmIHNlbGYuZmluZChyZXZpc2lvbj1hcmdzWzZdKS5icmFuY2guc3BsaXQoJy8nKVsw XSBpbiBbJ3RydW5rJywgJ3RhZ3MnXSBlbHNlICdicmFuY2hlcy97fScuZm9ybWF0KHNlbGYuZmlu ZChyZXZpc2lvbj1hcmdzWzZdKS5icmFuY2gpCiAgICAgICAgICAgICAgICAgICAgICAgICApLApJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9j a3MvcmVtb3RlL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9yZW1vdGUvc3ZuLnB5CShyZXZpc2lvbiAyNzAz NDUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9t b2Nrcy9yZW1vdGUvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNzEsNyArMzcxLDkgQEAgY2xh c3MgU3ZuKG1vY2tzLlJlcXVlc3RzKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29tbWl0LmF1dGhvci5lbWFpbCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICApLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICc8Uzptb2RpZmllZC1wYXRoIG5vZGUta2luZD0iZmls ZSIgdGV4dC1tb2RzPSJ0cnVlIiBwcm9wLW1vZHM9ImZhbHNlIj4ve2JyYW5jaH0vQ2hhbmdlbG9n PC9TOm1vZGlmaWVkLXBhdGg+XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgJzxTOm1v ZGlmaWVkLXBhdGggbm9kZS1raW5kPSJmaWxlIiB0ZXh0LW1vZHM9InRydWUiIHByb3AtbW9kcz0i ZmFsc2UiPi97YnJhbmNofS9maWxlLmNwcDwvUzptb2RpZmllZC1wYXRoPlxuJy5mb3JtYXQoCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJzxTOm1vZGlmaWVkLXBhdGggbm9kZS1raW5kPSJm aWxlIiB0ZXh0LW1vZHM9InRydWUiIHByb3AtbW9kcz0iZmFsc2UiPi97YnJhbmNofS9maWxlLmNw cDwvUzptb2RpZmllZC1wYXRoPlxuJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8Uzph ZGRlZC1wYXRoIG5vZGUta2luZD0iZmlsZSIgdGV4dC1tb2RzPSJ0cnVlIiBwcm9wLW1vZHM9ImZh bHNlIj4ve2JyYW5jaH0vZGVsZXRlZC5jcHA8L1M6YWRkZWQtcGF0aD5cbicKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnPFM6ZGVsZXRlZC1wYXRoIG5vZGUta2luZD0iZmlsZSIgdGV4dC1t b2RzPSJ0cnVlIiBwcm9wLW1vZHM9ImZhbHNlIj4ve2JyYW5jaH0vYWRkZWQuY3BwPC9TOmRlbGV0 ZWQtcGF0aD5cbicuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmFu Y2g9Y29tbWl0LmJyYW5jaCBpZiBjb21taXQuYnJhbmNoLnNwbGl0KCcvJylbMF0gaW4gWyd0cnVu aycsICd0YWdzJ10gZWxzZSAnYnJhbmNoZXMve30nLmZvcm1hdChjb21taXQuYnJhbmNoKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICApIGlmICdTOmRpc2NvdmVyLWNoYW5nZWQtcGF0aHMn IGluIGRhdGFbJ1M6bG9nLXJlcG9ydCddIGVsc2UgJycsCiAgICAgICAgICAgICAgICAgICAgICAg ICApIGZvciBjb21taXQgaW4gY29tbWl0cwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5 CShyZXZpc2lvbiAyNzAzNDUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOTAsNyArMjkw LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAKICAgICAgICAgcGFydGlhbCA9IE5vbmUKICAgICAgICAg aXRlbXMgPSB4bWx0b2RpY3QucGFyc2UocmVzcG9uc2UudGV4dClbJ1M6bG9nLXJlcG9ydCddWydT OmxvZy1pdGVtJ10KLSAgICAgICAgZm9yIGdyb3VwIGluIChpdGVtcy5nZXQoJ1M6bW9kaWZpZWQt cGF0aCcsIFtdKSwgaXRlbXMuZ2V0KCdTOmFkZGVkLXBhdGgnLCBbXSkpOgorICAgICAgICBmb3Ig Z3JvdXAgaW4gKGl0ZW1zLmdldCgnUzptb2RpZmllZC1wYXRoJywgW10pLCBpdGVtcy5nZXQoJ1M6 YWRkZWQtcGF0aCcsIFtdKSwgaXRlbXMuZ2V0KCdTOmRlbGV0ZWQtcGF0aCcsIFtdKSk6CiAgICAg ICAgICAgICBmb3IgaXRlbSBpbiBncm91cCBpZiBpc2luc3RhbmNlKGdyb3VwLCBsaXN0KSBlbHNl IFtncm91cF06CiAgICAgICAgICAgICAgICAgaWYgbm90IHBhcnRpYWw6CiAgICAgICAgICAgICAg ICAgICAgIHBhcnRpYWwgPSBpdGVtWycjdGV4dCddCg== 415226 2020-12-02 08:27:21 -0800 2020-12-02 09:06:02 -0800 Patch for landing bug-219432-20201202102720.patch text/plain 6304 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDM0NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTEyLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBhZGRpbmcsIG1vZGlmeWluZyBhbmQg ZGVsZXRpbmcgZmlsZXMgb24gYnJhbmNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxOTQzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzE4OTQw ODk+CisKKyAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAg IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHk6 IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9sb2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4uX2JyYW5jaF9mb3IpOiBTdXBw b3J0IGJyYW5jaCBkZXRlY3Rpb24gd2hlbiBmaWxlcyBhcmUgYWRkZWQgb3IgZGVsZXRlZC4KKyAg ICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9s b2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4uX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL3JlbW90ZS9zdm4ucHk6Cisg ICAgICAgIChTdm4ucmVxdWVzdCk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weToKKyAgICAgICAgKFN2bi5fYnJhbmNoX2Zv cik6IFN1cHBvcnQgYnJhbmNoIGRldGVjdGlvbiB3aGVuIGZpbGVzIGFyZSBkZWxldGVkLgorCiAy MDIwLTEyLTAyICBUZXRzdWhhcnUgT2h6ZWtpICA8dGV0c3VoYXJ1Lm9oemVraUBnbWFpbC5jb20+ CiAKICAgICAgICAgQWRkIFRldHN1aGFydSBPaHpla2kgdG8gY29udHJpYnV0b3JzLmpzb24KSW5k ZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5p dF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNzAzNDUpCisrKyBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2lu ZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQ bGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5 IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lv biA9IFZlcnNpb24oMCwgNCwgMSkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDQsIDIpCiAKIEF1dG9J bnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2RhdGV1dGlsJywgVmVyc2lvbigyLCA4LCAxKSwgcHlw aV9uYW1lPSdweXRob24tZGF0ZXV0aWwnKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9z dm4ucHkJKHJldmlzaW9uIDI3MDM0NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMjQxLDE1 ICsyNDEsMTUgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICBpZiBwYXJ0aWFsIGlzIE5v bmUgYW5kIGxpbmUgPT0gJ0NoYW5nZWQgcGF0aHM6JzoKICAgICAgICAgICAgICAgICBwYXJ0aWFs ID0gJycKICAgICAgICAgICAgIGVsaWYgcGFydGlhbCA9PSAnJzoKLSAgICAgICAgICAgICAgICBw YXJ0aWFsID0gbGluZS5sc3RyaXAoKQorICAgICAgICAgICAgICAgIHBhcnRpYWwgPSBsaW5lLmxz dHJpcCgpWzI6XQogICAgICAgICAgICAgZWxpZiBwYXJ0aWFsOgogICAgICAgICAgICAgICAgIGxp bmUgPSBsaW5lLmxzdHJpcCgpCi0gICAgICAgICAgICAgICAgd2hpbGUgbGluZS5zdGFydHN3aXRo KCdNICcpIGFuZCBub3QgbGluZS5zdGFydHN3aXRoKHBhcnRpYWwpOgorICAgICAgICAgICAgICAg IHdoaWxlIGxpbmUuc3RhcnRzd2l0aCgoJ0EgJywgJ0QgJywgJ00gJykpIGFuZCBub3QgbGluZVsy Ol0uc3RhcnRzd2l0aChwYXJ0aWFsKToKICAgICAgICAgICAgICAgICAgICAgcGFydGlhbCA9IHBh cnRpYWxbOi0xXQogCiAgICAgICAgIGlmIGxlbihwYXJ0aWFsKSA8PSAzOgogICAgICAgICAgICAg cmFpc2Ugc2VsZi5FeGNlcHRpb24oJ01hbGZvcm1lZCBzZXQgIG9mIGVkaXRlZCBmaWxlcycpCi0g ICAgICAgIHBhcnRpYWwgPSBwYXJ0aWFsWzI6XS5zcGxpdCgnICcpWzBdCisgICAgICAgIHBhcnRp YWwgPSBwYXJ0aWFsLnNwbGl0KCcgJylbMF0KICAgICAgICAgY2FuZGlkYXRlID0gcGFydGlhbC5z cGxpdCgnLycpWzIgaWYgcGFydGlhbC5zdGFydHN3aXRoKCcvYnJhbmNoZXMnKSBlbHNlIDFdCiAK ICAgICAgICAgIyBUYWdzIGFyZSBhIHVuaXF1ZSBjYXNlIGZvciBTVk4sIGJlY2F1c2UgdGhleSdy ZSB0cmVhdGVkIGFzIGJyYW5jaGVzIGluIG5hdGl2ZSBTVk4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL3N2bi5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9tb2Nrcy9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI3MDM0NSkKKysrIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL3N2bi5weQkod29y a2luZyBjb3B5KQpAQCAtMTc5LDcgKzE3OSw5IEBAIGNsYXNzIFN2bihtb2Nrcy5TdWJwcm9jZXNz KToKICAgICAgICAgICAgICAgICAgICAgICAgICd7bGluZX1cbicKICAgICAgICAgICAgICAgICAg ICAgICAgICdDaGFuZ2VkIHBhdGhzOlxuJwogICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBN IC97YnJhbmNofS9DaGFuZ2VMb2dcbicKLSAgICAgICAgICAgICAgICAgICAgICAgICcgICAgTSAv e2JyYW5jaH0vZmlsZS5jcHBcbicuZm9ybWF0KAorICAgICAgICAgICAgICAgICAgICAgICAgJyAg ICBNIC97YnJhbmNofS9maWxlLmNwcFxuJworICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBE IC97YnJhbmNofS9kZWxldGVkLmNwcFxuJworICAgICAgICAgICAgICAgICAgICAgICAgJyAgICBB IC97YnJhbmNofS9hZGRlZC5jcHBcbicuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGxpbmU9c2VsZi5sb2dfbGluZShzZWxmLmZpbmQocmV2aXNpb249YXJnc1s2XSkpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJyYW5jaD1zZWxmLmZpbmQocmV2aXNpb249YXJnc1s2 XSkuYnJhbmNoIGlmIHNlbGYuZmluZChyZXZpc2lvbj1hcmdzWzZdKS5icmFuY2guc3BsaXQoJy8n KVswXSBpbiBbJ3RydW5rJywgJ3RhZ3MnXSBlbHNlICdicmFuY2hlcy97fScuZm9ybWF0KHNlbGYu ZmluZChyZXZpc2lvbj1hcmdzWzZdKS5icmFuY2gpCiAgICAgICAgICAgICAgICAgICAgICAgICAp LApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bW9ja3MvcmVtb3RlL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9yZW1vdGUvc3ZuLnB5CShyZXZpc2lvbiAy NzAzNDUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9tb2Nrcy9yZW1vdGUvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNzEsNyArMzcxLDkgQEAg Y2xhc3MgU3ZuKG1vY2tzLlJlcXVlc3RzKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29tbWl0LmF1dGhvci5lbWFpbCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICApLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8Uzptb2RpZmllZC1wYXRoIG5vZGUta2luZD0i ZmlsZSIgdGV4dC1tb2RzPSJ0cnVlIiBwcm9wLW1vZHM9ImZhbHNlIj4ve2JyYW5jaH0vQ2hhbmdl bG9nPC9TOm1vZGlmaWVkLXBhdGg+XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgJzxT Om1vZGlmaWVkLXBhdGggbm9kZS1raW5kPSJmaWxlIiB0ZXh0LW1vZHM9InRydWUiIHByb3AtbW9k cz0iZmFsc2UiPi97YnJhbmNofS9maWxlLmNwcDwvUzptb2RpZmllZC1wYXRoPlxuJy5mb3JtYXQo CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJzxTOm1vZGlmaWVkLXBhdGggbm9kZS1raW5k PSJmaWxlIiB0ZXh0LW1vZHM9InRydWUiIHByb3AtbW9kcz0iZmFsc2UiPi97YnJhbmNofS9maWxl LmNwcDwvUzptb2RpZmllZC1wYXRoPlxuJworICAgICAgICAgICAgICAgICAgICAgICAgICAgICc8 UzphZGRlZC1wYXRoIG5vZGUta2luZD0iZmlsZSIgdGV4dC1tb2RzPSJ0cnVlIiBwcm9wLW1vZHM9 ImZhbHNlIj4ve2JyYW5jaH0vZGVsZXRlZC5jcHA8L1M6YWRkZWQtcGF0aD5cbicKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnPFM6ZGVsZXRlZC1wYXRoIG5vZGUta2luZD0iZmlsZSIgdGV4 dC1tb2RzPSJ0cnVlIiBwcm9wLW1vZHM9ImZhbHNlIj4ve2JyYW5jaH0vYWRkZWQuY3BwPC9TOmRl bGV0ZWQtcGF0aD5cbicuZm9ybWF0KAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi cmFuY2g9Y29tbWl0LmJyYW5jaCBpZiBjb21taXQuYnJhbmNoLnNwbGl0KCcvJylbMF0gaW4gWyd0 cnVuaycsICd0YWdzJ10gZWxzZSAnYnJhbmNoZXMve30nLmZvcm1hdChjb21taXQuYnJhbmNoKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICApIGlmICdTOmRpc2NvdmVyLWNoYW5nZWQtcGF0 aHMnIGluIGRhdGFbJ1M6bG9nLXJlcG9ydCddIGVsc2UgJycsCiAgICAgICAgICAgICAgICAgICAg ICAgICApIGZvciBjb21taXQgaW4gY29tbWl0cwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3Zu LnB5CShyZXZpc2lvbiAyNzAzNDUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOTAsNyAr MjkwLDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAKICAgICAgICAgcGFydGlhbCA9IE5vbmUKICAgICAg ICAgaXRlbXMgPSB4bWx0b2RpY3QucGFyc2UocmVzcG9uc2UudGV4dClbJ1M6bG9nLXJlcG9ydCdd WydTOmxvZy1pdGVtJ10KLSAgICAgICAgZm9yIGdyb3VwIGluIChpdGVtcy5nZXQoJ1M6bW9kaWZp ZWQtcGF0aCcsIFtdKSwgaXRlbXMuZ2V0KCdTOmFkZGVkLXBhdGgnLCBbXSkpOgorICAgICAgICBm b3IgZ3JvdXAgaW4gKGl0ZW1zLmdldCgnUzptb2RpZmllZC1wYXRoJywgW10pLCBpdGVtcy5nZXQo J1M6YWRkZWQtcGF0aCcsIFtdKSwgaXRlbXMuZ2V0KCdTOmRlbGV0ZWQtcGF0aCcsIFtdKSk6CiAg ICAgICAgICAgICBmb3IgaXRlbSBpbiBncm91cCBpZiBpc2luc3RhbmNlKGdyb3VwLCBsaXN0KSBl bHNlIFtncm91cF06CiAgICAgICAgICAgICAgICAgaWYgbm90IHBhcnRpYWw6CiAgICAgICAgICAg ICAgICAgICAgIHBhcnRpYWwgPSBpdGVtWycjdGV4dCddCg==