223579 2021-03-22 09:03:07 -0700 [webkitscmpy] Allow user to force canonicalization for a specific set of commits 2021-03-22 16:18:23 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu webkit-bug-importer oldest_to_newest 1742252 0 jbedard 2021-03-22 09:03:07 -0700 Allow a user to set the number of commits to be canonicalized regardless of the state of the remote. 1742253 1 webkit-bug-importer 2021-03-22 09:03:20 -0700 <rdar://problem/75693154> 1742257 2 423894 jbedard 2021-03-22 09:07:19 -0700 Created attachment 423894 Patch 1742325 3 423894 aakash_jain 2021-03-22 11:45:00 -0700 Comment on attachment 423894 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423894&action=review > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/__init__.py:80 > + difference = args.number difference should be replaced by something which indicate the purpose, e.g.: num_commits_to_canonicalize > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/canonicalize/__init__.py:81 > + if not args.number: better to use the above variable here in in condition, e.g.: 'if difference'/'if num_commits_to_canonicalize' > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/canonicalize_unittest.py:213 > + self.assertEqual( can consider formatting it in one line. 1742352 4 jbedard 2021-03-22 12:05:04 -0700 Committed r274771 (235580@main): <https://commits.webkit.org/235580@main> 423894 2021-03-22 09:07:19 -0700 2021-03-22 16:18:23 -0700 Patch bug-223579-20210322090718.patch text/plain 6264 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NDc1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIxLTAzLTIyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFsbG93IHVzZXIgdG8gZm9yY2UgY2Fub25pY2Fs aXphdGlvbiBmb3IgYSBzcGVjaWZpYyBzZXQgb2YgY29tbWl0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNTc5CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS83NTY5MzE1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZl cnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vY2Fub25pY2FsaXplL19faW5pdF9fLnB5OgorICAg ICAgICAoQ2Fub25pY2FsaXplLnBhcnNlcik6IEFkZCAtLW51bWJlciBhcmd1bWVudC4KKyAgICAg ICAgKENhbm9uaWNhbGl6ZS5tYWluKTogVXNlIC0tbnVtYmVyIHRvIHNldCB0aGUgbnVtYmVyIG9m IGNvbW1pdHMgdG8gYmUgY2Fub25pY2FsaXplZC4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2Nhbm9uaWNhbGl6ZV91bml0dGVzdC5weToK KyAgICAgICAgKFRlc3RDYW5vbmljYWxpemUudGVzdF9udW1iZXIpOgorCiAyMDIxLTAzLTE5ICBC SiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBmaWx0ZXItYnVpbGQt d2Via2l0CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1 cC5weQkocmV2aXNpb24gMjc0NzUwKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvc2V0dXAucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRt ZSgpOgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMC4x My40JywKKyAgICB2ZXJzaW9uPScwLjEzLjUnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRl c2lnbmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAg bG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9fX2luaXRfXy5weQkocmV2aXNpb24gMjc0NzUwKQorKysgVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkK QEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGlu c3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJh LWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJz aW9uKDAsIDEzLCA0KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMTMsIDUpCiAKIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9J bnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpJbmRl eDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3Jh bS9jYW5vbmljYWxpemUvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS9jYW5vbmljYWxpemUvX19p bml0X18ucHkJKHJldmlzaW9uIDI3NDc1MCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0vY2Fub25pY2FsaXplL19faW5pdF9fLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC01Niw2ICs1NiwxMiBAQCBjbGFzcyBDYW5vbmljYWxpemUoQ29tbWFu ZCk6CiAgICAgICAgICAgICBkZXN0PSdyZW1vdGUnLAogICAgICAgICAgICAgZGVmYXVsdD0nb3Jp Z2luJywKICAgICAgICAgKQorICAgICAgICBvdXRwdXRfYXJncy5hZGRfYXJndW1lbnQoCisgICAg ICAgICAgICAnLS1udW1iZXInLCAnLW4nLCAgdHlwZT1pbnQsCisgICAgICAgICAgICBoZWxwPSdO dW1iZXIgb2YgY29tbWl0cyB0byBiZSBjYW5vbmljYWxpemVkLCByZWdhcmRsZXNzIG9mIHRoZSBz dGF0ZSBvZiB0aGUgcmVtb3RlJywKKyAgICAgICAgICAgIGRlc3Q9J251bWJlcicsCisgICAgICAg ICAgICBkZWZhdWx0PU5vbmUsCisgICAgICAgICkKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRl ZiBtYWluKGNscywgYXJncywgcmVwb3NpdG9yeSwgaWRlbnRpZmllcl90ZW1wbGF0ZT1Ob25lLCAq Kmt3YXJncyk6CkBAIC03MCwxNSArNzYsMTggQEAgY2xhc3MgQ2Fub25pY2FsaXplKENvbW1hbmQp OgogICAgICAgICBpZiBub3QgYnJhbmNoOgogICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgn RmFpbGVkIHRvIGRldGVybWluZSBjdXJyZW50IGJyYW5jaFxuJykKICAgICAgICAgICAgIHJldHVy biAtMQotICAgICAgICByZXN1bHQgPSBydW4oWwotICAgICAgICAgICAgcmVwb3NpdG9yeS5leGVj dXRhYmxlKCksICdyZXYtbGlzdCcsCi0gICAgICAgICAgICAnLS1jb3VudCcsICctLW5vLW1lcmdl cycsCi0gICAgICAgICAgICAne3JlbW90ZX0ve2JyYW5jaH0uLnticmFuY2h9Jy5mb3JtYXQocmVt b3RlPWFyZ3MucmVtb3RlLCBicmFuY2g9YnJhbmNoKSwKLSAgICAgICAgXSwgY2FwdHVyZV9vdXRw dXQ9VHJ1ZSwgY3dkPXJlcG9zaXRvcnkucm9vdF9wYXRoKQotICAgICAgICBpZiByZXN1bHQucmV0 dXJuY29kZToKLSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0ZhaWxlZCB0byBmaW5kIGxv Y2FsIGNvbW1pdHNcbicpCi0gICAgICAgICAgICByZXR1cm4gLTEKLSAgICAgICAgZGlmZmVyZW5j ZSA9IGludChyZXN1bHQuc3Rkb3V0LnJzdHJpcCgpKQorCisgICAgICAgIGRpZmZlcmVuY2UgPSBh cmdzLm51bWJlcgorICAgICAgICBpZiBub3QgYXJncy5udW1iZXI6CisgICAgICAgICAgICByZXN1 bHQgPSBydW4oWworICAgICAgICAgICAgICAgIHJlcG9zaXRvcnkuZXhlY3V0YWJsZSgpLCAncmV2 LWxpc3QnLAorICAgICAgICAgICAgICAgICctLWNvdW50JywgJy0tbm8tbWVyZ2VzJywKKyAgICAg ICAgICAgICAgICAne3JlbW90ZX0ve2JyYW5jaH0uLnticmFuY2h9Jy5mb3JtYXQocmVtb3RlPWFy Z3MucmVtb3RlLCBicmFuY2g9YnJhbmNoKSwKKyAgICAgICAgICAgIF0sIGNhcHR1cmVfb3V0cHV0 PVRydWUsIGN3ZD1yZXBvc2l0b3J5LnJvb3RfcGF0aCkKKyAgICAgICAgICAgIGlmIHJlc3VsdC5y ZXR1cm5jb2RlOgorICAgICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoJ0ZhaWxlZCB0byBm aW5kIGxvY2FsIGNvbW1pdHNcbicpCisgICAgICAgICAgICAgICAgcmV0dXJuIC0xCisgICAgICAg ICAgICBkaWZmZXJlbmNlID0gaW50KHJlc3VsdC5zdGRvdXQucnN0cmlwKCkpCiAgICAgICAgIGlm IGRpZmZlcmVuY2UgPD0gMDoKICAgICAgICAgICAgIHByaW50KCdObyBsb2NhbCBjb21taXRzIHRv IGJlIGVkaXRlZCcpCiAgICAgICAgICAgICByZXR1cm4gMApJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jYW5vbmljYWxpemVfdW5pdHRl c3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvdGVzdC9jYW5vbmljYWxpemVfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3NDc1 MCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvY2Fub25pY2FsaXplX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xOTgsMyArMTk4 LDM1IEBAIGNsYXNzIFRlc3RDYW5vbmljYWxpemUodW5pdHRlc3QuVGVzdENhc2UKICAgICAgICAg ICAgICdSZXdyaXRlIDAxNDhjMGRmMGZhZjI0OGFhMTMzZDZkNWFkOTExZDdjYjFiNTZhNWIgKDIv MikgKC0tLSBzZWNvbmRzIHBhc3NlZCwgcmVtYWluaW5nIC0tLSBwcmVkaWN0ZWQpXG4nCiAgICAg ICAgICAgICAnMiBjb21taXRzIHN1Y2Nlc3NmdWxseSBjYW5vbmljYWxpemVkIVxuJywKICAgICAg ICAgKQorCisgICAgZGVmIHRlc3RfbnVtYmVyKHNlbGYpOgorICAgICAgICB3aXRoIE91dHB1dENh cHR1cmUoKSBhcyBjYXB0dXJlZCwgbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCkgYXMgbW9jaywg bW9ja3MubG9jYWwuU3ZuKCksIE1vY2tUaW1lOgorICAgICAgICAgICAgY29udGlyYnV0b3JzID0g Q29udHJpYnV0b3IuTWFwcGluZygpCisgICAgICAgICAgICBjb250aXJidXRvcnMuY3JlYXRlKCdK b25hdGhhbiBCZWRhcmQnLCAnamJlZGFyZEBhcHBsZS5jb20nKQorCisgICAgICAgICAgICBzZWxm LmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFpbigKKyAgICAgICAgICAgICAgICBhcmdzPSgnY2Fu b25pY2FsaXplJywgJy0tbnVtYmVyJywgJzMnKSwKKyAgICAgICAgICAgICAgICBwYXRoPXNlbGYu cGF0aCwKKyAgICAgICAgICAgICAgICBjb250cmlidXRvcnM9Y29udGlyYnV0b3JzLAorICAgICAg ICAgICAgKSkKKworICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAg ICBsb2NhbC5HaXQoc2VsZi5wYXRoKS5jb21taXQoaWRlbnRpZmllcj0nNUBtYWluJykubWVzc2Fn ZSwKKyAgICAgICAgICAgICAgICAnUGF0Y2ggU2VyaWVzXG5JZGVudGlmaWVyOiA1QG1haW4nLAor ICAgICAgICAgICAgKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAg ICAgICBsb2NhbC5HaXQoc2VsZi5wYXRoKS5jb21taXQoaWRlbnRpZmllcj0nNEBtYWluJykubWVz c2FnZSwKKyAgICAgICAgICAgICAgICAnOHRoIGNvbW1pdFxuSWRlbnRpZmllcjogNEBtYWluJywK KyAgICAgICAgICAgICkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAg ICAgICAgbG9jYWwuR2l0KHNlbGYucGF0aCkuY29tbWl0KGlkZW50aWZpZXI9JzNAbWFpbicpLm1l c3NhZ2UsCisgICAgICAgICAgICAgICAgJzR0aCBjb21taXRcbklkZW50aWZpZXI6IDNAbWFpbics CisgICAgICAgICAgICApCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAg IGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLAorICAgICAgICAgICAgJ1Jld3JpdGUgMWFiZTI1 YjQ0M2U5ODVmOTNiOTBkODMwZTRhN2UzNzMxMzM2YWY0ZCAoMS8zKSAoLS0tIHNlY29uZHMgcGFz c2VkLCByZW1haW5pbmcgLS0tIHByZWRpY3RlZClcbicKKyAgICAgICAgICAgICdSZXdyaXRlIGJh ZTVkMWU5MDk5OWQ0ZjkxNmE4YTE1ODEwY2NmYTQzZjM3YTJmZDYgKDIvMykgKC0tLSBzZWNvbmRz IHBhc3NlZCwgcmVtYWluaW5nIC0tLSBwcmVkaWN0ZWQpXG4nCisgICAgICAgICAgICAnUmV3cml0 ZSBkOGJjZTI2ZmE2NWM2ZmM4ZjM5YzE3OTI3YWJiNzdmNjlmYWI4MmZjICgzLzMpICgtLS0gc2Vj b25kcyBwYXNzZWQsIHJlbWFpbmluZyAtLS0gcHJlZGljdGVkKVxuJworICAgICAgICAgICAgJzMg Y29tbWl0cyBzdWNjZXNzZnVsbHkgY2Fub25pY2FsaXplZCFcbicsCisgICAgICAgICkK