229342 2021-08-20 11:34:50 -0700 [git-webkit] Forward unknown args to log and blame 2021-08-20 14:57:08 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain andresg_22 webkit-bug-importer oldest_to_newest 1785921 0 jbedard 2021-08-20 11:34:50 -0700 git-webkit log and git-webkit blame do not correctly forward options that begin with '-' as an artifact of Python's argparser. As the below example shows, that can be a problem: git blame -L1474,1484 Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 1785922 1 webkit-bug-importer 2021-08-20 11:36:24 -0700 <rdar://problem/82178743> 1785923 2 436011 jbedard 2021-08-20 11:37:38 -0700 Created attachment 436011 Patch 1785924 3 436011 jbedard 2021-08-20 11:39:47 -0700 Comment on attachment 436011 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436011&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py:87 > + parsed = parser.parse_args(args=args) Open to other thoughts here, but in general, if the command in question doesn't have args, we want to parse it normally. If it does have args, we want to treat all unknown values as args. The trouble is, we can't figure out which case we're in until we parse the command in the first place. 1785933 4 436014 jbedard 2021-08-20 11:50:56 -0700 Created attachment 436014 Patch 1785960 5 436014 aakash_jain 2021-08-20 13:15:25 -0700 Comment on attachment 436014 Patch rs=me 1785982 6 436029 jbedard 2021-08-20 14:24:13 -0700 Created attachment 436029 Patch for landing 1786001 7 ews-feeder 2021-08-20 14:57:07 -0700 Committed r281339 (240756@main): <https://commits.webkit.org/240756@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436029. 436011 2021-08-20 11:37:38 -0700 2021-08-20 11:50:54 -0700 Patch bug-229342-20210820113737.patch text/plain 3369 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzdjOGY1YjlkNTVkZjZlYTUyN2IxZWE4NGZjNjBkNmFj ZDc2MDkwOS4uNTBkZTdiMWJlOTRjN2JlNjE2MGYyNjU5YzE5ZDU5ZjFhMTg0ODhlNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA4LTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gRm9yd2FyZCB1bmtub3duIGFyZ3MgdG8gbG9nIGFuZCBibGFt ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzQy CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjE3ODc0Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19pbml0X18u cHk6CisgICAgICAgIChtYWluKTogQm90aCBsb2cgYW5kIGJsYW1lIG1pZ2h0IGJlIHBhc3NlZCBv cHRpb25zIHRoYXQgbmVlZCB0byBiZSBmb3J3YXJkZWQgdG8gZ2l0L3N2bi4KKwogMjAyMS0wOC0y MCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbZXdzLWJ1aWxkLndlYmtpdC5vcmddIEFkZCB1bml0IHRlc3Qgd2l0aCB0aGUgZXhwZWN0 ZWQgYnVpbGQgc3RlcHMgZm9yIGVhY2ggcXVldWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkKaW5kZXggZDE2MjAwNThmMjYxY2Y2OGVmM2FlNDVlOGRmOTEy NzJiMjAzN2U3Ni4uOTMwZmM4NjkzNjU3MzE0YTNkNjFiMGE2OTYwY2YwMGU1NGE3N2RiMCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysr IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTI5LDcg KzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScs Ci0gICAgdmVyc2lvbj0nMS4xLjMnLAorICAgIHZlcnNpb249JzEuMS40JywKICAgICBkZXNjcmlw dGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9z aXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmll cnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCA0ZDgxNGJlMzdhZjJlZmQ2NWE3NjY1ZjU5 ZDUxOWM2OTRmZWNjYjVjLi5jYTBiOWQzZTVkNjJmOGYzMzIxMDEzNDJlMTAzZjQ2MTU4YTBlNzM1 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0 RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGlu c3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5g IgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMSwgMSwgMykKK3ZlcnNpb24gPSBWZXJzaW9u KDEsIDEsIDQpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZl cnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25p YycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weSBiL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19pbml0X18ucHkK aW5kZXggMTU3OGRkOTZlODE1YjY2MzM1MTJjMmFiNjA5YTczNWI0Y2FmOGUwZS4uNTc3OTU1N2Qy NDA4M2FmNTE4ZjZmZDFhMTVlMWUyMDkzYzAzYzZkOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9n cmFtL19faW5pdF9fLnB5CkBAIC0yMyw2ICsyMyw3IEBACiBpbXBvcnQgYXJncGFyc2UKIGltcG9y dCBsb2dnaW5nCiBpbXBvcnQgb3MKK2ltcG9ydCBzeXMKIAogZnJvbSAuYmxhbWUgaW1wb3J0IEJs YW1lCiBmcm9tIC5jYW5vbmljYWxpemUgaW1wb3J0IENhbm9uaWNhbGl6ZQpAQCAtNzgsNyArNzks MTIgQEAgZGVmIG1haW4oYXJncz1Ob25lLCBwYXRoPU5vbmUsIGxvZ2dlcnM9Tm9uZSwgY29udHJp YnV0b3JzPU5vbmUsIGlkZW50aWZpZXJfdGVtcGwKICAgICAgICAgKQogICAgICAgICBwcm9ncmFt LnBhcnNlcihzdWJwYXJzZXIsIGxvZ2dlcnM9bG9nZ2VycykKIAotICAgIHBhcnNlZCA9IHBhcnNl ci5wYXJzZV9hcmdzKGFyZ3M9YXJncykKKyAgICBwYXJzZWQsIHVua25vd24gPSBwYXJzZXIucGFy c2Vfa25vd25fYXJncyhhcmdzPWFyZ3MpCisgICAgaWYgdW5rbm93bjoKKyAgICAgICAgaWYgZ2V0 YXR0cihwYXJzZWQsICdhcmdzJywgTm9uZSk6CisgICAgICAgICAgICBwYXJzZWQuYXJncyA9IFth cmcgZm9yIGFyZyBpbiBhcmdzIG9yIHN5cy5hcmd2IGlmIGFyZyBpbiBwYXJzZWQuYXJncyBvciBh cmcgaW4gdW5rbm93bl0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHBhcnNlZCA9IHBhcnNl ci5wYXJzZV9hcmdzKGFyZ3M9YXJncykKIAogICAgIGlmIHBhcnNlZC5yZXBvc2l0b3J5LnN0YXJ0 c3dpdGgoKCdodHRwczovLycsICdodHRwOi8vJykpOgogICAgICAgICByZXBvc2l0b3J5ID0gcmVt b3RlLlNjbS5mcm9tX3VybChwYXJzZWQucmVwb3NpdG9yeSwgY29udHJpYnV0b3JzPWNvbnRyaWJ1 dG9ycykK 436014 2021-08-20 11:50:56 -0700 2021-08-20 14:24:11 -0700 Patch bug-229342-20210820115055.patch text/plain 3924 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzI2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzdjOGY1YjlkNTVkZjZlYTUyN2IxZWE4NGZjNjBkNmFj ZDc2MDkwOS4uNTBkZTdiMWJlOTRjN2JlNjE2MGYyNjU5YzE5ZDU5ZjFhMTg0ODhlNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA4LTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gRm9yd2FyZCB1bmtub3duIGFyZ3MgdG8gbG9nIGFuZCBibGFt ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MzQy CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjE3ODc0Mz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19pbml0X18u cHk6CisgICAgICAgIChtYWluKTogQm90aCBsb2cgYW5kIGJsYW1lIG1pZ2h0IGJlIHBhc3NlZCBv cHRpb25zIHRoYXQgbmVlZCB0byBiZSBmb3J3YXJkZWQgdG8gZ2l0L3N2bi4KKwogMjAyMS0wOC0y MCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAg ICAgICBbZXdzLWJ1aWxkLndlYmtpdC5vcmddIEFkZCB1bml0IHRlc3Qgd2l0aCB0aGUgZXhwZWN0 ZWQgYnVpbGQgc3RlcHMgZm9yIGVhY2ggcXVldWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkKaW5kZXggZDE2MjAwNThmMjYxY2Y2OGVmM2FlNDVlOGRmOTEy NzJiMjAzN2U3Ni4uOTMwZmM4NjkzNjU3MzE0YTNkNjFiMGE2OTYwY2YwMGU1NGE3N2RiMCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKKysr IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKQEAgLTI5LDcg KzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScs Ci0gICAgdmVyc2lvbj0nMS4xLjMnLAorICAgIHZlcnNpb249JzEuMS40JywKICAgICBkZXNjcmlw dGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJlcG9z aXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmll cnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQppbmRleCA0ZDgxNGJlMzdhZjJlZmQ2NWE3NjY1ZjU5 ZDUxOWM2OTRmZWNjYjVjLi5jYTBiOWQzZTVkNjJmOGYzMzIxMDEzNDJlMTAzZjQ2MTU4YTBlNzM1 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0 RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGlu c3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5g IgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMSwgMSwgMykKK3ZlcnNpb24gPSBWZXJzaW9u KDEsIDEsIDQpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZl cnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25p YycsIFZlcnNpb24oMSwgNSkpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weSBiL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19pbml0X18ucHkK aW5kZXggMTU3OGRkOTZlODE1YjY2MzM1MTJjMmFiNjA5YTczNWI0Y2FmOGUwZS4uYjJlNDlhY2Iw ZWYyZjIzY2QyMTZmMzRkMmViNjNhM2JkMWQ2OGEzMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weQor KysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9wcm9n cmFtL19faW5pdF9fLnB5CkBAIC0yMyw2ICsyMyw3IEBACiBpbXBvcnQgYXJncGFyc2UKIGltcG9y dCBsb2dnaW5nCiBpbXBvcnQgb3MKK2ltcG9ydCBzeXMKIAogZnJvbSAuYmxhbWUgaW1wb3J0IEJs YW1lCiBmcm9tIC5jYW5vbmljYWxpemUgaW1wb3J0IENhbm9uaWNhbGl6ZQpAQCAtNzEsNiArNzIs NyBAQCBkZWYgbWFpbihhcmdzPU5vbmUsIHBhdGg9Tm9uZSwgbG9nZ2Vycz1Ob25lLCBjb250cmli dXRvcnM9Tm9uZSwgaWRlbnRpZmllcl90ZW1wbAogICAgIGZvciBwcm9ncmFtIGluIHByb2dyYW1z OgogICAgICAgICBzdWJwYXJzZXIgPSBzdWJwYXJzZXJzLmFkZF9wYXJzZXIocHJvZ3JhbS5uYW1l LCBoZWxwPXByb2dyYW0uaGVscCkKICAgICAgICAgc3VicGFyc2VyLnNldF9kZWZhdWx0cyhtYWlu PXByb2dyYW0ubWFpbikKKyAgICAgICAgc3VicGFyc2VyLnNldF9kZWZhdWx0cyhwcm9ncmFtPXBy b2dyYW0ubmFtZSkKICAgICAgICAgYXJndW1lbnRzLkxvZ2dpbmdHcm91cCgKICAgICAgICAgICAg IHN1YnBhcnNlciwKICAgICAgICAgICAgIGxvZ2dlcnM9bG9nZ2VycywKQEAgLTc4LDcgKzgwLDE0 IEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBsb2dnZXJzPU5vbmUsIGNvbnRyaWJ1 dG9ycz1Ob25lLCBpZGVudGlmaWVyX3RlbXBsCiAgICAgICAgICkKICAgICAgICAgcHJvZ3JhbS5w YXJzZXIoc3VicGFyc2VyLCBsb2dnZXJzPWxvZ2dlcnMpCiAKLSAgICBwYXJzZWQgPSBwYXJzZXIu cGFyc2VfYXJncyhhcmdzPWFyZ3MpCisgICAgYXJncyA9IGFyZ3Mgb3Igc3lzLmFyZ3ZbMTpdCisg ICAgcGFyc2VkLCB1bmtub3duID0gcGFyc2VyLnBhcnNlX2tub3duX2FyZ3MoYXJncz1hcmdzKQor ICAgIGlmIHVua25vd246CisgICAgICAgIHByb2dyYW1faW5kZXggPSBhcmdzLmluZGV4KHBhcnNl ZC5wcm9ncmFtKQorICAgICAgICBpZiBnZXRhdHRyKHBhcnNlZCwgJ2FyZ3MnLCBOb25lKToKKyAg ICAgICAgICAgIHBhcnNlZC5hcmdzID0gW2FyZyBmb3IgYXJnIGluIGFyZ3NbcHJvZ3JhbV9pbmRl eDpdIGlmIGFyZyBpbiBwYXJzZWQuYXJncyBvciBhcmcgaW4gdW5rbm93bl0KKyAgICAgICAgaWYg YW55KFtvcHRpb24gbm90IGluIGdldGF0dHIocGFyc2VkLCAnYXJncycsIFtdKSBmb3Igb3B0aW9u IGluIHVua25vd25dKToKKyAgICAgICAgICAgIHBhcnNlZCA9IHBhcnNlci5wYXJzZV9hcmdzKGFy Z3M9YXJncykKIAogICAgIGlmIHBhcnNlZC5yZXBvc2l0b3J5LnN0YXJ0c3dpdGgoKCdodHRwczov LycsICdodHRwOi8vJykpOgogICAgICAgICByZXBvc2l0b3J5ID0gcmVtb3RlLlNjbS5mcm9tX3Vy bChwYXJzZWQucmVwb3NpdG9yeSwgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9ycykK 436029 2021-08-20 14:24:13 -0700 2021-08-20 14:57:08 -0700 Patch for landing bug-229342-20210820142412.patch text/plain 3620 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MTMzNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA4LTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbZ2l0LXdlYmtpdF0gRm9yd2FyZCB1bmtub3duIGFyZ3MgdG8gbG9nIGFu ZCBibGFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI5MzQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjE3ODc0Mz4KKworICAgICAgICBSdWJi ZXItc3RhbXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0v X19pbml0X18ucHk6CisgICAgICAgIChtYWluKTogQm90aCBsb2cgYW5kIGJsYW1lIG1pZ2h0IGJl IHBhc3NlZCBvcHRpb25zIHRoYXQgbmVlZCB0byBiZSBmb3J3YXJkZWQgdG8gZ2l0L3N2bi4KKwog MjAyMS0wOC0yMCAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzQxNjYpOiBbR1RLXSBJdCBicm9rZSBydW4tamF2 YXNjcmlwdGNvcmUtdGVzdHMgY2F1c2luZyBhbGwgdGVzdHMgdG8gdXNlIGxvdCBvZiBtZW1vcnkK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CShy ZXZpc2lvbiAyODEzMzYpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9z ZXR1cC5weQkod29ya2luZyBjb3B5KQpAQCAtMjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAK IHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScxLjEuMycsCisg ICAgdmVyc2lvbj0nMS4xLjQnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRv IGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNj cmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2lu aXRfXy5weQkocmV2aXNpb24gMjgxMzM2KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcg KzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Vi a2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVy bCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDEsIDEs IDMpCit2ZXJzaW9uID0gVmVyc2lvbigxLCAxLCA0KQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQ YWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vX19pbml0X18u cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRfXy5weQkocmV2aXNpb24gMjgxMzM2KQorKysgVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9fX2luaXRf Xy5weQkod29ya2luZyBjb3B5KQpAQCAtMjMsNiArMjMsNyBAQAogaW1wb3J0IGFyZ3BhcnNlCiBp bXBvcnQgbG9nZ2luZwogaW1wb3J0IG9zCitpbXBvcnQgc3lzCiAKIGZyb20gLmJsYW1lIGltcG9y dCBCbGFtZQogZnJvbSAuY2Fub25pY2FsaXplIGltcG9ydCBDYW5vbmljYWxpemUKQEAgLTcxLDYg KzcyLDcgQEAgZGVmIG1haW4oYXJncz1Ob25lLCBwYXRoPU5vbmUsIGxvZ2dlcnM9TgogICAgIGZv ciBwcm9ncmFtIGluIHByb2dyYW1zOgogICAgICAgICBzdWJwYXJzZXIgPSBzdWJwYXJzZXJzLmFk ZF9wYXJzZXIocHJvZ3JhbS5uYW1lLCBoZWxwPXByb2dyYW0uaGVscCkKICAgICAgICAgc3VicGFy c2VyLnNldF9kZWZhdWx0cyhtYWluPXByb2dyYW0ubWFpbikKKyAgICAgICAgc3VicGFyc2VyLnNl dF9kZWZhdWx0cyhwcm9ncmFtPXByb2dyYW0ubmFtZSkKICAgICAgICAgYXJndW1lbnRzLkxvZ2dp bmdHcm91cCgKICAgICAgICAgICAgIHN1YnBhcnNlciwKICAgICAgICAgICAgIGxvZ2dlcnM9bG9n Z2VycywKQEAgLTc4LDcgKzgwLDE0IEBAIGRlZiBtYWluKGFyZ3M9Tm9uZSwgcGF0aD1Ob25lLCBs b2dnZXJzPU4KICAgICAgICAgKQogICAgICAgICBwcm9ncmFtLnBhcnNlcihzdWJwYXJzZXIsIGxv Z2dlcnM9bG9nZ2VycykKIAotICAgIHBhcnNlZCA9IHBhcnNlci5wYXJzZV9hcmdzKGFyZ3M9YXJn cykKKyAgICBhcmdzID0gYXJncyBvciBzeXMuYXJndlsxOl0KKyAgICBwYXJzZWQsIHVua25vd24g PSBwYXJzZXIucGFyc2Vfa25vd25fYXJncyhhcmdzPWFyZ3MpCisgICAgaWYgdW5rbm93bjoKKyAg ICAgICAgcHJvZ3JhbV9pbmRleCA9IGFyZ3MuaW5kZXgocGFyc2VkLnByb2dyYW0pCisgICAgICAg IGlmIGdldGF0dHIocGFyc2VkLCAnYXJncycsIE5vbmUpOgorICAgICAgICAgICAgcGFyc2VkLmFy Z3MgPSBbYXJnIGZvciBhcmcgaW4gYXJnc1twcm9ncmFtX2luZGV4Ol0gaWYgYXJnIGluIHBhcnNl ZC5hcmdzIG9yIGFyZyBpbiB1bmtub3duXQorICAgICAgICBpZiBhbnkoW29wdGlvbiBub3QgaW4g Z2V0YXR0cihwYXJzZWQsICdhcmdzJywgW10pIGZvciBvcHRpb24gaW4gdW5rbm93bl0pOgorICAg ICAgICAgICAgcGFyc2VkID0gcGFyc2VyLnBhcnNlX2FyZ3MoYXJncz1hcmdzKQogCiAgICAgaWYg cGFyc2VkLnJlcG9zaXRvcnkuc3RhcnRzd2l0aCgoJ2h0dHBzOi8vJywgJ2h0dHA6Ly8nKSk6CiAg ICAgICAgIHJlcG9zaXRvcnkgPSByZW1vdGUuU2NtLmZyb21fdXJsKHBhcnNlZC5yZXBvc2l0b3J5 LCBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzKQo=