229822 2021-09-02 12:19:03 -0700 [webkit-patch] apply-watchlist command fails on python 3 2021-09-02 17:57:23 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain jbedard aakash_jain ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1789831 0 aakash_jain 2021-09-02 12:19:03 -0700 webkit-patch apply-watchlist command fails on python 3 e.g.: https://ews-build.webkit-uat.org/#/builders/2/builds/6/steps/9/logs/stdio Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 80, in <module> main() File "Tools/Scripts/webkit-patch", line 75, in main WebKitPatch(os.path.abspath(__file__)).main() File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 305, in main result = command.check_arguments_and_execute(options, args, self) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 123, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/steps/applywatchlist.py", line 48, in run cc_and_messages = self._tool.watch_list().determine_cc_and_messages(diff) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/watchlist/watchlist.py", line 71, in determine_cc_and_messages definitions = self.find_matching_definitions(diff) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/watchlist/watchlist.py", line 40, in find_matching_definitions patch_files = DiffParser(diff.splitlines()).files File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 144, in __init__ self.files = self._parse_into_diff_files(diff_input) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 153, in _parse_into_diff_files transform_line = get_diff_converter(diff_input) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 90, in get_diff_converter if match(r"^diff --git \w/", line): File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 47, in match return _regexp_compile_cache[pattern].match(string) TypeError: cannot use a string pattern on a bytes-like object 1789866 1 webkit-bug-importer 2021-09-02 13:38:49 -0700 <rdar://problem/82691261> 1789867 2 437187 jbedard 2021-09-02 13:40:25 -0700 Created attachment 437187 Patch 1789892 3 ews-feeder 2021-09-02 14:17:28 -0700 Committed r281953 (241260@main): <https://commits.webkit.org/241260@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437187. 1789918 4 aakash_jain 2021-09-02 15:07:34 -0700 Still noticing this issue (on 241264@main), e.g.: https://ews-build.webkit-uat.org/#/builders/2/builds/13 https://ews-build.webkit-uat.org/#/builders/2/builds/17 1789987 5 jbedard 2021-09-02 17:13:09 -0700 Reopening to attach new patch. 1789988 6 437221 jbedard 2021-09-02 17:13:10 -0700 Created attachment 437221 Patch 1789989 7 437221 aakash_jain 2021-09-02 17:15:01 -0700 Comment on attachment 437221 Patch rs=me 1790001 8 ews-feeder 2021-09-02 17:57:22 -0700 Committed r281968 (241275@main): <https://commits.webkit.org/241275@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437221. 437187 2021-09-02 13:40:25 -0700 2021-09-02 14:17:29 -0700 Patch bug-229822-20210902134024.patch text/plain 1591 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTQ4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2Q5OGJjYmM5NTVmZjhhNGUyM2U1MTlkNTk1Y2M5NTc5 MWI5MDA2YS4uYTA0ZDI5ZTNmNDU4MWFiNzBmOTJhYmU2YTQxZTdlMzA3ODdlYWU3OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA5LTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0LXBhdGNoXSBhcHBseS13YXRjaGxpc3QgY29tbWFuZCBmYWlscyBvbiBw eXRob24gMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI5ODIyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjY5MTI2MT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5OgorICAgICAgICAoRGlmZlBhcnNlci5fcGFyc2Vf aW50b19kaWZmX2ZpbGVzKTogRW5zdXJlIGFsbCBkaWZmIGxpbmVzIGFyZSBzdHJpbmdzLgorCiAy MDIxLTA5LTAyICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdW1dQRV0gUG9ydCBBUEkgdGVzdCBydW5uZXIgdG8gcHl0aG9uMyAo djIpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9k aWZmX3BhcnNlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Rp ZmZfcGFyc2VyLnB5CmluZGV4IDI2MzIwNjkxMDg4ODg0ZTA5ODhkODA2NGJiNTFlMjhlMTQyOTYy ZDAuLmY2ZmEwMzdlMzZhYmY5MzE2M2MzMTg0YmNiY2Y3MTAzMDg2ZWY5MjEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5 CkBAIC0zMSw2ICszMSw4IEBACiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IHJlCiAKK2Zyb20gd2Vi a2l0Y29yZXB5IGltcG9ydCBzdHJpbmdfdXRpbHMKKwogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2Vy KF9fbmFtZV9fKQogCiAKQEAgLTE1Miw3ICsxNTQsNyBAQCBjbGFzcyBEaWZmUGFyc2VyKG9iamVj dCk6CiAgICAgICAgIG5ld19kaWZmX2xpbmUgPSBOb25lCiAgICAgICAgIHRyYW5zZm9ybV9saW5l ID0gZ2V0X2RpZmZfY29udmVydGVyKGRpZmZfaW5wdXQpCiAgICAgICAgIGZvciBsaW5lIGluIGRp ZmZfaW5wdXQ6Ci0gICAgICAgICAgICBsaW5lID0gbGluZS5yc3RyaXAoIlxuIikKKyAgICAgICAg ICAgIGxpbmUgPSBzdHJpbmdfdXRpbHMuZGVjb2RlKGxpbmUpLnJzdHJpcCgiXG4iKQogICAgICAg ICAgICAgbGluZSA9IHRyYW5zZm9ybV9saW5lKGxpbmUpCiAKICAgICAgICAgICAgIGZpbGVfZGVj bGFyYXRpb24gPSBtYXRjaChyIl5JbmRleDogKD9QPEZpbGVQYXRoPi4rKSIsIGxpbmUpCg== 437221 2021-09-02 17:13:10 -0700 2021-09-02 17:57:22 -0700 Patch bug-229822-20210902171309.patch text/plain 1381 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzNjMDVmZjNhMTUxZWM3NDUyZDlmMWRjMjEyNmNhNmQy OTA0OGUwOC4uNGY0YjlmOWFkMDNiNTUzOGQ1YTkxZTk3OTVjMTE0ZjM1MjI1NzY1NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA5LTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0LXBhdGNoXSBhcHBseS13YXRjaGxpc3QgY29tbWFuZCBmYWlscyBvbiBw eXRob24gMyAoRm9sbG93LXVwIGZpeCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyOTgyMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODI2OTEyNjE+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weToKKyAgICAgICAgKGdl dF9kaWZmX2NvbnZlcnRlcik6IFBvdGVudGlhbGx5IGRlY29kZSBieXRlcy4KKwogMjAyMS0wOS0w MiAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xJQl0gcnVu LWd0ay10ZXN0cyBkb2VzIG5vdCByZXF1aXJlIEdJIG91dHNpZGUgdGhlIHNhbmRib3gKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2Vy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIu cHkKaW5kZXggZjZmYTAzN2UzNmFiZjkzMTYzYzMxODRiY2JjZjcxMDMwODZlZjkyMS4uOTg1ODdj YTM5YTFiNDc1M2M4OTc0ZTcyYTZkZGRjOTUxZmUwNzc5MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIucHkKQEAgLTg2LDYg Kzg2LDggQEAgZGVmIGdldF9kaWZmX2NvbnZlcnRlcihsaW5lcyk6CiAgICAgICAgICAgICAgY29u dmVydGVyIGZyb20gZ2l0IHRvIFNWTi4KICAgICAiIiIKICAgICBmb3IgaSwgbGluZSBpbiBlbnVt ZXJhdGUobGluZXNbOi0xXSk6CisgICAgICAgIGxpbmUgPSBzdHJpbmdfdXRpbHMuZGVjb2RlKGxp bmUpCisKICAgICAgICAgIyBTdG9wIHdoZW4gd2UgZmluZCB0aGUgZmlyc3QgcGF0Y2gKICAgICAg ICAgaWYgbGluZVs6M10gPT0gIisrKyIgYW5kIGxpbmVzW2kgKyAxXSA9PSAiLS0tIjoKICAgICAg ICAgICAgIGJyZWFrCg==