224251 2021-04-06 15:59:20 -0700 [webkitscmpy] Handle multiple double-branch commits 2021-04-07 15:25:26 -0700 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 1747687 0 jbedard 2021-04-06 15:59:20 -0700 There are a few cases, namely on the safari-607-branch, where some commits where made both on trunk and on a branch. In one notable case, two sequential commits were made this way. Our current code handles 1 commit made on multiple branches, we apparently need to handle more than that. 1747690 1 webkit-bug-importer 2021-04-06 16:02:26 -0700 <rdar://problem/76288547> 1747692 2 425333 jbedard 2021-04-06 16:04:36 -0700 Created attachment 425333 Patch 1747761 3 425333 dewei_zhu 2021-04-06 21:09:39 -0700 Comment on attachment 425333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425333&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:184 > + if default_count > 2: Are we making an assumption here that there will not be more than two consecutive commits made to both on trunk and branch? 1748043 4 425333 dewei_zhu 2021-04-07 13:22:50 -0700 Comment on attachment 425333 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425333&action=review r=me >> Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py:184 >> + if default_count > 2: > > Are we making an assumption here that there will not be more than two consecutive commits made to both on trunk and branch? Discussed in person, we should probably add a comment to record this assumption. And potentially increase the number. So far, 2 should work. 1748067 5 425439 jbedard 2021-04-07 14:37:33 -0700 Created attachment 425439 Patch for landing 1748097 6 ews-feeder 2021-04-07 15:25:25 -0700 Committed r275635: <https://commits.webkit.org/r275635> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425439. 425333 2021-04-06 16:04:36 -0700 2021-04-07 14:37:25 -0700 Patch bug-224251-20210406160435.patch text/plain 5587 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTU2NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTA0LTA2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBtdWx0aXBsZSBkb3VibGUtYnJhbmNo IGNvbW1pdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDI1MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzYyODg1NDc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIGEgZmV3IGNhc2Vz LCBuYW1lbHkgb24gdGhlIHNhZmFyaS02MDctYnJhbmNoLCB3aGVyZSBzb21lIGNvbW1pdHMgd2hl cmUgbWFkZSBib3RoCisgICAgICAgIG9uIHRydW5rIGFuZCBvbiBhIGJyYW5jaC4gSW4gb25lIG5v dGFibGUgY2FzZSwgdHdvIHNlcXVlbnRpYWwgY29tbWl0cyB3ZXJlIG1hZGUgdGhpcyB3YXkuCisK KyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weTogQnVtcCB2 ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4uX2NhY2hlX3Jl dmlzaW9ucyk6IEhhbmRsZSBtdWx0aXBsZSBkb3VibGUtYnJhbmNoIGNvbW1pdHMuCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5w eToKKyAgICAgICAgKFN2bi5fY2FjaGVfcmV2aXNpb25zKTogSGFuZGxlIG11bHRpcGxlIGRvdWJs ZS1icmFuY2ggY29tbWl0cy4KKwogMjAyMS0wNC0wNiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBVKzA1ODEgYW5kIFUrMDU4NSB0byBs aXN0IG9mIEFybWVuaWFuIGNoYXJhY3RlcnMgdGhhdCBsb29rIGxpa2UgTGF0aW4gY2hhcmFjdGVy cwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJ KHJldmlzaW9uIDI3NTUyNCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToK IAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHknLAotICAgIHZlcnNpb249JzAuMTMuNycs CisgICAgdmVyc2lvbj0nMC4xMy44JywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFyeSBkZXNpZ25l ZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9zaXRvcmllcy4nLAogICAgIGxvbmdf ZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv X19pbml0X18ucHkJKHJldmlzaW9uIDI3NTUyNCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00 Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxs IHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRl eC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigw LCAxMywgNykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDEzLCA4KQogCiBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKSW5kZXg6IFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI3NTUyNCkKKysrIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29ya2luZyBj b3B5KQpAQCAtMTY1LDcgKzE2NSw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgaWYg bG9nLnBvbGwoKToKICAgICAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiRmFpbGVk IHRvIGNvbnN0cnVjdCBicmFuY2ggaGlzdG9yeSBmb3IgJ3t9JyIuZm9ybWF0KGJyYW5jaCkpCiAK LSAgICAgICAgICAgIHdhc19sYXN0X29uX2RlZmF1bHQgPSBGYWxzZQorICAgICAgICAgICAgZGVm YXVsdF9jb3VudCA9IDAKICAgICAgICAgICAgIGxpbmUgPSBsb2cuc3Rkb3V0LnJlYWRsaW5lKCkK ICAgICAgICAgICAgIHdoaWxlIGxpbmU6CiAgICAgICAgICAgICAgICAgbWF0Y2ggPSBzZWxmLkxP R19SRS5tYXRjaChsaW5lKQpAQCAtMTgxLDE3ICsxODEsMTkgQEAgY2xhc3MgU3ZuKFNjbSk6CiAg ICAgICAgICAgICAgICAgICAgICAgICBicmVhawogICAgICAgICAgICAgICAgICAgICBpZiBub3Qg aXNfZGVmYXVsdF9icmFuY2g6CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiByZXZpc2lvbiBp biBzZWxmLl9tZXRhZGF0YV9jYWNoZVtzZWxmLmRlZmF1bHRfYnJhbmNoXToKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpZiB3YXNfbGFzdF9vbl9kZWZhdWx0OgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmIGRlZmF1bHRfY291bnQgPiAyOgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBicmVhawotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdhc19sYXN0X29u X2RlZmF1bHQgPSBUcnVlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdF9jb3Vu dCArPSAxCiAgICAgICAgICAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHdhc19sYXN0X29uX2RlZmF1bHQgPSBGYWxzZQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRlZmF1bHRfY291bnQgPSAwCiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX21l dGFkYXRhX2NhY2hlW2JyYW5jaF0uaW5zZXJ0KHBvcywgcmV2aXNpb24pCiAgICAgICAgICAgICAg ICAgbGluZSA9IGxvZy5zdGRvdXQucmVhZGxpbmUoKQogICAgICAgICBmaW5hbGx5OgogICAgICAg ICAgICAgaWYgbG9nOgogICAgICAgICAgICAgICAgIGxvZy5raWxsKCkKIAorICAgICAgICBpZiBk ZWZhdWx0X2NvdW50OgorICAgICAgICAgICAgc2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXSA9 IHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF1bZGVmYXVsdF9jb3VudCAtIDE6XQogICAgICAg ICBpZiBzZWxmLl9tZXRhZGF0YV9jYWNoZVtzZWxmLmRlZmF1bHRfYnJhbmNoXVswXSA9PSBbMF06 CiAgICAgICAgICAgICBzZWxmLl9tZXRhZGF0YV9jYWNoZVsnaWRlbnRpZmllciddID0gbGVuKHNl bGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0pCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4ucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2 bi5weQkocmV2aXNpb24gMjc1NTI0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMjQyLDcg KzI0Miw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVz X2NvZGUgIT0gMjAwOgogICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCJGYWls ZWQgdG8gY29uc3RydWN0IGJyYW5jaCBoaXN0b3J5IGZvciAne30nIi5mb3JtYXQoYnJhbmNoKSkK IAotICAgICAgICAgICAgd2FzX2xhc3Rfb25fZGVmYXVsdCA9IEZhbHNlCisgICAgICAgICAgICBk ZWZhdWx0X2NvdW50ID0gMAogICAgICAgICAgICAgZm9yIGxpbmUgaW4gcmVzcG9uc2UuaXRlcl9s aW5lcygpOgogICAgICAgICAgICAgICAgIG1hdGNoID0gc2VsZi5ISVNUT1JZX1JFLm1hdGNoKGxp bmUpCiAgICAgICAgICAgICAgICAgaWYgbm90IG1hdGNoOgpAQCAtMjU5LDEzICsyNTksMTUgQEAg Y2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICAg ICAgaWYgbm90IGlzX2RlZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgICAgICAgICBpZiByZXZp c2lvbiBpbiBzZWxmLl9tZXRhZGF0YV9jYWNoZVtzZWxmLmRlZmF1bHRfYnJhbmNoXToKLSAgICAg ICAgICAgICAgICAgICAgICAgIGlmIHdhc19sYXN0X29uX2RlZmF1bHQ6CisgICAgICAgICAgICAg ICAgICAgICAgICBpZiBkZWZhdWx0X2NvdW50ID4gMjoKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBicmVhawotICAgICAgICAgICAgICAgICAgICAgICAgd2FzX2xhc3Rfb25fZGVmYXVsdCA9 IFRydWUKKyAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHRfY291bnQgKz0gMQogICAgICAg ICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICAgICAgd2FzX2xhc3Rfb25f ZGVmYXVsdCA9IEZhbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBkZWZhdWx0X2NvdW50ID0g MAogICAgICAgICAgICAgICAgIHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0uaW5zZXJ0KHBv cywgcmV2aXNpb24pCiAKKyAgICAgICAgaWYgZGVmYXVsdF9jb3VudDoKKyAgICAgICAgICAgIHNl bGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0gPSBzZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hd W2RlZmF1bHRfY291bnQgLSAxOl0KICAgICAgICAgaWYgc2VsZi5fbWV0YWRhdGFfY2FjaGVbc2Vs Zi5kZWZhdWx0X2JyYW5jaF1bMF0gPT0gWzBdOgogICAgICAgICAgICAgc2VsZi5fbWV0YWRhdGFf Y2FjaGVbJ2lkZW50aWZpZXInXSA9IGxlbihzZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hdKQog Cg== 425439 2021-04-07 14:37:33 -0700 2021-04-07 15:25:25 -0700 Patch for landing bug-224251-20210407143731.patch text/plain 6015 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NjI3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTllZTQzYWI1OGFkM2E1MTVlM2YwNzZkMjQ4OWNiM2Rk YTE5OTA5NC4uOGUyN2ViMGNmZGU3ZDlhNjRhYzJjODdkOWJlYzQ5YWRjYmQ3Y2QyMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTA0LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBtdWx0aXBsZSBkb3VibGUtYnJhbmNoIGNvbW1p dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDI1 MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzYyODg1NDc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGV3ZWkgWmh1LgorCisgICAgICAgIFRoZXJlIGFyZSBhIGZldyBjYXNlcywgbmFtZWx5IG9u IHRoZSBzYWZhcmktNjA3LWJyYW5jaCwgd2hlcmUgc29tZSBjb21taXRzIHdoZXJlIG1hZGUgYm90 aAorICAgICAgICBvbiB0cnVuayBhbmQgb24gYSBicmFuY2guIEluIG9uZSBub3RhYmxlIGNhc2Us IHR3byBzZXF1ZW50aWFsIGNvbW1pdHMgd2VyZSBtYWRlIHRoaXMgd2F5LgorCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAg ICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRf Xy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvc3ZuLnB5OgorICAgICAgICAoU3ZuLl9jYWNoZV9yZXZpc2lvbnMpOiBI YW5kbGUgbXVsdGlwbGUgZG91YmxlLWJyYW5jaCBjb21taXRzLgorICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4ucHk6CisgICAgICAg IChTdm4uX2NhY2hlX3JldmlzaW9ucyk6IEhhbmRsZSBtdWx0aXBsZSBkb3VibGUtYnJhbmNoIGNv bW1pdHMuCisKIDIwMjEtMDQtMDcgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29t PgogCiAgICAgICAgIGNvbW1pdC1xdWV1ZSBzaG91bGQgcGVyZm9ybSBnaXQgcmVzZXQgLS1oYXJk IGJldHdlZW4gcmV0cnkgYXR0ZW1wdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHkKaW5kZXggY2RmNWJlOWIxMDVhZmQ0YmY2OTY5OTc5ODVhNWE0Y2E2OWU2 MWVmMS4uMDAyMjVlMTkzNmQ0ZWJmYmQ3MDRkYTViNTZkNTNlOTJiYjQzYTU1YiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysrIGIvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTI5LDcgKzI5LDcg QEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAg dmVyc2lvbj0nMC4xMy44JywKKyAgICB2ZXJzaW9uPScwLjEzLjknLAogICAgIGRlc2NyaXB0aW9u PSdMaWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9y aWVzLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1b CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5CmluZGV4IDU5MzI5ZDY2YjY3YWI1YTllZmUwZDhjNjgxYTcz ZDFlYjIxZjk4MmEuLjVjYzk5MTk3M2I5OGM0ZWZhMTVhOTljODMxNjNmYmZhNjE0ZjdjNTEgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5CkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJv cjoKICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFs bCB3ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAg ICAgKQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAxMywgOCkKK3ZlcnNpb24gPSBWZXJzaW9uKDAs IDEzLCA5KQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJz aW9uKDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMn LCBWZXJzaW9uKDEsIDUpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQppbmRleCAwNzU2YTlhZjVh ZDRhOTU4YTNhMTQ5ODI2NWY2ZTkxMTFlN2E3ODVlLi4xYzk1MDI1ZDA5YTVlNjdiYzYyNzk1YjY3 ZTY5MTI5OTI5Y2VjYWFhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5CkBAIC0xNjUsNyArMTY1 LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICBpZiBsb2cucG9sbCgpOgogICAgICAg ICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCJGYWlsZWQgdG8gY29uc3RydWN0IGJyYW5j aCBoaXN0b3J5IGZvciAne30nIi5mb3JtYXQoYnJhbmNoKSkKIAotICAgICAgICAgICAgd2FzX2xh c3Rfb25fZGVmYXVsdCA9IEZhbHNlCisgICAgICAgICAgICBkZWZhdWx0X2NvdW50ID0gMAogICAg ICAgICAgICAgbGluZSA9IGxvZy5zdGRvdXQucmVhZGxpbmUoKQogICAgICAgICAgICAgd2hpbGUg bGluZToKICAgICAgICAgICAgICAgICBtYXRjaCA9IHNlbGYuTE9HX1JFLm1hdGNoKGxpbmUpCkBA IC0xODEsMTcgKzE4MSwyMCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgICAgICAgICAgICAg ICAgIGJyZWFrCiAgICAgICAgICAgICAgICAgICAgIGlmIG5vdCBpc19kZWZhdWx0X2JyYW5jaDoK ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIHJldmlzaW9uIGluIHNlbGYuX21ldGFkYXRhX2Nh Y2hlW3NlbGYuZGVmYXVsdF9icmFuY2hdOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlm IHdhc19sYXN0X29uX2RlZmF1bHQ6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBPbmx5 IGhhbmRsZSAyIHNlcXVlbnRpYWwgY3Jvc3MtYnJhbmNoIGNvbW1pdHMKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZiBkZWZhdWx0X2NvdW50ID4gMjoKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB3YXNfbGFzdF9v bl9kZWZhdWx0ID0gVHJ1ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHRfY291 bnQgKz0gMQogICAgICAgICAgICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICB3YXNfbGFzdF9vbl9kZWZhdWx0ID0gRmFsc2UKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkZWZhdWx0X2NvdW50ID0gMAogICAgICAgICAgICAgICAgICAgICBzZWxmLl9t ZXRhZGF0YV9jYWNoZVticmFuY2hdLmluc2VydChwb3MsIHJldmlzaW9uKQogICAgICAgICAgICAg ICAgIGxpbmUgPSBsb2cuc3Rkb3V0LnJlYWRsaW5lKCkKICAgICAgICAgZmluYWxseToKICAgICAg ICAgICAgIGlmIGxvZzoKICAgICAgICAgICAgICAgICBsb2cua2lsbCgpCiAKKyAgICAgICAgaWYg ZGVmYXVsdF9jb3VudDoKKyAgICAgICAgICAgIHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0g PSBzZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hdW2RlZmF1bHRfY291bnQgLSAxOl0KICAgICAg ICAgaWYgc2VsZi5fbWV0YWRhdGFfY2FjaGVbc2VsZi5kZWZhdWx0X2JyYW5jaF1bMF0gPT0gWzBd OgogICAgICAgICAgICAgc2VsZi5fbWV0YWRhdGFfY2FjaGVbJ2lkZW50aWZpZXInXSA9IGxlbihz ZWxmLl9tZXRhZGF0YV9jYWNoZVticmFuY2hdKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5IGIvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQpp bmRleCBkZDQ1NzczODdmZmUyY2NlYWVmOTgzNGFjMWU2ZDMzYzBkZmNjOGUyLi5iYTA3YjM2NzUw ZTUwOWZiNGQ5ODIwOGY1ZWU3ZTA3Zjc5NTVjM2RkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4u cHkKQEAgLTI0Miw3ICsyNDIsNyBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgICAgIGlmIHJl c3BvbnNlLnN0YXR1c19jb2RlICE9IDIwMDoKICAgICAgICAgICAgICAgICByYWlzZSBzZWxmLkV4 Y2VwdGlvbigiRmFpbGVkIHRvIGNvbnN0cnVjdCBicmFuY2ggaGlzdG9yeSBmb3IgJ3t9JyIuZm9y bWF0KGJyYW5jaCkpCiAKLSAgICAgICAgICAgIHdhc19sYXN0X29uX2RlZmF1bHQgPSBGYWxzZQor ICAgICAgICAgICAgZGVmYXVsdF9jb3VudCA9IDAKICAgICAgICAgICAgIGZvciBsaW5lIGluIHJl c3BvbnNlLml0ZXJfbGluZXMoKToKICAgICAgICAgICAgICAgICBtYXRjaCA9IHNlbGYuSElTVE9S WV9SRS5tYXRjaChsaW5lKQogICAgICAgICAgICAgICAgIGlmIG5vdCBtYXRjaDoKQEAgLTI1OSwx MyArMjU5LDE2IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgICAgICAgICBicmVhawog ICAgICAgICAgICAgICAgIGlmIG5vdCBpc19kZWZhdWx0X2JyYW5jaDoKICAgICAgICAgICAgICAg ICAgICAgaWYgcmV2aXNpb24gaW4gc2VsZi5fbWV0YWRhdGFfY2FjaGVbc2VsZi5kZWZhdWx0X2Jy YW5jaF06Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiB3YXNfbGFzdF9vbl9kZWZhdWx0Ogor ICAgICAgICAgICAgICAgICAgICAgICAgIyBPbmx5IGhhbmRsZSAyIHNlcXVlbnRpYWwgY3Jvc3Mt YnJhbmNoIGNvbW1pdHMKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIGRlZmF1bHRfY291bnQg PiAyOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCi0gICAgICAgICAgICAgICAg ICAgICAgICB3YXNfbGFzdF9vbl9kZWZhdWx0ID0gVHJ1ZQorICAgICAgICAgICAgICAgICAgICAg ICAgZGVmYXVsdF9jb3VudCArPSAxCiAgICAgICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAg ICAgICAgICAgICAgICAgICB3YXNfbGFzdF9vbl9kZWZhdWx0ID0gRmFsc2UKKyAgICAgICAgICAg ICAgICAgICAgICAgIGRlZmF1bHRfY291bnQgPSAwCiAgICAgICAgICAgICAgICAgc2VsZi5fbWV0 YWRhdGFfY2FjaGVbYnJhbmNoXS5pbnNlcnQocG9zLCByZXZpc2lvbikKIAorICAgICAgICBpZiBk ZWZhdWx0X2NvdW50OgorICAgICAgICAgICAgc2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXSA9 IHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF1bZGVmYXVsdF9jb3VudCAtIDE6XQogICAgICAg ICBpZiBzZWxmLl9tZXRhZGF0YV9jYWNoZVtzZWxmLmRlZmF1bHRfYnJhbmNoXVswXSA9PSBbMF06 CiAgICAgICAgICAgICBzZWxmLl9tZXRhZGF0YV9jYWNoZVsnaWRlbnRpZmllciddID0gbGVuKHNl bGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0pCiAK