241114 2022-05-30 18:33:57 -0700 webkit-patch: `git am` strips []-enclosed prefixes (e.g. [CMake][WPE]) in a subject 2022-06-03 15:22:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=240402 InRadar P2 Normal --- 1 fujii fujii aakash_jain ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1872854 0 fujii 2022-05-30 18:33:57 -0700 webkit-patch: `git am` strips prefixes (e.g. [CMake][WPE]) in a subject For example, attachment#459852 had "[CMake][WPE]" in the subject. But, it was stripped 251129@main. We should use `-k` for `git am` and `git format-patch`. See also: Bug 240402 – [webkit-patch] Apply patches commit messages Bug 240256 – [webkit-patch] Include commit messages in patches 1872855 1 459876 fujii 2022-05-30 18:47:44 -0700 Created attachment 459876 Patch 1872856 2 fujii 2022-05-30 18:50:41 -0700 Oh, no. COMMIT_MESSAGE isn't shown for the patch. Bugzilla prettypatch doesn't like a patch generated by git format-patch -k? https://bugs.webkit.org/attachment.cgi?id=459876&action=prettypatch 1872858 3 fujii 2022-05-30 18:53:40 -0700 Ah, it expects "[PATCH]" in the subject. https://github.com/WebKit/WebKit/blob/e647f31fb38449bbe7cf4871edc0ee84ce2c30d2/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb#L71 > MESSAGE_HEADER_FORMATS = [ > /^Subject: \[PATCH ?(\d+\/\d+)?\] (.+)/ > ] 1872859 4 ap 2022-05-30 18:54:33 -0700 Just filed bug 241115 about that. 1873430 5 fujii 2022-06-01 16:56:03 -0700 git-am has --keep-non-patch option. This is exactly what I want. 1873436 6 459944 fujii 2022-06-01 17:03:20 -0700 Created attachment 459944 Patch 1874002 7 459944 jbedard 2022-06-03 13:20:00 -0700 Comment on attachment 459944 Patch I think you need this in buildbot code in Tools/CISupport too 1874012 8 460020 fujii 2022-06-03 13:40:02 -0700 Created attachment 460020 Patch for landing 1874028 9 460020 fujii 2022-06-03 14:19:29 -0700 Comment on attachment 460020 Patch for landing 🤞 1874047 10 ews-feeder 2022-06-03 15:21:32 -0700 Committed r295238 (251293@main): <https://commits.webkit.org/251293@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460020. 1874048 11 webkit-bug-importer 2022-06-03 15:22:13 -0700 <rdar://problem/94368694> 459876 2022-05-30 18:47:44 -0700 2022-06-01 17:03:17 -0700 Patch bug-241114-20220531104743.patch text/plain 2319 fujii RnJvbSA2M2M5YWNhODM2ZGI3MzZjOGYwNmNjMmY1ZGQ5OGY2YjNjYmUwOTFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBIaXJvbm9yaSA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CkRhdGU6IFR1ZSwgMzEgTWF5IDIwMjIgMTA6NDA6MzYgKzA5MDAKU3ViamVjdDogd2Via2l0 LXBhdGNoOiBgZ2l0IGFtYCBzdHJpcHMgcHJlZml4ZXMgKGUuZy4gW0NNYWtlXVtXUEVdKSBpbiBh CiBzdWJqZWN0IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDExMTQK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKQWRkZWQgYC0ta2VlcGAgYW5kIGAtLWtlZXAt c3ViamVjdGAgb3B0aW9ucyBmb3IgYGdpdCBhbWAgYW5kIGBnaXQKZm9ybWF0LXBhdGNoYCBjb21t YW5kcy4KCiogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXQu cHk6CihhcHBseV9wYXRjaCk6CiogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL2dpdC5weToKKEdpdC5jcmVhdGVfcGF0Y2gpOgotLS0KIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5IHwgMiArLQogVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weSAgfCAyICstCiAyIGZpbGVzIGNoYW5n ZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CmluZGV4IGY3MWFhNjhjMTFi Mi4uYmVlZTY3Zjk3OTk0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9jaGVja291dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9jaGVja291dC5weQpAQCAtMTczLDcgKzE3Myw3IEBAIGZvciBsIGluIGxpbmVz WzE6XToKICAgICAgICAgbnVtX2NvbW1pdHMgPSBsZW4oc2VsZi5DT01NSVRfU1VCSkVDVF9SRS5m aW5kYWxsKGVuY29kZWRfcGF0Y2gpKQogICAgICAgICBpZiBpc2luc3RhbmNlKHNlbGYuX3NjbSwg R2l0KSBhbmQgbnVtX2NvbW1pdHM6CiAgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2Nv bW1hbmQoCi0gICAgICAgICAgICAgICAgWydnaXQnLCAnYW0nXSwKKyAgICAgICAgICAgICAgICBb J2dpdCcsICdhbScsICctLWtlZXAnXSwKICAgICAgICAgICAgICAgICBpbnB1dD1zZWxmLmZpbHRl cl9wYXRjaF9jb250ZW50KGVuY29kZWRfcGF0Y2gsIHJldmlld2VyPXBhdGNoLnJldmlld2VyKCku ZnVsbF9uYW1lIGlmIHBhdGNoLnJldmlld2VyKCkgZWxzZSBOb25lKSwKICAgICAgICAgICAgICAg ICBjd2Q9c2VsZi5fc2NtLmNoZWNrb3V0X3Jvb3QsCiAgICAgICAgICAgICApCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCBhNGE4 NzQ5N2EwNjMuLmZkOTU4NWU3ZWE2MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBAIC0zNjEsNyArMzYxLDcgQEAgY2xhc3MgR2l0 KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGlmIG5vdCBjb21taXRfbWVzc2FnZSBvciBt ZXJnZV9iYXNlID09IGhlYWQ6CiAgICAgICAgICAgICBjb21tYW5kID0gW3NlbGYuZXhlY3V0YWJs ZV9uYW1lLCAnZGlmZicsICctLWJpbmFyeScsICctLW5vLWNvbG9yJywgJy0tbm8tZXh0LWRpZmYn LCAnLS1mdWxsLWluZGV4JywgJy0tbm8tcmVuYW1lcyddCiAgICAgICAgIGVsc2U6Ci0gICAgICAg ICAgICBjb21tYW5kID0gW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnZm9ybWF0LXBhdGNoJywgJy0t c3Rkb3V0JywgJy0tYmluYXJ5J10KKyAgICAgICAgICAgIGNvbW1hbmQgPSBbc2VsZi5leGVjdXRh YmxlX25hbWUsICdmb3JtYXQtcGF0Y2gnLCAnLS1zdGRvdXQnLCAnLS1iaW5hcnknLCAnLS1rZWVw LXN1YmplY3QnXQogCiAgICAgICAgICMgUHV0IGNvZGUgY2hhbmdlcyBhdCB0aGUgdG9wIG9mIHRo ZSBwYXRjaCBhbmQgbGF5b3V0IHRlc3RzCiAgICAgICAgICMgYXQgdGhlIGJvdHRvbSwgdGhpcyBt YWtlcyBmb3IgZWFzaWVyIHJldmlld2luZy4KLS0gCjIuMjUuMQoK 459944 2022-06-01 17:03:20 -0700 2022-06-03 13:39:59 -0700 Patch bug-241114-20220602090319.patch text/plain 1469 fujii RnJvbSA0YTM1YWU5NjY0ZjYyZDBiYjQzMjE5NDg1MTA4NThjOTE2OTkxM2EwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBIaXJvbm9yaSA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CkRhdGU6IFRodSwgMiBKdW4gMjAyMiAwODo1Njo0NCArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IHdlYmtpdC1wYXRjaDogYGdpdCBhbWAgc3RyaXBzIFtdLWVuY2xvc2VkIHByZWZpeGVzIChlLmcu CiBbQ01ha2VdW1dQRV0pIGluIGEgc3ViamVjdCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjQxMTE0CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCmdpdC1hbSBy ZW1vdmVzIGFsbCBbXS1lbmNsb3NlZCBwcmVmaXhlcyBmcm9tIGEgc3ViamVjdCBhcyBkZWZhdWx0 LgpnaXQtYW0gaGFzIC0ta2VlcC1ub24tcGF0Y2ggb3B0aW9uIHRoYXQgcmVtb3ZlcyBvbmx5ICJb UEFUQ0hdIiBwcmVmaXguCgoqIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L2NoZWNrb3V0LnB5OgooYXBwbHlfcGF0Y2gpOiBVc2UgYC0ta2VlcC1ub24tcGF0Y2hgIG9wdGlv biBmb3IgYGdpdCBhbWAuCi0tLQogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvY2hlY2tvdXQucHkgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEg ZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9jaGVja291dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L2NoZWNrb3V0LnB5CmluZGV4IGY3MWFhNjhjMTFiMi4uMGRlMDAzYjk3MzExIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5weQpA QCAtMTczLDcgKzE3Myw3IEBAIGZvciBsIGluIGxpbmVzWzE6XToKICAgICAgICAgbnVtX2NvbW1p dHMgPSBsZW4oc2VsZi5DT01NSVRfU1VCSkVDVF9SRS5maW5kYWxsKGVuY29kZWRfcGF0Y2gpKQog ICAgICAgICBpZiBpc2luc3RhbmNlKHNlbGYuX3NjbSwgR2l0KSBhbmQgbnVtX2NvbW1pdHM6CiAg ICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoCi0gICAgICAgICAgICAgICAg WydnaXQnLCAnYW0nXSwKKyAgICAgICAgICAgICAgICBbJ2dpdCcsICdhbScsICctLWtlZXAtbm9u LXBhdGNoJ10sCiAgICAgICAgICAgICAgICAgaW5wdXQ9c2VsZi5maWx0ZXJfcGF0Y2hfY29udGVu dChlbmNvZGVkX3BhdGNoLCByZXZpZXdlcj1wYXRjaC5yZXZpZXdlcigpLmZ1bGxfbmFtZSBpZiBw YXRjaC5yZXZpZXdlcigpIGVsc2UgTm9uZSksCiAgICAgICAgICAgICAgICAgY3dkPXNlbGYuX3Nj bS5jaGVja291dF9yb290LAogICAgICAgICAgICAgKQotLSAKMi4yNS4xCgo= 460020 2022-06-03 13:40:02 -0700 2022-06-03 15:21:33 -0700 Patch for landing bug-241114-20220604054001.patch text/plain 2314 fujii RnJvbSA2NmQ5YTVmYjVjYjg2YzE5MzU0YmE2NWE2NjE4ZGEwMTg0ZWVmYzM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBIaXJvbm9yaSA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CkRhdGU6IFNhdCwgNCBKdW4gMjAyMiAwNTozODoxMyArMDkwMApTdWJqZWN0OiBbUEFUQ0hd IHdlYmtpdC1wYXRjaDogYGdpdCBhbWAgc3RyaXBzIFtdLWVuY2xvc2VkIHByZWZpeGVzIChlLmcu CiBbQ01ha2VdW1dQRV0pIGluIGEgc3ViamVjdCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjQxMTE0CgpSZXZpZXdlZCBieSBKb25hdGhhbiBCZWRhcmQuCgpnaXQtYW0g cmVtb3ZlcyBhbGwgW10tZW5jbG9zZWQgcHJlZml4ZXMgZnJvbSBhIHN1YmplY3QgYnkgZGVmYXVs dC4KZ2l0LWFtIGhhcyAtLWtlZXAtbm9uLXBhdGNoIG9wdGlvbiB0aGF0IHJlbW92ZXMgb25seSAi W1BBVENIXSIgcHJlZml4LgoKKiBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogoo cnVuKToKKiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9jaGVja291dC5w eToKKGFwcGx5X3BhdGNoKToKVXNlIGAtLWtlZXAtbm9uLXBhdGNoYCBvcHRpb24gZm9yIGBnaXQg YW1gLgotLS0KIFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgICAgICAgICAgICAg ICAgIHwgMiArLQogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tv dXQucHkgfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5IGIv VG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQppbmRleCBmYzI1N2Y2MjliM2QuLjVj ZTcwYWNkOWFhNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC04ODcsNyArODg3 LDcgQEAgZm9yIGwgaW4gbGluZXNbMTpdOgogICAgICAgICBpZiBub3QgcGF0Y2g6CiAgICAgICAg ICAgICBjb21tYW5kcyArPSBbWydjdXJsJywgJy1MJywgJ2h0dHBzOi8vYnVncy53ZWJraXQub3Jn L2F0dGFjaG1lbnQuY2dpP2lkPXt9Jy5mb3JtYXQoc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hfaWQn LCAnJykpLCAnLW8nLCAnLmJ1aWxkYm90LWRpZmYnXV0KICAgICAgICAgY29tbWFuZHMgKz0gWwot ICAgICAgICAgICAgWydnaXQnLCAnYW0nLCAnLmJ1aWxkYm90LWRpZmYnXSwKKyAgICAgICAgICAg IFsnZ2l0JywgJ2FtJywgJy0ta2VlcC1ub24tcGF0Y2gnLCAnLmJ1aWxkYm90LWRpZmYnXSwKICAg ICAgICAgICAgIFsnZ2l0JywgJ2ZpbHRlci1icmFuY2gnLCAnLWYnLCAnLS1tc2ctZmlsdGVyJywg J3B5dGhvbjMgLWMgInt9IicuZm9ybWF0KHNlbGYuRklMVEVSX0JSQU5DSF9QUk9HUkFNKSwgJ0hF QUQuLi5IRUFEfjEnXSwKICAgICAgICAgXQogICAgICAgICBmb3IgY29tbWFuZCBpbiBjb21tYW5k czoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2No ZWNrb3V0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tv dXQucHkKaW5kZXggZjcxYWE2OGMxMWIyLi4wZGUwMDNiOTczMTEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CkBAIC0xNzMsNyAr MTczLDcgQEAgZm9yIGwgaW4gbGluZXNbMTpdOgogICAgICAgICBudW1fY29tbWl0cyA9IGxlbihz ZWxmLkNPTU1JVF9TVUJKRUNUX1JFLmZpbmRhbGwoZW5jb2RlZF9wYXRjaCkpCiAgICAgICAgIGlm IGlzaW5zdGFuY2Uoc2VsZi5fc2NtLCBHaXQpIGFuZCBudW1fY29tbWl0czoKICAgICAgICAgICAg IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZCgKLSAgICAgICAgICAgICAgICBbJ2dpdCcsICdh bSddLAorICAgICAgICAgICAgICAgIFsnZ2l0JywgJ2FtJywgJy0ta2VlcC1ub24tcGF0Y2gnXSwK ICAgICAgICAgICAgICAgICBpbnB1dD1zZWxmLmZpbHRlcl9wYXRjaF9jb250ZW50KGVuY29kZWRf cGF0Y2gsIHJldmlld2VyPXBhdGNoLnJldmlld2VyKCkuZnVsbF9uYW1lIGlmIHBhdGNoLnJldmll d2VyKCkgZWxzZSBOb25lKSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5fc2NtLmNoZWNrb3V0 X3Jvb3QsCiAgICAgICAgICAgICApCi0tIAoyLjI1LjEKCg==