216333 2020-09-09 16:20:08 -0700 [webkitscmpy] Add tags, branches queries on local repositories 2020-09-10 08:28:49 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215862 InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu jlewis3 webkit-bug-importer oldest_to_newest 1687191 0 jbedard 2020-09-09 16:20:08 -0700 Add a set of functions to list all branches and tags for a local repository. 1687192 1 webkit-bug-importer 2020-09-09 16:20:44 -0700 <rdar://problem/68603047> 1687197 2 408384 jbedard 2020-09-09 16:34:52 -0700 Created attachment 408384 Patch 1687200 3 408384 dewei_zhu 2020-09-09 17:16:19 -0700 Comment on attachment 408384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408384&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:60 > + with mocks.local.Git(self.path, branches=('branch-1', 'branch-2')): > + self.assertEqual( > + local.Git(self.path).branches, > + ['main', 'branch-1', 'branch-2'], > + ) Maybe add `remotes/origin/HEAD -> origin/main`to the test case and expect it to be excluded? 1687201 4 408384 dewei_zhu 2020-09-09 17:17:52 -0700 Comment on attachment 408384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408384&action=review >> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/git_unittest.py:60 >> + ) > > Maybe add `remotes/origin/HEAD -> origin/main`to the test case and expect it to be excluded? Maybe also include `* current-bench` to expect it to be 'current-branch' in the output. 1687274 5 408413 jbedard 2020-09-09 22:35:44 -0700 Created attachment 408413 Patch 1687389 6 ews-feeder 2020-09-10 08:28:49 -0700 Committed r266826: <https://trac.webkit.org/changeset/266826> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408413. 408384 2020-09-09 16:34:52 -0700 2020-09-09 22:35:42 -0700 Patch bug-216333-20200909163451.patch text/plain 11825 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NjgwNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM5IEBACisyMDIwLTA5LTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCB0YWdzLCBicmFuY2hlcyBxdWVyaWVzIG9u IGxvY2FsIHJlcG9zaXRvcmllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE2MzMzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODYwMzA0Nz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5OiBCdW1wIHZlcnNp b24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0KToKKyAgICAgICAgKEdpdC5icmFuY2hlcyk6IExp c3QgYWxsIGJyYW5jaGVzIGFzc29jaWF0ZWQgd2l0aCBhIGxvY2FsIHJlcG9zaXRvcnkuCisgICAg ICAgIChHaXQudGFncyk6IExpc3QgYWxsIHRhZ3MgYXNzb2NpYXRlZCB3aXRoIGEgbG9jYWwgcmVw b3NpdG9yeS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9sb2NhbC9zY20ucHk6CisgICAgICAgIChTY20pOgorICAgICAgICAoU2NtLmJyYW5jaGVz KToKKyAgICAgICAgKFNjbS50YWdzKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4pOgorICAgICAg ICAoU3ZuLmxpc3QpOgorICAgICAgICAoU3ZuLmJyYW5jaGVzKTogTGlzdCBhbGwgYnJhbmNoZXMg YXNzb2NpYXRlZCB3aXRoIGEgbG9jYWwgcmVwb3NpdG9yeS4KKyAgICAgICAgKFN2bi50YWdzKTog TGlzdCBhbGwgYnJhbmNoZXMgYXNzb2NpYXRlZCB3aXRoIGEgbG9jYWwgcmVwb3NpdG9yeS4KKyAg ICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9s b2NhbC9naXQucHk6CisgICAgICAgIChHaXQuX19pbml0X18pOiBBZGQgJ2dpdCBicmFuY2ggLWEn IGFuZCAnZ2l0IHRhZycsIGNoYW5nZSBkZWZhdWx0IGJyYW5jaC4KKyAgICAgICAgKiBTY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9zdm4ucHk6Cisg ICAgICAgIChTdm4uX19pbml0X18pOiBBZGQgJ3N2biBsaXN0IF4vKicgY29tbWFuZHMuCisgICAg ICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRf dW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0R2l0LnRlc3RfYnJhbmNoKTogQ2hhbmdlIGRlZmF1 bHQgYnJhbmNoIHRvIG1haW4uCisgICAgICAgIChUZXN0R2l0KToKKyAgICAgICAgKFRlc3RHaXQu dGVzdF9icmFuY2hlcyk6CisgICAgICAgIChUZXN0R2l0LnRlc3RfdGFncyk6CisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRl c3QucHk6CisgICAgICAgIChUZXN0U3ZuKToKKyAgICAgICAgKFRlc3RTdm4udGVzdF9icmFuY2hl cyk6CisgICAgICAgIChUZXN0U3ZuLnRlc3RfdGFncyk6CisKIDIwMjAtMDktMDkgIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIGV3cyBtaWdodCBtYXJrIGJ1 aWxkIGFzIHN1Y2Nlc3NmdWwgaWYgdGVzdHMgZmFpbCB0byBydW4KSW5kZXg6IFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19f aW5pdF9fLnB5CShyZXZpc2lvbiAyNjY3OTkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYs NyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3 ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgt dXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwg MCwgMikKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDAsIDMpCiAKIGZyb20gd2Via2l0c2NtcHkgaW1w b3J0IGxvY2FsCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBtb2NrcwpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjY2Nzk5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CSh3b3JraW5nIGNvcHkpCkBA IC01OCw2ICs1OCwyMCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIHJhaXNlIHNlbGYu RXhjZXB0aW9uKCdGYWlsZWQgdG8gcmV0cmlldmUgYnJhbmNoIGZvciB7fScuZm9ybWF0KHNlbGYu cm9vdF9wYXRoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC5zdGRvdXQucnN0cmlwKCkKIAorICAg IEBwcm9wZXJ0eQorICAgIGRlZiBicmFuY2hlcyhzZWxmKToKKyAgICAgICAgYnJhbmNoID0gcnVu KFtzZWxmLmV4ZWN1dGFibGUsICdicmFuY2gnLCAnLWEnXSwgY3dkPXNlbGYucm9vdF9wYXRoLCBj YXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQorICAgICAgICBpZiBicmFuY2gu cmV0dXJuY29kZToKKyAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdGYWlsZWQgdG8g cmV0cmlldmUgYnJhbmNoIGxpc3QgZm9yIHt9Jy5mb3JtYXQoc2VsZi5yb290X3BhdGgpKQorICAg ICAgICByZXR1cm4gW2JyYW5jaC5sc3RyaXAoJyAqJykgZm9yIGJyYW5jaCBpbiBmaWx0ZXIobGFt YmRhIGJyYW5jaDogJy0+JyBub3QgaW4gYnJhbmNoLCBicmFuY2guc3Rkb3V0LnNwbGl0bGluZXMo KSldCisKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgdGFncyhzZWxmKToKKyAgICAgICAgdGFncyA9 IHJ1bihbc2VsZi5leGVjdXRhYmxlLCAndGFnJ10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVy ZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKKyAgICAgICAgaWYgdGFncy5yZXR1cm5j b2RlOgorICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0ZhaWxlZCB0byByZXRyaWV2 ZSB0YWcgbGlzdCBmb3Ige30nLmZvcm1hdChzZWxmLnJvb3RfcGF0aCkpCisgICAgICAgIHJldHVy biB0YWdzLnN0ZG91dC5zcGxpdGxpbmVzKCkKKwogICAgIGRlZiByZW1vdGUoc2VsZiwgbmFtZT1O b25lKToKICAgICAgICAgcmVzdWx0ID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUsICdyZW1vdGUnLCAn Z2V0LXVybCcsIG5hbWUgb3IgJ29yaWdpbiddLCBjd2Q9c2VsZi5yb290X3BhdGgsIGNhcHR1cmVf b3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCiAgICAgICAgIGlmIHJlc3VsdC5yZXR1cm5j b2RlOgpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbG9jYWwvc2NtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQkocmV2aXNpb24gMjY2Nzk5KQorKysg VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc2Nt LnB5CSh3b3JraW5nIGNvcHkpCkBAIC01MCw1ICs1MCwxMyBAQCBjbGFzcyBTY20ob2JqZWN0KToK ICAgICBkZWYgYnJhbmNoKHNlbGYpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9y KCkKIAorICAgIEBwcm9wZXJ0eQorICAgIGRlZiBicmFuY2hlcyhzZWxmKToKKyAgICAgICAgcmFp c2UgTm90SW1wbGVtZW50ZWRFcnJvcigpCisKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgdGFncyhz ZWxmKToKKyAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigpCisKICAgICBkZWYgcmVt b3RlKHNlbGYsIG5hbWU9Tm9uZSk6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3Io KQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvc3ZuLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkocmV2aXNpb24gMjY2Nzk5KQorKysgVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC02MCw1ICs2MCwxOSBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAg ICAgICAgIHJldHVybiBzZWxmLmluZm8oKVsnUmVsYXRpdmUgVVJMJ11bMjotbGVuKGxvY2FsX3Bh dGgpXQogICAgICAgICByZXR1cm4gc2VsZi5pbmZvKClbJ1JlbGF0aXZlIFVSTCddWzI6XQogCisg ICAgZGVmIGxpc3Qoc2VsZiwgY2F0ZWdvcnkpOgorICAgICAgICBsaXN0X3Jlc3VsdCA9IHJ1bihb c2VsZi5leGVjdXRhYmxlLCAnbGlzdCcsICdeL3t9Jy5mb3JtYXQoY2F0ZWdvcnkpXSwgY3dkPXNl bGYucGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKKyAgICAgICAg aWYgbGlzdF9yZXN1bHQucmV0dXJuY29kZToKKyAgICAgICAgICAgIHJldHVybiBbXQorICAgICAg ICByZXR1cm4gW2VsZW1lbnQucnN0cmlwKCcvJykgZm9yIGVsZW1lbnQgaW4gbGlzdF9yZXN1bHQu c3Rkb3V0LnNwbGl0bGluZXMoKV0KKworICAgIEBwcm9wZXJ0eQorICAgIGRlZiBicmFuY2hlcyhz ZWxmKToKKyAgICAgICAgcmV0dXJuIFsndHJ1bmsnXSArIHNlbGYubGlzdCgnYnJhbmNoZXMnKQor CisgICAgQHByb3BlcnR5CisgICAgZGVmIHRhZ3Moc2VsZik6CisgICAgICAgIHJldHVybiBzZWxm Lmxpc3QoJ3RhZ3MnKQorCiAgICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUpOgogICAgICAg ICByZXR1cm4gc2VsZi5pbmZvKClbJ1JlcG9zaXRvcnkgUm9vdCddCkluZGV4OiBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CShyZXZpc2lvbiAyNjY3OTkpCisrKyBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJ KHdvcmtpbmcgY29weSkKQEAgLTI3LDEyICsyNywyMCBAQCBmcm9tIHdlYmtpdHNjbXB5IGltcG9y dCBsb2NhbAogCiAKIGNsYXNzIEdpdChtb2Nrcy5TdWJwcm9jZXNzKToKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgcGF0aD0nLy5pbnZhbGlkLWdpdCcsIGJyYW5jaD1Ob25lLCByZW1vdGU9Tm9uZSwg ZGV0YWNoZWQ9Tm9uZSk6CisKKyAgICBkZWYgX19pbml0X18oCisgICAgICAgIHNlbGYsIHBhdGg9 Jy8uaW52YWxpZC1naXQnLAorICAgICAgICBicmFuY2g9Tm9uZSwgcmVtb3RlPU5vbmUsIGJyYW5j aGVzPU5vbmUsIHRhZ3M9Tm9uZSwKKyAgICAgICAgZGV0YWNoZWQ9Tm9uZSwgZGVmYXVsdF9icmFu Y2g9J21haW4nLAorICAgICk6CiAgICAgICAgIHNlbGYucGF0aCA9IHBhdGgKLSAgICAgICAgc2Vs Zi5icmFuY2ggPSBicmFuY2ggb3IgJ21hc3RlcicKKyAgICAgICAgc2VsZi5icmFuY2ggPSBicmFu Y2ggb3IgZGVmYXVsdF9icmFuY2gKICAgICAgICAgc2VsZi5yZW1vdGUgPSByZW1vdGUgb3IgJ2dp dEB3ZWJraXQub3JnOi9tb2NrL3t9Jy5mb3JtYXQob3MucGF0aC5iYXNlbmFtZShwYXRoKSkKICAg ICAgICAgc2VsZi5kZXRhY2hlZCA9IGRldGFjaGVkIG9yIEZhbHNlCiAKKyAgICAgICAgc2VsZi5i cmFuY2hlcyA9IGJyYW5jaGVzIG9yIFtdCisgICAgICAgIHNlbGYudGFncyA9IHRhZ3Mgb3IgW10K KwogICAgICAgICBzdXBlcihHaXQsIHNlbGYpLl9faW5pdF9fKAogICAgICAgICAgICAgbW9ja3Mu U3VicHJvY2Vzcy5Sb3V0ZSgKICAgICAgICAgICAgICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSwg J3N0YXR1cycsCkBAIC03NCw2ICs4MiwyMCBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0 cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgIHN0ZGVycj0iZmF0YWw6IE5vIHN1Y2ggcmVt b3RlICd7fSdcbiIuZm9ybWF0KGFyZ3NbM10pLAogICAgICAgICAgICAgICAgICksCiAgICAgICAg ICAgICApLCBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAorICAgICAgICAgICAgICAgIGxvY2FsLkdp dC5leGVjdXRhYmxlLCAnYnJhbmNoJywgJy1hJywKKyAgICAgICAgICAgICAgICBjd2Q9c2VsZi5w YXRoLAorICAgICAgICAgICAgICAgIGdlbmVyYXRvcj1sYW1iZGEgKmFyZ3MsICoqa3dhcmdzOiBt b2Nrcy5Qcm9jZXNzQ29tcGxldGlvbigKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0w LAorICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9J1xuJy5qb2luKFtkZWZhdWx0X2JyYW5jaF0g KyBsaXN0KHNlbGYuYnJhbmNoZXMpKSArICdcbicsCisgICAgICAgICAgICAgICAgKSwKKyAgICAg ICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAgbG9jYWwu R2l0LmV4ZWN1dGFibGUsICd0YWcnLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCisg ICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJkYSAqYXJncywgKiprd2FyZ3M6IG1vY2tzLlBy b2Nlc3NDb21wbGV0aW9uKAorICAgICAgICAgICAgICAgICAgICByZXR1cm5jb2RlPTAsCisgICAg ICAgICAgICAgICAgICAgIHN0ZG91dD0nXG4nLmpvaW4oc2VsZi50YWdzKSArICdcbicsCisgICAg ICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCiAg ICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUsCiAgICAgICAgICAgICAgICAgY3dk PXNlbGYucGF0aCwKICAgICAgICAgICAgICAgICBjb21wbGV0aW9uPW1vY2tzLlByb2Nlc3NDb21w bGV0aW9uKApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvbG9jYWwvc3ZuLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL3N2bi5weQkocmV2aXNp b24gMjY2Nzk5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbW9ja3MvbG9jYWwvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNywxMSArMjcsMTQg QEAgZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogCiBjbGFzcyBTdm4obW9ja3MuU3Vi cHJvY2Vzcyk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGg9Jy8uaW52YWxpZC1zdm4nLCBi cmFuY2g9Tm9uZSwgcmVtb3RlPU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwYXRoPScv LmludmFsaWQtc3ZuJywgYnJhbmNoPU5vbmUsIHJlbW90ZT1Ob25lLCBicmFuY2hlcz1Ob25lLCB0 YWdzPU5vbmUpOgogICAgICAgICBzZWxmLnBhdGggPSBwYXRoCiAgICAgICAgIHNlbGYuYnJhbmNo ID0gYnJhbmNoIG9yICd0cnVuaycKICAgICAgICAgc2VsZi5yZW1vdGUgPSByZW1vdGUgb3IgJ2h0 dHBzOi8vc3ZuLm1vY2sub3JnL3JlcG9zaXRvcnkve30nLmZvcm1hdChvcy5wYXRoLmJhc2VuYW1l KHBhdGgpKQogCisgICAgICAgIHNlbGYuYnJhbmNoZXMgPSBicmFuY2hlcyBvciBbXQorICAgICAg ICBzZWxmLnRhZ3MgPSB0YWdzIG9yIFtdCisKICAgICAgICAgc3VwZXIoU3ZuLCBzZWxmKS5fX2lu aXRfXygKICAgICAgICAgICAgIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCiAgICAgICAgICAgICAg ICAgbG9jYWwuU3ZuLmV4ZWN1dGFibGUsICdpbmZvJywKQEAgLTUxLDYgKzU0LDIwIEBAIGNsYXNz IFN2bihtb2Nrcy5TdWJwcm9jZXNzKToKICAgICAgICAgICAgICAgICAgICAgICAgICksCiAgICAg ICAgICAgICAgICAgKSwKICAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisg ICAgICAgICAgICAgICAgbG9jYWwuU3ZuLmV4ZWN1dGFibGUsICdsaXN0JywgJ14vYnJhbmNoZXMn LAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgZ2VuZXJh dG9yPWxhbWJkYSAqYXJncywgKiprd2FyZ3M6IG1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKAorICAg ICAgICAgICAgICAgICAgICByZXR1cm5jb2RlPTAsCisgICAgICAgICAgICAgICAgICAgIHN0ZG91 dD0nL1xuJy5qb2luKHNlbGYuYnJhbmNoZXMpICsgJy9cbicsCisgICAgICAgICAgICAgICAgKSwK KyAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAg bG9jYWwuU3ZuLmV4ZWN1dGFibGUsICdsaXN0JywgJ14vdGFncycsCisgICAgICAgICAgICAgICAg Y3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICphcmdzLCAq Kmt3YXJnczogbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCisgICAgICAgICAgICAgICAgICAgIHJl dHVybmNvZGU9MCwKKyAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PScvXG4nLmpvaW4oc2VsZi50 YWdzKSArICcvXG4nLAorICAgICAgICAgICAgICAgICksCisgICAgICAgICAgICApLCBtb2Nrcy5T dWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIGxvY2FsLlN2bi5leGVjdXRhYmxlLAog ICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCiAgICAgICAgICAgICAgICAgY29tcGxldGlv bj1tb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbigKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qv Z2l0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjY3OTkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBjbGFzcyBUZXN0R2l0KHVuaXR0ZXN0LlRlc3RDYXNl KToKIAogICAgIGRlZiB0ZXN0X2JyYW5jaChzZWxmKToKICAgICAgICAgd2l0aCBtb2Nrcy5sb2Nh bC5HaXQoc2VsZi5wYXRoKToKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0 KHNlbGYucGF0aCkuYnJhbmNoLCAnbWFzdGVyJykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwobG9jYWwuR2l0KHNlbGYucGF0aCkuYnJhbmNoLCAnbWFpbicpCiAKICAgICAgICAgd2l0aCBt b2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBkZXRhY2hlZD1UcnVlKToKICAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0KHNlbGYucGF0aCkuYnJhbmNoLCBOb25lKQpAQCAtNTEs MyArNTEsMTcgQEAgY2xhc3MgVGVzdEdpdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRl c3RfcmVtb3RlKHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgp IGFzIHJlcG86CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLkdpdChzZWxmLnBh dGgpLnJlbW90ZSgpLCByZXBvLnJlbW90ZSkKKworICAgIGRlZiB0ZXN0X2JyYW5jaGVzKHNlbGYp OgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGJyYW5jaGVzPSgnYnJh bmNoLTEnLCAnYnJhbmNoLTInKSk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAg ICAgICAgICAgICAgIGxvY2FsLkdpdChzZWxmLnBhdGgpLmJyYW5jaGVzLAorICAgICAgICAgICAg ICAgIFsnbWFpbicsICdicmFuY2gtMScsICdicmFuY2gtMiddLAorICAgICAgICAgICAgKQorCisg ICAgZGVmIHRlc3RfdGFncyhzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2Vs Zi5wYXRoLCB0YWdzPSgndGFnLTEnLCAndGFnLTInKSk6CisgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKAorICAgICAgICAgICAgICAgIGxvY2FsLkdpdChzZWxmLnBhdGgpLnRhZ3MsCisgICAg ICAgICAgICAgICAgWyd0YWctMScsICd0YWctMiddLAorICAgICAgICAgICAgKQpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2Njc5OSkKKysr IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3Zu X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00OCwzICs0OCwxNyBAQCBjbGFzcyBUZXN0 U3ZuKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9yZW1vdGUoc2VsZik6CiAgICAg ICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCkgYXMgcmVwbzoKICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuU3ZuKHNlbGYucGF0aCkucmVtb3RlKCksIHJlcG8ucmVt b3RlKQorCisgICAgZGVmIHRlc3RfYnJhbmNoZXMoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3Mu bG9jYWwuU3ZuKHNlbGYucGF0aCwgYnJhbmNoZXM9KCdicmFuY2gtMScsICdicmFuY2gtMicpKToK KyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgbG9jYWwuU3Zu KHNlbGYucGF0aCkuYnJhbmNoZXMsCisgICAgICAgICAgICAgICAgWyd0cnVuaycsICdicmFuY2gt MScsICdicmFuY2gtMiddLAorICAgICAgICAgICAgKQorCisgICAgZGVmIHRlc3RfdGFncyhzZWxm KToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4oc2VsZi5wYXRoLCB0YWdzPSgndGFnLTEn LCAndGFnLTInKSk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAg ICAgIGxvY2FsLlN2bihzZWxmLnBhdGgpLnRhZ3MsCisgICAgICAgICAgICAgICAgWyd0YWctMScs ICd0YWctMiddLAorICAgICAgICAgICAgKQo= 408413 2020-09-09 22:35:44 -0700 2020-09-10 08:28:49 -0700 Patch bug-216333-20200909223543.patch text/plain 11923 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NjgxNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM5IEBACisyMDIwLTA5LTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCB0YWdzLCBicmFuY2hlcyBxdWVyaWVzIG9u IGxvY2FsIHJlcG9zaXRvcmllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE2MzMzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82ODYwMzA0Nz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBEZXdlaSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogQnVtcCB2ZXJzaW9uLgor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2Fs L2dpdC5weToKKyAgICAgICAgKEdpdCk6CisgICAgICAgIChHaXQuYnJhbmNoZXMpOiBMaXN0IGFs bCBicmFuY2hlcyBhc3NvY2lhdGVkIHdpdGggYSBsb2NhbCByZXBvc2l0b3J5LgorICAgICAgICAo R2l0LnRhZ3MpOiBMaXN0IGFsbCB0YWdzIGFzc29jaWF0ZWQgd2l0aCBhIGxvY2FsIHJlcG9zaXRv cnkuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvc2NtLnB5OgorICAgICAgICAoU2NtKToKKyAgICAgICAgKFNjbS5icmFuY2hlcyk6Cisg ICAgICAgIChTY20udGFncyk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5OgorICAgICAgICAoU3ZuKToKKyAgICAgICAgKFN2 bi5saXN0KToKKyAgICAgICAgKFN2bi5icmFuY2hlcyk6IExpc3QgYWxsIGJyYW5jaGVzIGFzc29j aWF0ZWQgd2l0aCBhIGxvY2FsIHJlcG9zaXRvcnkuCisgICAgICAgIChTdm4udGFncyk6IExpc3Qg YWxsIGJyYW5jaGVzIGFzc29jaWF0ZWQgd2l0aCBhIGxvY2FsIHJlcG9zaXRvcnkuCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwv Z2l0LnB5OgorICAgICAgICAoR2l0Ll9faW5pdF9fKTogQWRkICdnaXQgYnJhbmNoIC1hJyBhbmQg J2dpdCB0YWcnLCBjaGFuZ2UgZGVmYXVsdCBicmFuY2guCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvc3ZuLnB5OgorICAgICAg ICAoU3ZuLl9faW5pdF9fKTogQWRkICdzdm4gbGlzdCBeLyonIGNvbW1hbmRzLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdC50ZXN0X2JyYW5jaCk6IENoYW5nZSBkZWZhdWx0IGJy YW5jaCB0byBtYWluLgorICAgICAgICAoVGVzdEdpdCk6CisgICAgICAgIChUZXN0R2l0LnRlc3Rf YnJhbmNoZXMpOgorICAgICAgICAoVGVzdEdpdC50ZXN0X3RhZ3MpOgorICAgICAgICAqIFNjcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5 OgorICAgICAgICAoVGVzdFN2bik6CisgICAgICAgIChUZXN0U3ZuLnRlc3RfYnJhbmNoZXMpOgor ICAgICAgICAoVGVzdFN2bi50ZXN0X3RhZ3MpOgorCiAyMDIwLTA5LTA5ICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFNpbXBsaWZ5IE9wdGlvblNldDo6c2V0Cklu ZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2lu aXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY2ODE0KQorKysgVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtp bmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAi UGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVw eSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNp b24gPSBWZXJzaW9uKDAsIDAsIDIpCit2ZXJzaW9uID0gVmVyc2lvbigwLCAwLCAzKQogCiBmcm9t IHdlYmtpdHNjbXB5IGltcG9ydCBsb2NhbAogZnJvbSB3ZWJraXRzY21weSBpbXBvcnQgbW9ja3MK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv Y2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI2NjgxNCkKKysrIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQko d29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgsMjAgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAg ICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIHJldHJpZXZlIGJyYW5jaCBmb3Ig e30nLmZvcm1hdChzZWxmLnJvb3RfcGF0aCkpCiAgICAgICAgIHJldHVybiByZXN1bHQuc3Rkb3V0 LnJzdHJpcCgpCiAKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgYnJhbmNoZXMoc2VsZik6CisgICAg ICAgIGJyYW5jaCA9IHJ1bihbc2VsZi5leGVjdXRhYmxlLCAnYnJhbmNoJywgJy1hJ10sIGN3ZD1z ZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKKyAg ICAgICAgaWYgYnJhbmNoLnJldHVybmNvZGU6CisgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2Vw dGlvbignRmFpbGVkIHRvIHJldHJpZXZlIGJyYW5jaCBsaXN0IGZvciB7fScuZm9ybWF0KHNlbGYu cm9vdF9wYXRoKSkKKyAgICAgICAgcmV0dXJuIFticmFuY2gubHN0cmlwKCcgKicpIGZvciBicmFu Y2ggaW4gZmlsdGVyKGxhbWJkYSBicmFuY2g6ICctPicgbm90IGluIGJyYW5jaCwgYnJhbmNoLnN0 ZG91dC5zcGxpdGxpbmVzKCkpXQorCisgICAgQHByb3BlcnR5CisgICAgZGVmIHRhZ3Moc2VsZik6 CisgICAgICAgIHRhZ3MgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSwgJ3RhZyddLCBjd2Q9c2VsZi5y b290X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCisgICAgICAg IGlmIHRhZ3MucmV0dXJuY29kZToKKyAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdG YWlsZWQgdG8gcmV0cmlldmUgdGFnIGxpc3QgZm9yIHt9Jy5mb3JtYXQoc2VsZi5yb290X3BhdGgp KQorICAgICAgICByZXR1cm4gdGFncy5zdGRvdXQuc3BsaXRsaW5lcygpCisKICAgICBkZWYgcmVt b3RlKHNlbGYsIG5hbWU9Tm9uZSk6CiAgICAgICAgIHJlc3VsdCA9IHJ1bihbc2VsZi5leGVjdXRh YmxlLCAncmVtb3RlJywgJ2dldC11cmwnLCBuYW1lIG9yICdvcmlnaW4nXSwgY3dkPXNlbGYucm9v dF9wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQogICAgICAgICBp ZiByZXN1bHQucmV0dXJuY29kZToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkJKHJldmlz aW9uIDI2NjgxNCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2xvY2FsL3NjbS5weQkod29ya2luZyBjb3B5KQpAQCAtNTAsNSArNTAsMTMgQEAgY2xh c3MgU2NtKG9iamVjdCk6CiAgICAgZGVmIGJyYW5jaChzZWxmKToKICAgICAgICAgcmFpc2UgTm90 SW1wbGVtZW50ZWRFcnJvcigpCiAKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgYnJhbmNoZXMoc2Vs Zik6CisgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoKQorCisgICAgQHByb3BlcnR5 CisgICAgZGVmIHRhZ3Moc2VsZik6CisgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3Io KQorCiAgICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUpOgogICAgICAgICByYWlzZSBOb3RJ bXBsZW1lbnRlZEVycm9yKCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHJldmlzaW9u IDI2NjgxNCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L2xvY2FsL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtNjAsNSArNjAsMTkgQEAgY2xhc3Mg U3ZuKFNjbSk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5pbmZvKClbJ1JlbGF0aXZlIFVSTCdd WzI6LWxlbihsb2NhbF9wYXRoKV0KICAgICAgICAgcmV0dXJuIHNlbGYuaW5mbygpWydSZWxhdGl2 ZSBVUkwnXVsyOl0KIAorICAgIGRlZiBsaXN0KHNlbGYsIGNhdGVnb3J5KToKKyAgICAgICAgbGlz dF9yZXN1bHQgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSwgJ2xpc3QnLCAnXi97fScuZm9ybWF0KGNh dGVnb3J5KV0sIGN3ZD1zZWxmLnBhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1 dGYtOCcpCisgICAgICAgIGlmIGxpc3RfcmVzdWx0LnJldHVybmNvZGU6CisgICAgICAgICAgICBy ZXR1cm4gW10KKyAgICAgICAgcmV0dXJuIFtlbGVtZW50LnJzdHJpcCgnLycpIGZvciBlbGVtZW50 IGluIGxpc3RfcmVzdWx0LnN0ZG91dC5zcGxpdGxpbmVzKCldCisKKyAgICBAcHJvcGVydHkKKyAg ICBkZWYgYnJhbmNoZXMoc2VsZik6CisgICAgICAgIHJldHVybiBbJ3RydW5rJ10gKyBzZWxmLmxp c3QoJ2JyYW5jaGVzJykKKworICAgIEBwcm9wZXJ0eQorICAgIGRlZiB0YWdzKHNlbGYpOgorICAg ICAgICByZXR1cm4gc2VsZi5saXN0KCd0YWdzJykKKwogICAgIGRlZiByZW1vdGUoc2VsZiwgbmFt ZT1Ob25lKToKICAgICAgICAgcmV0dXJuIHNlbGYuaW5mbygpWydSZXBvc2l0b3J5IFJvb3QnXQpJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9j a3MvbG9jYWwvZ2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjY2ODE0 KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9j a3MvbG9jYWwvZ2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNywxMiArMjcsMjAgQEAgZnJvbSB3 ZWJraXRzY21weSBpbXBvcnQgbG9jYWwKIAogCiBjbGFzcyBHaXQobW9ja3MuU3VicHJvY2Vzcyk6 Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGg9Jy8uaW52YWxpZC1naXQnLCBicmFuY2g9Tm9u ZSwgcmVtb3RlPU5vbmUsIGRldGFjaGVkPU5vbmUpOgorCisgICAgZGVmIF9faW5pdF9fKAorICAg ICAgICBzZWxmLCBwYXRoPScvLmludmFsaWQtZ2l0JywKKyAgICAgICAgYnJhbmNoPU5vbmUsIHJl bW90ZT1Ob25lLCBicmFuY2hlcz1Ob25lLCB0YWdzPU5vbmUsCisgICAgICAgIGRldGFjaGVkPU5v bmUsIGRlZmF1bHRfYnJhbmNoPSdtYWluJywKKyAgICApOgogICAgICAgICBzZWxmLnBhdGggPSBw YXRoCi0gICAgICAgIHNlbGYuYnJhbmNoID0gYnJhbmNoIG9yICdtYXN0ZXInCisgICAgICAgIHNl bGYuYnJhbmNoID0gYnJhbmNoIG9yIGRlZmF1bHRfYnJhbmNoCiAgICAgICAgIHNlbGYucmVtb3Rl ID0gcmVtb3RlIG9yICdnaXRAd2Via2l0Lm9yZzovbW9jay97fScuZm9ybWF0KG9zLnBhdGguYmFz ZW5hbWUocGF0aCkpCiAgICAgICAgIHNlbGYuZGV0YWNoZWQgPSBkZXRhY2hlZCBvciBGYWxzZQog CisgICAgICAgIHNlbGYuYnJhbmNoZXMgPSBicmFuY2hlcyBvciBbXQorICAgICAgICBzZWxmLnRh Z3MgPSB0YWdzIG9yIFtdCisKICAgICAgICAgc3VwZXIoR2l0LCBzZWxmKS5fX2luaXRfXygKICAg ICAgICAgICAgIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCiAgICAgICAgICAgICAgICAgbG9jYWwu R2l0LmV4ZWN1dGFibGUsICdzdGF0dXMnLApAQCAtNzQsNiArODIsMjEgQEAgbm90aGluZyB0byBj b21taXQsIHdvcmtpbmcgdHJlZSBjbGVhbgogICAgICAgICAgICAgICAgICAgICBzdGRlcnI9ImZh dGFsOiBObyBzdWNoIHJlbW90ZSAne30nXG4iLmZvcm1hdChhcmdzWzNdKSwKICAgICAgICAgICAg ICAgICApLAogICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKKyAgICAgICAg ICAgICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSwgJ2JyYW5jaCcsICctYScsCisgICAgICAgICAg ICAgICAgY3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICph cmdzLCAqKmt3YXJnczogbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCisgICAgICAgICAgICAgICAg ICAgIHJldHVybmNvZGU9MCwKKyAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihz b3J0ZWQoWycqICcgKyBzZWxmLmJyYW5jaF0gKyBsaXN0KCh7ZGVmYXVsdF9icmFuY2h9IHwgc2V0 KHNlbGYuYnJhbmNoZXMpKSAtIHtzZWxmLmJyYW5jaH0pKSkgKworICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ1xucmVtb3Rlcy9vcmlnaW4vSEVBRCAtPiBvcmlnaW4ve31cbicuZm9ybWF0KGRl ZmF1bHRfYnJhbmNoKSwKKyAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgKSwgbW9ja3Mu U3VicHJvY2Vzcy5Sb3V0ZSgKKyAgICAgICAgICAgICAgICBsb2NhbC5HaXQuZXhlY3V0YWJsZSwg J3RhZycsCisgICAgICAgICAgICAgICAgY3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICBn ZW5lcmF0b3I9bGFtYmRhICphcmdzLCAqKmt3YXJnczogbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24o CisgICAgICAgICAgICAgICAgICAgIHJldHVybmNvZGU9MCwKKyAgICAgICAgICAgICAgICAgICAg c3Rkb3V0PSdcbicuam9pbihzZWxmLnRhZ3MpICsgJ1xuJywKKyAgICAgICAgICAgICAgICApLAor ICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKICAgICAgICAgICAgICAgICBs b2NhbC5HaXQuZXhlY3V0YWJsZSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAogICAg ICAgICAgICAgICAgIGNvbXBsZXRpb249bW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCkluZGV4OiBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2Nh bC9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvc3ZuLnB5CShyZXZpc2lvbiAyNjY4MTQpCisrKyBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2Nh bC9zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDExICsyNywxNCBAQCBmcm9tIHdlYmtpdHNj bXB5IGltcG9ydCBsb2NhbAogCiAKIGNsYXNzIFN2bihtb2Nrcy5TdWJwcm9jZXNzKToKLSAgICBk ZWYgX19pbml0X18oc2VsZiwgcGF0aD0nLy5pbnZhbGlkLXN2bicsIGJyYW5jaD1Ob25lLCByZW1v dGU9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGg9Jy8uaW52YWxpZC1zdm4nLCBi cmFuY2g9Tm9uZSwgcmVtb3RlPU5vbmUsIGJyYW5jaGVzPU5vbmUsIHRhZ3M9Tm9uZSk6CiAgICAg ICAgIHNlbGYucGF0aCA9IHBhdGgKICAgICAgICAgc2VsZi5icmFuY2ggPSBicmFuY2ggb3IgJ3Ry dW5rJwogICAgICAgICBzZWxmLnJlbW90ZSA9IHJlbW90ZSBvciAnaHR0cHM6Ly9zdm4ubW9jay5v cmcvcmVwb3NpdG9yeS97fScuZm9ybWF0KG9zLnBhdGguYmFzZW5hbWUocGF0aCkpCiAKKyAgICAg ICAgc2VsZi5icmFuY2hlcyA9IGJyYW5jaGVzIG9yIFtdCisgICAgICAgIHNlbGYudGFncyA9IHRh Z3Mgb3IgW10KKwogICAgICAgICBzdXBlcihTdm4sIHNlbGYpLl9faW5pdF9fKAogICAgICAgICAg ICAgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKICAgICAgICAgICAgICAgICBsb2NhbC5Tdm4uZXhl Y3V0YWJsZSwgJ2luZm8nLApAQCAtNTEsNiArNTQsMjAgQEAgY2xhc3MgU3ZuKG1vY2tzLlN1YnBy b2Nlc3MpOgogICAgICAgICAgICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAgICAgICApLAog ICAgICAgICAgICAgKSwgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKKyAgICAgICAgICAgICAgICBs b2NhbC5Tdm4uZXhlY3V0YWJsZSwgJ2xpc3QnLCAnXi9icmFuY2hlcycsCisgICAgICAgICAgICAg ICAgY3dkPXNlbGYucGF0aCwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICphcmdz LCAqKmt3YXJnczogbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24oCisgICAgICAgICAgICAgICAgICAg IHJldHVybmNvZGU9MCwKKyAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PScvXG4nLmpvaW4oc2Vs Zi5icmFuY2hlcykgKyAnL1xuJywKKyAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgKSwg bW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKKyAgICAgICAgICAgICAgICBsb2NhbC5Tdm4uZXhlY3V0 YWJsZSwgJ2xpc3QnLCAnXi90YWdzJywKKyAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAor ICAgICAgICAgICAgICAgIGdlbmVyYXRvcj1sYW1iZGEgKmFyZ3MsICoqa3dhcmdzOiBtb2Nrcy5Q cm9jZXNzQ29tcGxldGlvbigKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0wLAorICAg ICAgICAgICAgICAgICAgICBzdGRvdXQ9Jy9cbicuam9pbihzZWxmLnRhZ3MpICsgJy9cbicsCisg ICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUo CiAgICAgICAgICAgICAgICAgbG9jYWwuU3ZuLmV4ZWN1dGFibGUsCiAgICAgICAgICAgICAgICAg Y3dkPXNlbGYucGF0aCwKICAgICAgICAgICAgICAgICBjb21wbGV0aW9uPW1vY2tzLlByb2Nlc3ND b21wbGV0aW9uKApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkJ KHJldmlzaW9uIDI2NjgxNCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Myw3 ICs0Myw3IEBAIGNsYXNzIFRlc3RHaXQodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRl c3RfYnJhbmNoKHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgp OgotICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2VsZi5wYXRoKS5icmFu Y2gsICdtYXN0ZXInKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2Vs Zi5wYXRoKS5icmFuY2gsICdtYWluJykKIAogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChz ZWxmLnBhdGgsIGRldGFjaGVkPVRydWUpOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChs b2NhbC5HaXQoc2VsZi5wYXRoKS5icmFuY2gsIE5vbmUpCkBAIC01MSwzICs1MSwxNyBAQCBjbGFz cyBUZXN0R2l0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9yZW1vdGUoc2VsZik6 CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCkgYXMgcmVwbzoKICAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0KHNlbGYucGF0aCkucmVtb3RlKCksIHJl cG8ucmVtb3RlKQorCisgICAgZGVmIHRlc3RfYnJhbmNoZXMoc2VsZik6CisgICAgICAgIHdpdGgg bW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgYnJhbmNoZXM9KCdicmFuY2gtMScsICdicmFuY2gt MicpKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgbG9j YWwuR2l0KHNlbGYucGF0aCkuYnJhbmNoZXMsCisgICAgICAgICAgICAgICAgWydtYWluJywgJ2Jy YW5jaC0xJywgJ2JyYW5jaC0yJ10sCisgICAgICAgICAgICApCisKKyAgICBkZWYgdGVzdF90YWdz KHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIHRhZ3M9KCd0 YWctMScsICd0YWctMicpKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAg ICAgICAgICAgbG9jYWwuR2l0KHNlbGYucGF0aCkudGFncywKKyAgICAgICAgICAgICAgICBbJ3Rh Zy0xJywgJ3RhZy0yJ10sCisgICAgICAgICAgICApCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90 ZXN0L3N2bl91bml0dGVzdC5weQkocmV2aXNpb24gMjY2ODE0KQorKysgVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTQ4LDMgKzQ4LDE3IEBAIGNsYXNzIFRlc3RTdm4odW5pdHRlc3QuVGVz dENhc2UpOgogICAgIGRlZiB0ZXN0X3JlbW90ZShzZWxmKToKICAgICAgICAgd2l0aCBtb2Nrcy5s b2NhbC5Tdm4oc2VsZi5wYXRoKSBhcyByZXBvOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChsb2NhbC5Tdm4oc2VsZi5wYXRoKS5yZW1vdGUoKSwgcmVwby5yZW1vdGUpCisKKyAgICBkZWYg dGVzdF9icmFuY2hlcyhzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4oc2VsZi5w YXRoLCBicmFuY2hlcz0oJ2JyYW5jaC0xJywgJ2JyYW5jaC0yJykpOgorICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBsb2NhbC5Tdm4oc2VsZi5wYXRoKS5icmFu Y2hlcywKKyAgICAgICAgICAgICAgICBbJ3RydW5rJywgJ2JyYW5jaC0xJywgJ2JyYW5jaC0yJ10s CisgICAgICAgICAgICApCisKKyAgICBkZWYgdGVzdF90YWdzKHNlbGYpOgorICAgICAgICB3aXRo IG1vY2tzLmxvY2FsLlN2bihzZWxmLnBhdGgsIHRhZ3M9KCd0YWctMScsICd0YWctMicpKToKKyAg ICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgbG9jYWwuU3ZuKHNl bGYucGF0aCkudGFncywKKyAgICAgICAgICAgICAgICBbJ3RhZy0xJywgJ3RhZy0yJ10sCisgICAg ICAgICAgICApCg==