212717 2020-06-03 15:13:37 -0700 Pause during ANGLE roll script after rebasing and before deleting temporary Git repo 2020-07-28 16:57:17 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 214897 1 kbr kbr dino ews-watchlist graouts jdarpinian justin_fan kondapallykalyan webkit-bug-importer oldest_to_newest 1658884 0 kbr 2020-06-03 15:13:37 -0700 jdarpinian@'s Source/ThirdParty/ANGLE/update-angle.sh script is extremely helpful - it automates nearly all of the steps of updating ANGLE in WebKit. It would be useful if the script paused after the rebase phase, and after generating changes.diff, but before deleting the temporary git repository it creates in Source/ThirdParty/ANGLE. That way, any undesired changes compared to upstream ANGLE could be more easily removed. Currently there are a large number of apparently unnecessary changes which make it difficult to identify the salient diffs. Would it be possible to add this feature to the roll script? 1675733 1 kbr 2020-07-28 12:27:59 -0700 Taking this. 1675813 2 405418 kbr 2020-07-28 14:47:06 -0700 Created attachment 405418 Patch 1675814 3 ews-watchlist 2020-07-28 14:47:57 -0700 Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE 1675815 4 kbr 2020-07-28 14:49:21 -0700 This patch also slightly changes the user interface of the roll script to expect the user to press enter after confirming (y/n) whether to continue. I found it surprising on multiple occasions that the script went ahead immediately upon pressing the "y" key. 1675818 5 jdarpinian 2020-07-28 14:51:07 -0700 Looks good to me! I was thinking that the script would exit to let you poke around but this is much easier to implement and I think just as useful. 1675835 6 kbr 2020-07-28 15:35:49 -0700 Thanks for your review James. I also thought of exiting the script but this was a lot easier to implement since it doesn't need any state management. It turned out to be useful during the ANGLE roll I'm currently doing in Bug 214897 - it caught one bad merge during rebase, and another important fix to upstream to ANGLE (Bug 213479, http://crbug.com/angleproject/4902 ). 1675856 7 ews-feeder 2020-07-28 16:56:17 -0700 Committed r265023: <https://trac.webkit.org/changeset/265023> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405418. 1675857 8 webkit-bug-importer 2020-07-28 16:57:17 -0700 <rdar://problem/66245284> 405418 2020-07-28 14:47:06 -0700 2020-07-28 16:56:17 -0700 Patch bug-212717-20200728144705.patch text/plain 2417 kbr U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0OTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNzg3NDUwNjllMjIzZTMyN2Q5NGNjNDFiZTA0YzEyZTkxYzc0N2RjMy4uMGNmNDUxMzFiZjMx Nzg3MDdmYjkzZjEzMzk1MGI1ZjAxMDZmMjMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA3LTI4ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFBhdXNlIGR1cmluZyBBTkdMRSByb2xsIHNjcmlwdCBhZnRl ciByZWJhc2luZyBhbmQgYmVmb3JlIGRlbGV0aW5nIHRlbXBvcmFyeSBHaXQgcmVwbworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyNzE3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2l2ZSB0aGUgdXNlciB0 aGUgb3Bwb3J0dW5pdHkgdG8gbWFudWFsbHkgZXhhbWluZSB0aGUgY2hhbmdlcworICAgICAgICBy ZWxhdGl2ZSB0byB1cHN0cmVhbSBBTkdMRSwgYW5kIHRvIHVuZG8gYW55IGFjY2lkZW50YWwgb3IK KyAgICAgICAgdW5kZXNpcmVkIG9uZXMsIGJlZm9yZSBmaW5pc2hpbmcgdGhlIHJvbGwuCisKKyAg ICAgICAgKiB1cGRhdGUtYW5nbGUuc2g6CisKIDIwMjAtMDctMjIgIENvbnJhZCBTaHVsdHogIDxj b25yYWRfc2h1bHR6QGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgbWFjT1MgVmVyc2lvbiBt YWNyb3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3VwZGF0ZS1hbmdsZS5z aCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3VwZGF0ZS1hbmdsZS5zaAppbmRleCA5MjRiOGIy ZDI0MDVmMmJlNThkNWMxOGEwMjg5MmVjY2YxY2VjMmZmLi45MzVhY2RkOTJmNmFhMzg4YjAzYmFj MGQ0ZjcxNzRjZmFlMDhlZWMzIDEwMDc1NQotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91 cGRhdGUtYW5nbGUuc2gKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXBkYXRlLWFuZ2xl LnNoCkBAIC0xNSw3ICsxNSwxOSBAQCBmdW5jdGlvbiBwcmludF9yZWJhc2VfbWVzc2FnZV9hbmRf ZXhpdCB7CiBmdW5jdGlvbiBjbGVhbnVwX2FmdGVyX3N1Y2Nlc3NmdWxfcmViYXNlX2FuZF9leGl0 IHsKICAgICBjZCAiJEFOR0xFX0RJUiIKICAgICBlY2hvCi0gICAgZWNobyAiUmVnZW5lcmF0aW5n IGNoYW5nZXMuZGlmZiIKKyAgICBlY2hvICJSZWdlbmVyYXRpbmcgY2hhbmdlcy5kaWZmLiIKKyAg ICBnaXQgZGlmZiBvcmlnaW4vbWFzdGVyIC0tZGlmZi1maWx0ZXI9YSA+IGNoYW5nZXMuZGlmZgor ICAgIGVjaG8gIlBhdXNpbmcgdG8gbGV0IHlvdSBleGFtaW5lIGNoYW5nZXMuZGlmZiwgYW5kIHRo ZSBmaWxlcyBpbiIKKyAgICBlY2hvICJTb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRSByZWxhdGl2ZSB0 byB1cHN0cmVhbSwgdXNpbmcgZ2l0IHRvb2xzLiIKKyAgICBlY2hvICJBdCB0aGlzIHBvaW50IHlv dSBtYXkgdW5kbyBhbnkgdW5kZXNpcmVkIGNoYW5nZXMgdGhhdCB5b3Ugc2VlIGluIgorICAgIGVj aG8gImNoYW5nZXMuZGlmZi4iCisgICAgZWNobyAiVG8gc2VlIHRoZSBjdXJyZW50IGNoYW5nZXMg cmVsYXRpdmUgdG8gdXBzdHJlYW0gQU5HTEUsIHJ1biB0aGUiCisgICAgZWNobyAiZm9sbG93aW5n IGNvbW1hbmQgaW4gU291cmNlL1RoaXJkUGFydHkvQU5HTEU6IgorICAgIGVjaG8gIiAgICBnaXQg ZGlmZiBvcmlnaW4vbWFzdGVyIC0tZGlmZi1maWx0ZXI9YSIKKyAgICBlY2hvICJjaGFuZ2VzLmRp ZmYgd2lsbCBiZSByZWdlbmVyYXRlZCBhZ2FpbiB3aGVuIHRoaXMgc2NyaXB0IHByb2NlZWRzOyIK KyAgICBlY2hvICJpdCBpc24ndCBuZWNlc3NhcnkgdG8gZG8gaXQgbWFudWFsbHkuIgorICAgIHJl YWQgLXAgIlByZXNzIEVOVEVSIHRvIGNvbnRpbnVlOiAiCisgICAgZWNobyAiUmVnZW5lcmF0aW5n IGNoYW5nZXMuZGlmZiBhZ2Fpbi4iCiAgICAgZ2l0IGRpZmYgb3JpZ2luL21hc3RlciAtLWRpZmYt ZmlsdGVyPWEgPiBjaGFuZ2VzLmRpZmYKICAgICBybSAtcmYgLmdpdAogICAgIGdpdCBhZGQgLUEg LgpAQCAtNDMsNyArNTUsNyBAQCBlY2hvICJicmFuY2guIgogZWNobwogZWNobyAiVGhpcyB3aWxs IGNsb2JiZXIgYW55IGNoYW5nZXMgeW91IGhhdmUgbWFkZSBpbjoiCiBlY2hvICIkQU5HTEVfRElS IgotcmVhZCAtcCAiQXJlIHlvdSBzdXJlPyBbeS9OXSAiIC1uIDEgLXIKK3JlYWQgLXAgIkFyZSB5 b3Ugc3VyZT8gW3kvTl0gIgogZWNobwogaWYgW1sgISAkUkVQTFkgPX4gXltZeV0kIF1dOyB0aGVu CiAgICAgZWNobyAiQ2FuY2VsZWQuIgo=