220427 2021-01-07 12:12:36 -0800 [webkitscmpy] Use .git/config to verify if repository is git-svn 2021-01-07 13:15:53 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1718031 0 jbedard 2021-01-07 12:12:36 -0800 It's much faster to use the contents of .git/config to verify if a git checkout is a git-svn checkout. 1718032 1 webkit-bug-importer 2021-01-07 12:12:53 -0800 <rdar://problem/72899735> 1718035 2 417197 jbedard 2021-01-07 12:17:54 -0800 Created attachment 417197 Patch 1718053 3 dewei_zhu 2021-01-07 12:53:05 -0800 r=me 1718063 4 ews-feeder 2021-01-07 13:15:52 -0800 Committed r271258: <https://trac.webkit.org/changeset/271258> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417197. 417197 2021-01-07 12:17:54 -0800 2021-01-07 13:15:52 -0800 Patch bug-220427-20210107121753.patch text/plain 15658 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGI4NDAxNWFiZTMxNzY0ZmY0ZGExNjBlMmRhZTA0MWEz MDE4NDFkNi4uZGE3YjE5MjVmOTlmZDZmNjc1MTJhMWVlZDE4ODZjYTNlZDUwNmFhYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIxLTAxLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxKb25XQmVkYXJkQGdtYWlsLmNvbT4K KworICAgICAgICBbd2Via2l0c2NtcHldIFVzZSAuZ2l0L2NvbmZpZyB0byB2ZXJpZnkgaWYgcmVw b3NpdG9yeSBpcyBnaXQtc3ZuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjA0MjcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcyODk5NzM1PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lv biBudW1iZXIuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0LmlzX3N2bik6IFVzZSAuZ2l0L2NvbmZp ZyB0byB2ZXJpZnkgaWYgYSByZXBvc2l0b3J5IGlzIGdpdC1zdm4uCisgICAgICAgICogU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5Ogor ICAgICAgICAoR2l0KTogUG9wdWxhdGUgLmdpdC9jb25maWcgaWYgdGhlIHByb3ZpZGVkIHBhdGgg aXMgd3JpdGVhYmxlLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3Rlc3QvZmluZF91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RGaW5kLnRlc3Rf cmV2aXNpb25fZ2l0X3N2bik6IFVzZSBhIHRlbXBvcmFyeSBkaXJlY3Rvcnkgc28gZmlsZXMKKyAg ICAgICAgY2FuIGJlIHdyaXR0ZW4uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0R2l0 LnRlc3Rfc2NtX3R5cGUpOiBVc2UgYSB0ZW1wb3JhcnkgZGlyZWN0b3J5IHNvIGZpbGVzIGNhbiBi ZSB3cml0dGVuLgorICAgICAgICAoVGVzdEdpdC50ZXN0X2luZm8pOiBEaXR0by4KKyAgICAgICAg KFRlc3RHaXQudGVzdF9jb21taXRfcmV2aXNpb24pOiBEaXR0by4KKwogMjAyMS0wMS0wNyAgU2lo dWkgTGl1ICA8c2lodWlfbGl1QGFwcGUuY29tPgogCiAgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6 ICFtX21lc3NhZ2VSZWNlaXZlck1hcENvdW50IHVuZGVyIFdlYktpdDo6U3BlZWNoUmVjb2duaXRp b25TZXJ2ZXI6On5TcGVlY2hSZWNvZ25pdGlvblNlcnZlcigpCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5 CmluZGV4IDIzOGFiMGY5YzkxYzcyMTQ5OGU4NWIzMjczMWY4OGY3NjcyZmUxMTEuLmRjNWRkN2Fj Nzc2MzQwNTkyMzRhYTIzNWZjYmFlZmI5MTU2YWE3YjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5 CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMjAsIDIwMjEgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Niw3ICs0 Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtp dGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwg PHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA3LCAx KQordmVyc2lvbiA9IFZlcnNpb24oMCwgNywgMikKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj a2FnZSgnZmFzdGVuZXJzJywgVmVyc2lvbigwLCAxNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0 ZXIoUGFja2FnZSgnbW9ub3RvbmljJywgVmVyc2lvbigxLCA1KSkpCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9n aXQucHkKaW5kZXggODU3MTljZTAyYmYzNjBlZmY5ZTRkNzMyMzlmNjBkMzc3MGJlZDI2Yy4uM2Jm ZWYwOGI2OTVjZjU2NjIxMzRjYjBlNTRjZGNiMTFhZDBjMzc0ZSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2Fs L2dpdC5weQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDIwLCAyMDIxIEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt MjEsNiArMjEsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IG9z CiBpbXBvcnQgcmUKIGltcG9ydCBzaXgKIApAQCAtNjQsMTUgKzY1LDE0IEBAIGNsYXNzIEdpdChT Y20pOgogICAgIEBwcm9wZXJ0eQogICAgIEBkZWNvcmF0b3JzLk1lbW9pemUoKQogICAgIGRlZiBp c19zdm4oc2VsZik6Ci0gICAgICAgIHRyeToKLSAgICAgICAgICAgIHJldHVybiBydW4oCi0gICAg ICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnc3ZuJywgJ2ZpbmQtcmV2JywgJ3IxJ10s Ci0gICAgICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLAotICAgICAgICAgICAgICAgIGNh cHR1cmVfb3V0cHV0PVRydWUsCi0gICAgICAgICAgICAgICAgZW5jb2Rpbmc9J3V0Zi04JywKLSAg ICAgICAgICAgICAgICB0aW1lb3V0PTEsCi0gICAgICAgICAgICApLnJldHVybmNvZGUgPT0gMAot ICAgICAgICBleGNlcHQgVGltZW91dEV4cGlyZWQ6CisgICAgICAgIGNvbmZpZyA9IG9zLnBhdGgu am9pbihzZWxmLnJvb3RfcGF0aCwgJy5naXQvY29uZmlnJykKKyAgICAgICAgaWYgbm90IG9zLnBh dGguaXNmaWxlKGNvbmZpZyk6CisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKworICAgICAgICB3 aXRoIG9wZW4oY29uZmlnLCAncicpIGFzIGNvbmZpZzoKKyAgICAgICAgICAgIGZvciBsaW5lIGlu IGNvbmZpZy5yZWFkbGluZXMoKToKKyAgICAgICAgICAgICAgICBpZiBsaW5lLnN0YXJ0c3dpdGgo J1tzdm4tcmVtb3RlICJzdm4iXScpOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQog ICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICBAcHJvcGVydHkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2Fs L2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L21vY2tzL2xvY2FsL2dpdC5weQppbmRleCA4YmU1ZmJiMmNjOTUxNDRmNGU3NWIwYjg3NWJkOTIy NzcxNmIzMjhiLi43MTc4ZWU5YzNjZDZlNjQ1ZjczOTg2MTMzMGY2ZjAxMmM1OWUyY2Q0IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9t b2Nrcy9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5 cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmln aHQgKEMpIDIwMjAsIDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02Myw2ICs2Myw0NCBAQCBjbGFzcyBHaXQobW9ja3Mu U3VicHJvY2Vzcyk6CiAgICAgICAgIHNlbGYucmVtb3RlcyA9IHsnb3JpZ2luL3t9Jy5mb3JtYXQo YnJhbmNoKTogY29tbWl0c1stMV0gZm9yIGJyYW5jaCwgY29tbWl0cyBpbiBzZWxmLmNvbW1pdHMu aXRlbXMoKX0KICAgICAgICAgc2VsZi50YWdzID0ge30KIAorICAgICAgICAjIElmIHRoZSBkaXJl Y3RvcnkgcHJvdmlkZWQgYWN0dWFsbHkgZXhpc3RzLCBwb3B1bGF0ZSBpdAorICAgICAgICBpZiBv cy5wYXRoLmlzZGlyKHNlbGYucGF0aCk6CisgICAgICAgICAgICBpZiBub3Qgb3MucGF0aC5pc2Rp cihvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAnLmdpdCcpKToKKyAgICAgICAgICAgICAgICBvcy5t a2Rpcihvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAnLmdpdCcpKQorICAgICAgICAgICAgd2l0aCBv cGVuKG9zLnBhdGguam9pbihzZWxmLnBhdGgsICcuZ2l0JywgJ2NvbmZpZycpLCAndycpIGFzIGNv bmZpZzoKKyAgICAgICAgICAgICAgICBjb25maWcud3JpdGUoCisgICAgICAgICAgICAgICAgICAg ICdbY29yZV1cbicKKyAgICAgICAgICAgICAgICAgICAgJyAgICByZXBvc2l0b3J5Zm9ybWF0dmVy c2lvbiA9IDBcbicKKyAgICAgICAgICAgICAgICAgICAgJwlmaWxlbW9kZSA9IHRydWVcbicKKyAg ICAgICAgICAgICAgICAgICAgJwliYXJlID0gZmFsc2VcbicKKyAgICAgICAgICAgICAgICAgICAg Jwlsb2dhbGxyZWZ1cGRhdGVzID0gdHJ1ZVxuJworICAgICAgICAgICAgICAgICAgICAnCWlnbm9y ZWNhc2UgPSB0cnVlXG4nCisgICAgICAgICAgICAgICAgICAgICcJcHJlY29tcG9zZXVuaWNvZGUg PSB0cnVlXG4nCisgICAgICAgICAgICAgICAgICAgICdbcmVtb3RlICJvcmlnaW4iXVxuJworICAg ICAgICAgICAgICAgICAgICAnICAgIHVybCA9IHtyZW1vdGV9XG4nCisgICAgICAgICAgICAgICAg ICAgICcgICAgZmV0Y2ggPSArcmVmcy9oZWFkcy8qOnJlZnMvcmVtb3Rlcy9vcmlnaW4vKlxuJwor ICAgICAgICAgICAgICAgICAgICAnW2JyYW5jaCAie2JyYW5jaH0iXVxuJworICAgICAgICAgICAg ICAgICAgICAnICAgIHJlbW90ZSA9IG9yaWdpblxuJworICAgICAgICAgICAgICAgICAgICAnICAg IG1lcmdlID0gcmVmcy9oZWFkcy97YnJhbmNofVxuJy5mb3JtYXQoCisgICAgICAgICAgICAgICAg ICAgICAgICByZW1vdGU9c2VsZi5yZW1vdGUsCisgICAgICAgICAgICAgICAgICAgICAgICBicmFu Y2g9c2VsZi5kZWZhdWx0X2JyYW5jaCwKKyAgICAgICAgICAgICAgICAgICAgKSkKKyAgICAgICAg ICAgICAgICBpZiBnaXRfc3ZuOgorICAgICAgICAgICAgICAgICAgICBkb21haW4gPSAnd2Via2l0 Lm9yZycKKyAgICAgICAgICAgICAgICAgICAgaWYgc2VsZi5yZW1vdGUuc3RhcnRzd2l0aCgnaHR0 cHM6Ly8nKToKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvbWFpbiA9IHNlbGYucmVtb3RlLnNw bGl0KCcvJylbMl0KKyAgICAgICAgICAgICAgICAgICAgZWxpZiAnQCcgaW4gc2VsZi5yZW1vdGU6 CisgICAgICAgICAgICAgICAgICAgICAgICBkb21haW4gPSBzZWxmLnJlbW90ZS5zcGxpdCgnQCcp WzFdLnNwbGl0KCc6JylbMF0KKworICAgICAgICAgICAgICAgICAgICBjb25maWcud3JpdGUoCisg ICAgICAgICAgICAgICAgICAgICAgICAnW3N2bi1yZW1vdGUgInN2biJdXG4nCisgICAgICAgICAg ICAgICAgICAgICAgICAnICAgIHVybCA9IGh0dHBzOi8vc3ZuLntkb21haW59L3JlcG9zaXRvcnkv d2Via2l0XG4nCisgICAgICAgICAgICAgICAgICAgICAgICAnICAgIGZldGNoID0gdHJ1bms6cmVm cy9yZW1vdGVzL29yaWdpbi97YnJhbmNofScuZm9ybWF0KAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGRvbWFpbj1kb21haW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJhbmNo PXNlbGYuZGVmYXVsdF9icmFuY2gsCisgICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAg ICAgICAgICAgICAgICkKKwogICAgICAgICBpZiBnaXRfc3ZuOgogICAgICAgICAgICAgZ2l0X3N2 bl9yb3V0ZXMgPSBbCiAgICAgICAgICAgICAgICAgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvZmluZF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3QvZmluZF91bml0dGVzdC5weQppbmRleCAwYmE2ZDJjN2E2OWQw YjkxNmFkM2Y0YTY5MjFlYTkxMjAxZjc3NGU2Li4zYTk4ZTYzMTc3NDdiYTA5MmE3NDljNmE2ZjFl MDc2YjdhNTBjYWRlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5 CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMjAsIDIwMjEgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMSw2ICsy MSw4IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIGltcG9ydCBqc29uCitpbXBvcnQgc2h1dGlsCitpbXBv cnQgdGVtcGZpbGUKIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRl dGltZQpAQCAtMTEzLDEyICsxMTUsMTYgQEAgY2xhc3MgVGVzdEZpbmQodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgp LCAnMi4yQGJyYW5jaC1iIHwgcjUgfCA1dGggY29tbWl0XG4nKQogCiAgICAgZGVmIHRlc3RfcmV2 aXNpb25fZ2l0X3N2bihzZWxmKToKLSAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2Fw dHVyZWQsIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSksIG1vY2tzLmxv Y2FsLlN2bigpLCBNb2NrVGltZToKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJv Z3JhbS5tYWluKAotICAgICAgICAgICAgICAgIGFyZ3M9KCdmaW5kJywgJ3I1JywgJy1xJyksCi0g ICAgICAgICAgICAgICAgcGF0aD1zZWxmLnBhdGgsCi0gICAgICAgICAgICApKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLCAnMi4yQGJyYW5jaC1i IHwgM2NkMzJlMzUyNDEwLCByNSB8IDV0aCBjb21taXRcbicpCisgICAgICAgIHRyeToKKyAgICAg ICAgICAgIGRpcm5hbWUgPSB0ZW1wZmlsZS5ta2R0ZW1wKCkKKyAgICAgICAgICAgIHdpdGggT3V0 cHV0Q2FwdHVyZSgpIGFzIGNhcHR1cmVkLCBtb2Nrcy5sb2NhbC5HaXQoZGlybmFtZSwgZ2l0X3N2 bj1UcnVlLCByZW1vdGU9J2dpdEBleGFtcGxlLm9yZzp7fScuZm9ybWF0KHNlbGYucGF0aCkpLCBt b2Nrcy5sb2NhbC5Tdm4oKSwgTW9ja1RpbWU6CisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbCgwLCBwcm9ncmFtLm1haW4oCisgICAgICAgICAgICAgICAgICAgIGFyZ3M9KCdmaW5kJywg J3I1JywgJy1xJyksCisgICAgICAgICAgICAgICAgICAgIHBhdGg9ZGlybmFtZSwKKyAgICAgICAg ICAgICAgICApKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQu Z2V0dmFsdWUoKSwgJzIuMkBicmFuY2gtYiB8IDNjZDMyZTM1MjQxMCwgcjUgfCA1dGggY29tbWl0 XG4nKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShkaXJuYW1l KQogCiAgICAgZGVmIHRlc3Rfc3RhbmRhcmQoc2VsZik6CiAgICAgICAgIHdpdGggT3V0cHV0Q2Fw dHVyZSgpIGFzIGNhcHR1cmVkLCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRy dWUpLCBtb2Nrcy5sb2NhbC5Tdm4oKSwgTW9ja1RpbWU6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5w eSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qv Z2l0X3VuaXR0ZXN0LnB5CmluZGV4IDNkNTk3MzUyMjIzZWU2OTc5ZjVjNTE4ZDEyNjBlZjJjZDRm ZGMwMTEuLmMyZmRhYmQzOWI1NjA0Yjc1NmRlOGZiZTAyYWIwYTMxMTNlZjg2YTMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qv Z2l0X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CkBAIC0xLDQgKzEsNCBAQAotIyBDb3B5 cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmln aHQgKEMpIDIwMjAsIDIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMSw2ICsyMSw4IEBACiAjIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAK IGltcG9ydCBvcworaW1wb3J0IHNodXRpbAoraW1wb3J0IHRlbXBmaWxlCiBpbXBvcnQgdW5pdHRl c3QKIAogZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKQEAgLTc3LDUyICs3OSw2NSBAQCBj bGFzcyBUZXN0R2l0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwobG9jYWwuR2l0KHNlbGYucGF0aCkuZGVmYXVsdF9icmFuY2gsICdtYWluJykKIAogICAg IGRlZiB0ZXN0X3NjbV90eXBlKHNlbGYpOgotICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChz ZWxmLnBhdGgpLCBNb2NrVGltZSwgTG9nZ2VyQ2FwdHVyZSgpOgotICAgICAgICAgICAgc2VsZi5h c3NlcnRUcnVlKGxvY2FsLkdpdChzZWxmLnBhdGgpLmlzX2dpdCkKLSAgICAgICAgICAgIHNlbGYu YXNzZXJ0RmFsc2UobG9jYWwuR2l0KHNlbGYucGF0aCkuaXNfc3ZuKQorICAgICAgICB0cnk6Cisg ICAgICAgICAgICBkaXJuYW1lID0gdGVtcGZpbGUubWtkdGVtcCgpCisgICAgICAgICAgICB3aXRo IG1vY2tzLmxvY2FsLkdpdChkaXJuYW1lLCByZW1vdGU9J2dpdEBleGFtcGxlLm9yZzp7fScuZm9y bWF0KHNlbGYucGF0aCkpLCBNb2NrVGltZSwgTG9nZ2VyQ2FwdHVyZSgpOgorICAgICAgICAgICAg ICAgIHNlbGYuYXNzZXJ0VHJ1ZShsb2NhbC5HaXQoZGlybmFtZSkuaXNfZ2l0KQorICAgICAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UobG9jYWwuR2l0KGRpcm5hbWUpLmlzX3N2bikKIAotICAg ICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSksIE1vY2tU aW1lLCBMb2dnZXJDYXB0dXJlKCk6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydFRydWUobG9jYWwu R2l0KHNlbGYucGF0aCkuaXNfZ2l0KQotICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGxvY2Fs LkdpdChzZWxmLnBhdGgpLmlzX3N2bikKKyAgICAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0 KGRpcm5hbWUsIGdpdF9zdm49VHJ1ZSwgcmVtb3RlPSdnaXRAZXhhbXBsZS5vcmc6e30nLmZvcm1h dChzZWxmLnBhdGgpKSwgTW9ja1RpbWUsIExvZ2dlckNhcHR1cmUoKToKKyAgICAgICAgICAgICAg ICBzZWxmLmFzc2VydFRydWUobG9jYWwuR2l0KGRpcm5hbWUpLmlzX2dpdCkKKyAgICAgICAgICAg ICAgICBzZWxmLmFzc2VydFRydWUobG9jYWwuR2l0KGRpcm5hbWUpLmlzX3N2bikKKworICAgICAg ICBmaW5hbGx5OgorICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShkaXJuYW1lKQogCiAgICAgZGVm IHRlc3RfaW5mbyhzZWxmKToKLSAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRo KSwgTW9ja1RpbWUsIExvZ2dlckNhcHR1cmUoKToKLSAgICAgICAgICAgIHdpdGggc2VsZi5hc3Nl cnRSYWlzZXMobG9jYWwuR2l0LkV4Y2VwdGlvbik6Ci0gICAgICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChkaWN0KCksIGxvY2FsLkdpdChzZWxmLnBhdGgpLmluZm8oKSkKLQotICAgICAgICB3 aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSksIE1vY2tUaW1lOgot ICAgICAgICAgICAgc2VsZi5hc3NlcnREaWN0RXF1YWwoCi0gICAgICAgICAgICAgICAgewotICAg ICAgICAgICAgICAgICAgICAnUGF0aCc6ICcuJywKLSAgICAgICAgICAgICAgICAgICAgJ1JlcG9z aXRvcnkgUm9vdCc6ICdnaXRAZXhhbXBsZS5vcmc6L21vY2svcmVwb3NpdG9yeScsCi0gICAgICAg ICAgICAgICAgICAgICdVUkwnOiAnZ2l0QGV4YW1wbGUub3JnOi9tb2NrL3JlcG9zaXRvcnkvbWFp bicsCi0gICAgICAgICAgICAgICAgICAgICdSZXZpc2lvbic6ICc2JywKLSAgICAgICAgICAgICAg ICAgICAgJ05vZGUgS2luZCc6ICdkaXJlY3RvcnknLAotICAgICAgICAgICAgICAgICAgICAnU2No ZWR1bGUnOiAnbm9ybWFsJywKLSAgICAgICAgICAgICAgICAgICAgJ0xhc3QgQ2hhbmdlZCBBdXRo b3InOiAnamJlZGFyZEBhcHBsZS5jb20nLAotICAgICAgICAgICAgICAgICAgICAnTGFzdCBDaGFu Z2VkIFJldic6ICc2JywKLSAgICAgICAgICAgICAgICAgICAgJ0xhc3QgQ2hhbmdlZCBEYXRlJzog ZGF0ZXRpbWUuZnJvbXRpbWVzdGFtcCgxNjAxNjY1MDAwKS5zdHJmdGltZSgnJVktJW0tJWQgJUg6 JU06JVMnKSwKLSAgICAgICAgICAgICAgICB9LCBsb2NhbC5HaXQoc2VsZi5wYXRoKS5pbmZvKCks Ci0gICAgICAgICAgICApCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIGRpcm5hbWUgPSB0ZW1w ZmlsZS5ta2R0ZW1wKCkKKyAgICAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KGRpcm5hbWUs IHJlbW90ZT0nZ2l0QGV4YW1wbGUub3JnOnt9Jy5mb3JtYXQoc2VsZi5wYXRoKSksIE1vY2tUaW1l LCBMb2dnZXJDYXB0dXJlKCk6CisgICAgICAgICAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNl cyhsb2NhbC5HaXQuRXhjZXB0aW9uKToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChkaWN0KCksIGxvY2FsLkdpdChkaXJuYW1lKS5pbmZvKCkpCisKKyAgICAgICAgICAgIHdp dGggbW9ja3MubG9jYWwuR2l0KGRpcm5hbWUsIGdpdF9zdm49VHJ1ZSwgcmVtb3RlPSdnaXRAZXhh bXBsZS5vcmc6e30nLmZvcm1hdChzZWxmLnBhdGgpKSwgTW9ja1RpbWU6CisgICAgICAgICAgICAg ICAgc2VsZi5hc3NlcnREaWN0RXF1YWwoCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgICdQYXRoJzogJy4nLAorICAgICAgICAgICAgICAgICAgICAgICAgJ1Jl cG9zaXRvcnkgUm9vdCc6ICdnaXRAZXhhbXBsZS5vcmc6L21vY2svcmVwb3NpdG9yeScsCisgICAg ICAgICAgICAgICAgICAgICAgICAnVVJMJzogJ2dpdEBleGFtcGxlLm9yZzovbW9jay9yZXBvc2l0 b3J5L21haW4nLAorICAgICAgICAgICAgICAgICAgICAgICAgJ1JldmlzaW9uJzogJzYnLAorICAg ICAgICAgICAgICAgICAgICAgICAgJ05vZGUgS2luZCc6ICdkaXJlY3RvcnknLAorICAgICAgICAg ICAgICAgICAgICAgICAgJ1NjaGVkdWxlJzogJ25vcm1hbCcsCisgICAgICAgICAgICAgICAgICAg ICAgICAnTGFzdCBDaGFuZ2VkIEF1dGhvcic6ICdqYmVkYXJkQGFwcGxlLmNvbScsCisgICAgICAg ICAgICAgICAgICAgICAgICAnTGFzdCBDaGFuZ2VkIFJldic6ICc2JywKKyAgICAgICAgICAgICAg ICAgICAgICAgICdMYXN0IENoYW5nZWQgRGF0ZSc6IGRhdGV0aW1lLmZyb210aW1lc3RhbXAoMTYw MTY2NTAwMCkuc3RyZnRpbWUoJyVZLSVtLSVkICVIOiVNOiVTJyksCisgICAgICAgICAgICAgICAg ICAgIH0sIGxvY2FsLkdpdChkaXJuYW1lKS5pbmZvKCksCisgICAgICAgICAgICAgICAgKQorICAg ICAgICBmaW5hbGx5OgorICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShkaXJuYW1lKQogCiAgICAg ZGVmIHRlc3RfY29tbWl0X3JldmlzaW9uKHNlbGYpOgotICAgICAgICB3aXRoIG1vY2tzLmxvY2Fs LkdpdChzZWxmLnBhdGgpLCBNb2NrVGltZSwgTG9nZ2VyQ2FwdHVyZSgpOgotICAgICAgICAgICAg d2l0aCBzZWxmLmFzc2VydFJhaXNlcyhsb2NhbC5HaXQuRXhjZXB0aW9uKToKLSAgICAgICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKE5vbmUsIGxvY2FsLkdpdChzZWxmLnBhdGgpLmNvbW1pdChy ZXZpc2lvbj0xKSkKLQotICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdp dF9zdm49VHJ1ZSksIE1vY2tUaW1lLCBMb2dnZXJDYXB0dXJlKCk6Ci0gICAgICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCcxQG1haW4nLCBzdHIobG9jYWwuR2l0KHNlbGYucGF0aCkuY29tbWl0KHJl dmlzaW9uPTEpKSkKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJzJAbWFpbicsIHN0cihs b2NhbC5HaXQoc2VsZi5wYXRoKS5jb21taXQocmV2aXNpb249MikpKQotICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbCgnMi4xQGJyYW5jaC1hJywgc3RyKGxvY2FsLkdpdChzZWxmLnBhdGgpLmNv bW1pdChyZXZpc2lvbj0zKSkpCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCczQG1haW4n LCBzdHIobG9jYWwuR2l0KHNlbGYucGF0aCkuY29tbWl0KHJldmlzaW9uPTQpKSkKLSAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoJzIuMkBicmFuY2gtYicsIHN0cihsb2NhbC5HaXQoc2VsZi5w YXRoKS5jb21taXQocmV2aXNpb249NSkpKQotICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgn NEBtYWluJywgc3RyKGxvY2FsLkdpdChzZWxmLnBhdGgpLmNvbW1pdChyZXZpc2lvbj02KSkpCi0g ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCcyLjJAYnJhbmNoLWEnLCBzdHIobG9jYWwuR2l0 KHNlbGYucGF0aCkuY29tbWl0KHJldmlzaW9uPTcpKSkKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoJzIuM0BicmFuY2gtYicsIHN0cihsb2NhbC5HaXQoc2VsZi5wYXRoKS5jb21taXQocmV2 aXNpb249OCkpKQotCi0gICAgICAgICAgICAjIE91dC1vZi1ib3VuZHMgY29tbWl0Ci0gICAgICAg ICAgICB3aXRoIHNlbGYuYXNzZXJ0UmFpc2VzKGxvY2FsLkdpdC5FeGNlcHRpb24pOgotICAgICAg ICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoTm9uZSwgbG9jYWwuR2l0KHNlbGYucGF0aCkuY29t bWl0KHJldmlzaW9uPTEwKSkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgZGlybmFtZSA9IHRl bXBmaWxlLm1rZHRlbXAoKQorICAgICAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoZGlybmFt ZSksIE1vY2tUaW1lLCBMb2dnZXJDYXB0dXJlKCk6CisgICAgICAgICAgICAgICAgd2l0aCBzZWxm LmFzc2VydFJhaXNlcyhsb2NhbC5HaXQuRXhjZXB0aW9uKToKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChOb25lLCBsb2NhbC5HaXQoZGlybmFtZSkuY29tbWl0KHJldmlzaW9u PTEpKQorCisgICAgICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChkaXJuYW1lLCBnaXRfc3Zu PVRydWUsIHJlbW90ZT0nZ2l0QGV4YW1wbGUub3JnOnt9Jy5mb3JtYXQoc2VsZi5wYXRoKSksIE1v Y2tUaW1lLCBMb2dnZXJDYXB0dXJlKCk6CisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgnMUBtYWluJywgc3RyKGxvY2FsLkdpdChkaXJuYW1lKS5jb21taXQocmV2aXNpb249MSkpKQor ICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJzJAbWFpbicsIHN0cihsb2NhbC5HaXQo ZGlybmFtZSkuY29tbWl0KHJldmlzaW9uPTIpKSkKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKCcyLjFAYnJhbmNoLWEnLCBzdHIobG9jYWwuR2l0KGRpcm5hbWUpLmNvbW1pdChyZXZp c2lvbj0zKSkpCisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnM0BtYWluJywgc3Ry KGxvY2FsLkdpdChkaXJuYW1lKS5jb21taXQocmV2aXNpb249NCkpKQorICAgICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoJzIuMkBicmFuY2gtYicsIHN0cihsb2NhbC5HaXQoZGlybmFtZSku Y29tbWl0KHJldmlzaW9uPTUpKSkKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCc0 QG1haW4nLCBzdHIobG9jYWwuR2l0KGRpcm5hbWUpLmNvbW1pdChyZXZpc2lvbj02KSkpCisgICAg ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnMi4yQGJyYW5jaC1hJywgc3RyKGxvY2FsLkdp dChkaXJuYW1lKS5jb21taXQocmV2aXNpb249NykpKQorICAgICAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoJzIuM0BicmFuY2gtYicsIHN0cihsb2NhbC5HaXQoZGlybmFtZSkuY29tbWl0KHJl dmlzaW9uPTgpKSkKKworICAgICAgICAgICAgICAgICMgT3V0LW9mLWJvdW5kcyBjb21taXQKKyAg ICAgICAgICAgICAgICB3aXRoIHNlbGYuYXNzZXJ0UmFpc2VzKGxvY2FsLkdpdC5FeGNlcHRpb24p OgorICAgICAgICAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKE5vbmUsIGxvY2FsLkdpdChk aXJuYW1lKS5jb21taXQocmV2aXNpb249MTApKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAg ICAgc2h1dGlsLnJtdHJlZShkaXJuYW1lKQogCiAgICAgZGVmIHRlc3RfY29tbWl0X2hhc2goc2Vs Zik6CiAgICAgICAgIGZvciBtb2NrIGluIFttb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoKSwgbW9j a3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKV06Cg==