220601 2021-01-13 14:02:33 -0800 [webkitscmpy] Handle single commit touching multiple branches 2021-01-13 14:33:11 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard slewis webkit-bug-importer oldest_to_newest 1719423 0 jbedard 2021-01-13 14:02:33 -0800 We need to work around cases where someone incorrectly committed a change which touches multiple branches, like https://trac.webkit.org/changeset/92419/webkit. 1719424 1 webkit-bug-importer 2021-01-13 14:02:53 -0800 <rdar://problem/73165609> 1719426 2 417562 jbedard 2021-01-13 14:04:32 -0800 Created attachment 417562 Patch 1719437 3 jbedard 2021-01-13 14:33:11 -0800 Committed r271455: <https://trac.webkit.org/changeset/271455> 417562 2021-01-13 14:04:32 -0800 2021-01-13 14:25:09 -0800 Patch bug-220601-20210113140430.patch text/plain 7426 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MTQ1NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIxLTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBzaW5nbGUgY29tbWl0IHRvdWNoaW5n IG11bHRpcGxlIGJyYW5jaGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjA2MDEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzczMTY1NjA5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIFdlYktpdCdz IGhpc3RvcnksIHRoZXJlIGFyZSBhIGZldyBjYXNlcyBvZiBjb21taXRzIHRoYXQgdG91Y2ggbXVs dGlwbGUgYnJhbmNoZXMgKGxpa2UKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hh bmdlc2V0LzkyNDE5L3dlYmtpdCkuIFRoZXNlIHR5cGVzIG9mIGNvbW1pdHMgYXJlIG5vdCBjb3Jy ZWN0LAorICAgICAgICBidXQgd2UgbmVlZCB0byBoYW5kbGUgdGhlbSBpZiB0aGV5IGFyZSBpbiB0 aGUgaGlzdG9yeSBvZiBhIGJyYW5jaC4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAg ICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5w eToKKyAgICAgICAgKFN2bi5fY2FjaGVfcmV2aXNpb25zKTogQnJhbmNoZXMgb25seSBpbnRlcnNl Y3QgdHJ1bmsgd2hlbiB0d28gc2VxdWVudGlhbCBjb21taXRzIGFyZSBmcm9tIHRydW5rLgorICAg ICAgICAoU3ZuLmNvbW1pdCk6IFN1cHBvcnQgY2FzZSB3aGVyZSBubyBjb21taXQgdGltZSBjYW4g YmUgZm91bmQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvcmVtb3RlL3N2bi5weToKKyAgICAgICAgKFN2bi5fY2FjaGVfcmV2aXNpb25zKTogQnJh bmNoZXMgb25seSBpbnRlcnNlY3QgdHJ1bmsgd2hlbiB0d28gc2VxdWVudGlhbCBjb21taXRzIGFy ZSBmcm9tIHRydW5rLgorICAgICAgICAoU3ZuLmNvbW1pdCk6IFN1cHBvcnQgY2FzZSB3aGVyZSBu byBjb21taXQgdGltZSBjYW4gYmUgZm91bmQuCisKIDIwMjEtMDEtMTMgIEFha2FzaCBKYWluICA8 YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtidWlsZC53ZWJraXQub3JnXSBVc2Ug UG9zdGdyZVNRTCBmb3IgbmV3IGJ1aWxkLndlYmtpdC5vcmcgZGF0YWJhc2UKSW5kZXg6IFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CShyZXZpc2lvbiAyNzE0 NDcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkod29y a2luZyBjb3B5KQpAQCAtMzAsNyArMzAsNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAg IG5hbWU9J3dlYmtpdHNjbXB5JywKLSAgICB2ZXJzaW9uPScwLjguMCcsCisgICAgdmVyc2lvbj0n MC44LjEnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdp dGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFk bWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkocmV2 aXNpb24gMjcxNDQ3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhj ZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdp dGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBp bmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDgsIDApCit2ZXJzaW9u ID0gVmVyc2lvbigwLCA4LCAxKQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0 ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdtb25vdG9uaWMnLCBWZXJzaW9uKDEsIDUpKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4u cHkJKHJldmlzaW9uIDI3MTQ0NykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtMTY0LDYgKzE2 NCw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgaWYgbG9nLnBvbGwoKToKICAgICAg ICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiRmFpbGVkIHRvIGNvbnN0cnVjdCBicmFu Y2ggaGlzdG9yeSBmb3IgJ3t9JyIuZm9ybWF0KGJyYW5jaCkpCiAKKyAgICAgICAgICAgIHdhc19s YXN0X29uX2RlZmF1bHQgPSBGYWxzZQogICAgICAgICAgICAgbGluZSA9IGxvZy5zdGRvdXQucmVh ZGxpbmUoKQogICAgICAgICAgICAgd2hpbGUgbGluZToKICAgICAgICAgICAgICAgICBtYXRjaCA9 IHNlbGYuTE9HX1JFLm1hdGNoKGxpbmUpCkBAIC0xNzksOCArMTgwLDExIEBAIGNsYXNzIFN2bihT Y20pOgogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWsKICAgICAgICAgICAgICAgICAgICAg aWYgbm90IGlzX2RlZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgICAgICAgICAgICAgaWYgcmV2 aXNpb24gaW4gc2VsZi5fbWV0YWRhdGFfY2FjaGVbc2VsZi5kZWZhdWx0X2JyYW5jaF06Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXS5pbnNl cnQocG9zLCByZXZpc2lvbikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhaworICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIHdhc19sYXN0X29uX2RlZmF1bHQ6CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgd2FzX2xhc3Rfb25fZGVmYXVsdCA9IFRydWUKKyAgICAgICAgICAgICAgICAgICAgICAgIGVs c2U6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2FzX2xhc3Rfb25fZGVmYXVsdCA9IEZh bHNlCiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0uaW5z ZXJ0KHBvcywgcmV2aXNpb24pCiAgICAgICAgICAgICAgICAgbGluZSA9IGxvZy5zdGRvdXQucmVh ZGxpbmUoKQogICAgICAgICBmaW5hbGx5OgpAQCAtMzI2LDEzICszMzAsMTQgQEAgY2xhc3MgU3Zu KFNjbSk6CiAgICAgICAgICAgICBpZiBicmFuY2ggIT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKICAg ICAgICAgICAgICAgICBicmFuY2ggPSBzZWxmLl9icmFuY2hfZm9yKHJldmlzaW9uKQogCi0gICAg ICAgIGRhdGUgPSBpbmZvWydMYXN0IENoYW5nZWQgRGF0ZSddLnNwbGl0KCcgKCcpWzBdCi0gICAg ICAgIHR6X2RpZmYgPSBkYXRlLnNwbGl0KCcgJylbLTFdCi0gICAgICAgIGRhdGUgPSBkYXRldGlt ZS5zdHJwdGltZShkYXRlWzotbGVuKHR6X2RpZmYpXSwgJyVZLSVtLSVkICVIOiVNOiVTICcpCi0g ICAgICAgIGRhdGUgKz0gdGltZWRlbHRhKAotICAgICAgICAgICAgaG91cnM9aW50KHR6X2RpZmZb MTozXSksCi0gICAgICAgICAgICBtaW51dGVzPWludCh0el9kaWZmWzM6NV0pLAotICAgICAgICAp ICogKDEgaWYgdHpfZGlmZlswXSA9PSAnLScgZWxzZSAtMSkKKyAgICAgICAgZGF0ZSA9IGluZm9b J0xhc3QgQ2hhbmdlZCBEYXRlJ10uc3BsaXQoJyAoJylbMF0gaWYgaW5mby5nZXQoJ0xhc3QgQ2hh bmdlZCBEYXRlJykgZWxzZSBOb25lCisgICAgICAgIGlmIGRhdGU6CisgICAgICAgICAgICB0el9k aWZmID0gZGF0ZS5zcGxpdCgnICcpWy0xXQorICAgICAgICAgICAgZGF0ZSA9IGRhdGV0aW1lLnN0 cnB0aW1lKGRhdGVbOi1sZW4odHpfZGlmZildLCAnJVktJW0tJWQgJUg6JU06JVMgJykKKyAgICAg ICAgICAgIGRhdGUgKz0gdGltZWRlbHRhKAorICAgICAgICAgICAgICAgIGhvdXJzPWludCh0el9k aWZmWzE6M10pLAorICAgICAgICAgICAgICAgIG1pbnV0ZXM9aW50KHR6X2RpZmZbMzo1XSksCisg ICAgICAgICAgICApICogKDEgaWYgdHpfZGlmZlswXSA9PSAnLScgZWxzZSAtMSkKIAogICAgICAg ICBpZiBub3QgaWRlbnRpZmllcjoKICAgICAgICAgICAgIGlmIGJyYW5jaCAhPSBzZWxmLmRlZmF1 bHRfYnJhbmNoIGFuZCByZXZpc2lvbiA+IHNlbGYuX21ldGFkYXRhX2NhY2hlLmdldChzZWxmLmRl ZmF1bHRfYnJhbmNoLCBbMF0pWy0xXToKQEAgLTM3Niw3ICszODEsNyBAQCBjbGFzcyBTdm4oU2Nt KToKICAgICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICBpZGVudGlmaWVyPWlk ZW50aWZpZXIsCiAgICAgICAgICAgICBicmFuY2hfcG9pbnQ9YnJhbmNoX3BvaW50LAotICAgICAg ICAgICAgdGltZXN0YW1wPWludChjYWxlbmRhci50aW1lZ20oZGF0ZS50aW1ldHVwbGUoKSkpLAor ICAgICAgICAgICAgdGltZXN0YW1wPWludChjYWxlbmRhci50aW1lZ20oZGF0ZS50aW1ldHVwbGUo KSkpIGlmIGRhdGUgZWxzZSBOb25lLAogICAgICAgICAgICAgYXV0aG9yPWF1dGhvciwKICAgICAg ICAgICAgIG1lc3NhZ2U9bWVzc2FnZSwKICAgICAgICAgKQpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1v dGUvc3ZuLnB5CShyZXZpc2lvbiAyNzE0NDcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y MzIsNiArMjMyLDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICBpZiByZXNwb25zZS5z dGF0dXNfY29kZSAhPSAyMDA6CiAgICAgICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24o IkZhaWxlZCB0byBjb25zdHJ1Y3QgYnJhbmNoIGhpc3RvcnkgZm9yICd7fSciLmZvcm1hdChicmFu Y2gpKQogCisgICAgICAgICAgICB3YXNfbGFzdF9vbl9kZWZhdWx0ID0gRmFsc2UKICAgICAgICAg ICAgIGZvciBsaW5lIGluIHJlc3BvbnNlLml0ZXJfbGluZXMoKToKICAgICAgICAgICAgICAgICBt YXRjaCA9IHNlbGYuSElTVE9SWV9SRS5tYXRjaChsaW5lKQogICAgICAgICAgICAgICAgIGlmIG5v dCBtYXRjaDoKQEAgLTI0OCw4ICsyNDksMTEgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAg ICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICAgICAgaWYgbm90IGlzX2RlZmF1bHRfYnJhbmNo OgogICAgICAgICAgICAgICAgICAgICBpZiByZXZpc2lvbiBpbiBzZWxmLl9tZXRhZGF0YV9jYWNo ZVtzZWxmLmRlZmF1bHRfYnJhbmNoXToKLSAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX21l dGFkYXRhX2NhY2hlW2JyYW5jaF0uaW5zZXJ0KHBvcywgcmV2aXNpb24pCi0gICAgICAgICAgICAg ICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgICAgICAgICAgaWYgd2FzX2xhc3Rfb25f ZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAg ICAgICAgICAgICAgd2FzX2xhc3Rfb25fZGVmYXVsdCA9IFRydWUKKyAgICAgICAgICAgICAgICAg ICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgICAgIHdhc19sYXN0X29uX2RlZmF1bHQgPSBG YWxzZQogICAgICAgICAgICAgICAgIHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0uaW5zZXJ0 KHBvcywgcmV2aXNpb24pCiAKICAgICAgICAgaWYgc2VsZi5fbWV0YWRhdGFfY2FjaGVbc2VsZi5k ZWZhdWx0X2JyYW5jaF1bMF0gPT0gWzBdOgpAQCAtMzg2LDcgKzM5MCw3IEBAIGNsYXNzIFN2bihT Y20pOgogICAgICAgICAgICAgaWYgYnJhbmNoICE9IHNlbGYuZGVmYXVsdF9icmFuY2g6CiAgICAg ICAgICAgICAgICAgYnJhbmNoID0gc2VsZi5fYnJhbmNoX2ZvcihyZXZpc2lvbikKIAotICAgICAg ICBkYXRlID0gZGF0ZXRpbWUuc3RycHRpbWUoaW5mb1snTGFzdCBDaGFuZ2VkIERhdGUnXSwgJyVZ LSVtLSVkICVIOiVNOiVTJykKKyAgICAgICAgZGF0ZSA9IGRhdGV0aW1lLnN0cnB0aW1lKGluZm9b J0xhc3QgQ2hhbmdlZCBEYXRlJ10sICclWS0lbS0lZCAlSDolTTolUycpIGlmIGluZm8uZ2V0KCdM YXN0IENoYW5nZWQgRGF0ZScpIGVsc2UgTm9uZQogCiAgICAgICAgIGlmIG5vdCBpZGVudGlmaWVy OgogICAgICAgICAgICAgaWYgYnJhbmNoICE9IHNlbGYuZGVmYXVsdF9icmFuY2ggYW5kIHJldmlz aW9uID4gc2VsZi5fbWV0YWRhdGFfY2FjaGUuZ2V0KHNlbGYuZGVmYXVsdF9icmFuY2gsIFswXSlb LTFdOgpAQCAtNDMzLDcgKzQzNyw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgYnJh bmNoPWJyYW5jaCwKICAgICAgICAgICAgIGlkZW50aWZpZXI9aWRlbnRpZmllciwKICAgICAgICAg ICAgIGJyYW5jaF9wb2ludD1icmFuY2hfcG9pbnQsCi0gICAgICAgICAgICB0aW1lc3RhbXA9aW50 KGNhbGVuZGFyLnRpbWVnbShkYXRlLnRpbWV0dXBsZSgpKSksCisgICAgICAgICAgICB0aW1lc3Rh bXA9aW50KGNhbGVuZGFyLnRpbWVnbShkYXRlLnRpbWV0dXBsZSgpKSkgaWYgZGF0ZSBlbHNlIE5v bmUsCiAgICAgICAgICAgICBhdXRob3I9YXV0aG9yLAogICAgICAgICAgICAgbWVzc2FnZT1tZXNz YWdlLAogICAgICAgICApCg==