222329 2021-02-23 12:52:24 -0800 [check-webkit-style] Fix Contributor sorting in Python 3 2021-02-24 10:36:32 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain cgambrell darin dewei_zhu ews-watchlist glenn gsnedders webkit-bug-importer oldest_to_newest 1732658 0 jbedard 2021-02-23 12:52:24 -0800 Sorting of contributors is broken in Python 3, making it difficult for new contributors to add themselves to contributors.json. 1732660 1 webkit-bug-importer 2021-02-23 12:52:38 -0800 <rdar://problem/74656667> 1732661 2 421344 jbedard 2021-02-23 12:56:17 -0800 Created attachment 421344 Patch 1732662 3 421345 jbedard 2021-02-23 12:58:15 -0800 Created attachment 421345 Patch 1732665 4 421345 darin 2021-02-23 13:04:29 -0800 Comment on attachment 421345 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421345&action=review > Tools/Scripts/webkitpy/common/config/committers.py:99 > + cmp = hash(getattr(self, member)) - hash(getattr(other, member)) Sorting by hashes doesn’t seem like a good idea if we want the sorting to stay stable in the future. 1732667 5 jbedard 2021-02-23 13:11:05 -0800 (In reply to Darin Adler from comment #4) > Comment on attachment 421345 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=421345&action=review > > > Tools/Scripts/webkitpy/common/config/committers.py:99 > > + cmp = hash(getattr(self, member)) - hash(getattr(other, member)) > > Sorting by hashes doesn’t seem like a good idea if we want the sorting to > stay stable in the future. Was trying to avoid iterating through the lists, but I guess we probably should. 1732671 6 421346 jbedard 2021-02-23 13:25:11 -0800 Created attachment 421346 Patch 1732677 7 jbedard 2021-02-23 13:41:08 -0800 This is the stack trace we get if you modify contributors.json then call check-webkit-style: File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/check-webkit-style", line 46, in <module> sys.exit(CheckWebKitStyle().main()) File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/style/main.py", line 159, in main patch_checker.check(patch) File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/style/patchreader.py", line 86, in check self._text_file_reader.process_file(file_path=path, line_numbers=line_numbers) File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/style/filereader.py", line 137, in process_file self._processor.process(lines, file_path, **kwargs) File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/style/checker.py", line 1027, in process checker.check(lines) File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/style/checkers/contributors.py", line 42, in check canonicalized = CommitterList().as_json() File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/common/config/committers.py", line 244, in as_json result = CommitterList._contributor_list_to_dict(self._contributors) File "/Volumes/Shared/CheckoutBeta/OpenSource/Tools/Scripts/webkitpy/common/config/committers.py", line 239, in _contributor_list_to_dict for contributor in sorted(list): TypeError: '<' not supported between instances of 'Contributor' and 'Reviewer' 1732725 8 jbedard 2021-02-23 16:26:42 -0800 Committed r273358 (234491@main): <https://commits.webkit.org/234491@main> 1732954 9 gsnedders 2021-02-24 10:36:32 -0800 FWIW, in general I'd suggest using functools.total_ordering() rather than manually defining all the comparison operations. 421344 2021-02-23 12:56:17 -0800 2021-02-23 12:58:13 -0800 Patch bug-222329-20210223125616.patch text/plain 4460 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTAyLTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbY2hlY2std2Via2l0LXN0eWxlXSBGaXggQ29udHJpYnV0b3Igc29ydGlu ZyBpbiBQeXRob24gMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIyMzI5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDY1NjY2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OgorICAgICAgICAoQ29udHJpYnV0b3IuX19j bXBfXyk6IFJldHVybiBhbiBpbnRlZ2VyIHRvIGluZGljYXRlIG9yZGVyaW5nLgorICAgICAgICAo Q29udHJpYnV0b3IuX19lcV9fKTogQWRkIHJpY2ggY29tcGFyaXNvbiBvcGVyYXRvcnMgZm9yIHNv cnRpbmcuCisgICAgICAgIChDb250cmlidXRvci5fX25lX18pOiBEaXR0by4KKyAgICAgICAgKENv bnRyaWJ1dG9yLl9fbHRfXyk6IERpdHRvLgorICAgICAgICAoQ29udHJpYnV0b3IuX19sZV9fKTog RGl0dG8uCisgICAgICAgIChDb250cmlidXRvci5fX2d0X18pOiBEaXR0by4KKyAgICAgICAgKENv bnRyaWJ1dG9yLl9fZ2VfXyk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbjoKKwogMjAyMS0wMi0yMyAgQ29tbWl0IFF1ZXVl ICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0 aW5nIHIyNzMzMDcuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv Y29tbWl0dGVycy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvY29tbWl0dGVycy5weQkocmV2aXNpb24gMjczMzIyKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkJKHdvcmtpbmcgY29weSkKQEAg LTE3LDcgKzE3LDcgQEAKICMKICMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09Q WVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwogIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVT UyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAotIyBMSU1JVEVEIFRP LCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBG T1IKKyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SX2NvbnRyaWJ1dG9yX2xpc3RfdG9fZGljdAogIyBBIFBBUlRJQ1VM QVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdI VAogIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwKICMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVApAQCAtODcsMTUgKzg3LDM4IEBAIGNsYXNzIENv bnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAgICAgICBeIGhhc2goc2VsZi5jYW5fY29tbWl0KSBc CiAgICAgICAgICAgICBeIGhhc2goc2VsZi5jYW5fcmV2aWV3KQogCisgICAgZGVmIF9fY21wX18o c2VsZiwgb3RoZXIpOgorICAgICAgICBpZiBvdGhlciBpcyBOb25lOgorICAgICAgICAgICAgcmV0 dXJuIDEKKworICAgICAgICBmb3IgbWVtYmVyIGluICgnZnVsbF9uYW1lJywgJ2Nhbl9jb21taXQn LCAnY2FuX3JldmlldycpOgorICAgICAgICAgICAgaWYgZ2V0YXR0cihzZWxmLCBtZW1iZXIpICE9 IGdldGF0dHIob3RoZXIsIG1lbWJlcik6CisgICAgICAgICAgICAgICAgcmV0dXJuIDEgaWYgZ2V0 YXR0cihzZWxmLCBtZW1iZXIpID4gZ2V0YXR0cihvdGhlciwgbWVtYmVyKSBlbHNlIC0xCisKKyAg ICAgICAgZm9yIG1lbWJlciBpbiAoJ2VtYWlscycsICdfY2FzZV9wcmVzZXJ2ZWRfZW1haWxzJywg J2lyY19uaWNrbmFtZXMnLCAnZXhwZXJ0aXNlJywgJ2lyY19uaWNrbmFtZXMnLCAnZXhwZXJ0aXNl Jyk6CisgICAgICAgICAgICBjbXAgPSBoYXNoKGdldGF0dHIoc2VsZiwgbWVtYmVyKSkgLSBoYXNo KGdldGF0dHIob3RoZXIsIG1lbWJlcikpCisgICAgICAgICAgICBpZiBjbXA6CisgICAgICAgICAg ICAgICAgcmV0dXJuIGNtcAorCisgICAgICAgIHJldHVybiAwCisKICAgICBkZWYgX19lcV9fKHNl bGYsIG90aGVyKToKLSAgICAgICAgcmV0dXJuIChvdGhlciBpcyBub3QgTm9uZQotICAgICAgICAg ICAgYW5kIHNlbGYuZnVsbF9uYW1lID09IG90aGVyLmZ1bGxfbmFtZQotICAgICAgICAgICAgYW5k IHNlbGYuZW1haWxzID09IG90aGVyLmVtYWlscwotICAgICAgICAgICAgYW5kIHNlbGYuX2Nhc2Vf cHJlc2VydmVkX2VtYWlscyA9PSBvdGhlci5fY2FzZV9wcmVzZXJ2ZWRfZW1haWxzCi0gICAgICAg ICAgICBhbmQgc2VsZi5pcmNfbmlja25hbWVzID09IG90aGVyLmlyY19uaWNrbmFtZXMKLSAgICAg ICAgICAgIGFuZCBzZWxmLmV4cGVydGlzZSA9PSBvdGhlci5leHBlcnRpc2UKLSAgICAgICAgICAg IGFuZCBzZWxmLmNhbl9jb21taXQgPT0gb3RoZXIuY2FuX2NvbW1pdAotICAgICAgICAgICAgYW5k IHNlbGYuY2FuX3JldmlldyA9PSBvdGhlci5jYW5fcmV2aWV3KQorICAgICAgICByZXR1cm4gc2Vs Zi5fX2NtcF9fKG90aGVyKSA9PSAwCisKKyAgICBkZWYgX19uZV9fKHNlbGYsIG90aGVyKToKKyAg ICAgICAgcmV0dXJuIHNlbGYuX19jbXBfXyhvdGhlcikgIT0gMAorCisgICAgZGVmIF9fbHRfXyhz ZWxmLCBvdGhlcik6CisgICAgICAgIHJldHVybiBzZWxmLl9fY21wX18ob3RoZXIpIDwgMAorCisg ICAgZGVmIF9fbGVfXyhzZWxmLCBvdGhlcik6CisgICAgICAgIHJldHVybiBzZWxmLl9fY21wX18o b3RoZXIpIDw9IDAKKworICAgIGRlZiBfX2d0X18oc2VsZiwgb3RoZXIpOgorICAgICAgICByZXR1 cm4gc2VsZi5fX2NtcF9fKG90aGVyKSA+IDAKKworICAgIGRlZiBfX2dlX18oc2VsZiwgb3RoZXIp OgorICAgICAgICByZXR1cm4gc2VsZi5fX2NtcF9fKG90aGVyKSA+PSAwCiAKICAgICBkZWYgY29u dGFpbnNfc3RyaW5nKHNlbGYsIHNlYXJjaF9zdHJpbmcpOgogICAgICAgICBzdHJpbmcgPSBzZWFy Y2hfc3RyaW5nLmxvd2VyKCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb250cmlidXRvcnMuanNvbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jb25maWcvY29udHJpYnV0b3JzLmpzb24JKHJldmlzaW9uIDI3MzMyMikKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbgko d29ya2luZyBjb3B5KQpAQCAtNDQ4MSw3ICs0NDgxLDcgQEAKICAgICAgICAgICJwZ3JpZmZpcyIs CiAgICAgICAgICAiVGluZ1BpbmciCiAgICAgICBdLAotICAgICAgInN0YXR1cyI6ICJjb21taXR0 ZXIiCisgICAgICAic3RhdHVzIiA6ICJjb21taXR0ZXIiCiAgICB9LAogICAgIlBhdWxvIE1hdG9z IiA6IHsKICAgICAgICJlbWFpbHMiIDogWwpAQCAtNDg4NSw2ICs0ODg1LDExIEBACiAgICAgICBd LAogICAgICAgInN0YXR1cyIgOiAicmV2aWV3ZXIiCiAgICB9LAorICAgIlJ1YmVuIFR1cmNpb3Mi IDogeworICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAicnViZW50XzIyQGFwcGxlLmNvbSIK KyAgICAgIF0KKyAgIH0sCiAgICAiUnVzc2VsbCBFcHN0ZWluIiA6IHsKICAgICAgICJlbWFpbHMi IDogWwogICAgICAgICAgInJlcHN0ZWluQGFwcGxlLmNvbSIKQEAgLTUyNzQsMTEgKzUyNzksNiBA QAogICAgICAgICAgInN6bGVkYW4iCiAgICAgICBdCiAgICB9LAotICAgIlJ1YmVuIFR1cmNpb3Mi IDogewotICAgICAgImVtYWlscyIgOiBbCi0JICJydWJlbnRfMjJAYXBwbGUuY29tIgotICAgICAg XQotICAgfSwKICAgICJUYWIgQXRraW5zIiA6IHsKICAgICAgICJlbWFpbHMiIDogWwogICAgICAg ICAgInRhYmF0a2luc0Bnb29nbGUuY29tIiwKQEAgLTYwNTQsNCArNjA1NCw0IEBACiAgICAgICBd LAogICAgICAgInN0YXR1cyIgOiAicmV2aWV3ZXIiCiAgICB9Ci19Cit9ClwgTm8gbmV3bGluZSBh dCBlbmQgb2YgZmlsZQo= 421345 2021-02-23 12:58:15 -0800 2021-02-23 13:25:08 -0800 Patch bug-222329-20210223125814.patch text/plain 3915 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTAyLTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbY2hlY2std2Via2l0LXN0eWxlXSBGaXggQ29udHJpYnV0b3Igc29ydGlu ZyBpbiBQeXRob24gMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIyMzI5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDY1NjY2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OgorICAgICAgICAoQ29udHJpYnV0b3IuX19j bXBfXyk6IFJldHVybiBhbiBpbnRlZ2VyIHRvIGluZGljYXRlIG9yZGVyaW5nLgorICAgICAgICAo Q29udHJpYnV0b3IuX19lcV9fKTogQWRkIHJpY2ggY29tcGFyaXNvbiBvcGVyYXRvcnMgZm9yIHNv cnRpbmcuCisgICAgICAgIChDb250cmlidXRvci5fX25lX18pOiBEaXR0by4KKyAgICAgICAgKENv bnRyaWJ1dG9yLl9fbHRfXyk6IERpdHRvLgorICAgICAgICAoQ29udHJpYnV0b3IuX19sZV9fKTog RGl0dG8uCisgICAgICAgIChDb250cmlidXRvci5fX2d0X18pOiBEaXR0by4KKyAgICAgICAgKENv bnRyaWJ1dG9yLl9fZ2VfXyk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbjoKKwogMjAyMS0wMi0yMyAgQ29tbWl0IFF1ZXVl ICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0 aW5nIHIyNzMzMDcuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv Y29tbWl0dGVycy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvY29tbWl0dGVycy5weQkocmV2aXNpb24gMjczMzIyKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkJKHdvcmtpbmcgY29weSkKQEAg LTg3LDE1ICs4NywzOCBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAg XiBoYXNoKHNlbGYuY2FuX2NvbW1pdCkgXAogICAgICAgICAgICAgXiBoYXNoKHNlbGYuY2FuX3Jl dmlldykKIAorICAgIGRlZiBfX2NtcF9fKHNlbGYsIG90aGVyKToKKyAgICAgICAgaWYgb3RoZXIg aXMgTm9uZToKKyAgICAgICAgICAgIHJldHVybiAxCisKKyAgICAgICAgZm9yIG1lbWJlciBpbiAo J2Z1bGxfbmFtZScsICdjYW5fY29tbWl0JywgJ2Nhbl9yZXZpZXcnKToKKyAgICAgICAgICAgIGlm IGdldGF0dHIoc2VsZiwgbWVtYmVyKSAhPSBnZXRhdHRyKG90aGVyLCBtZW1iZXIpOgorICAgICAg ICAgICAgICAgIHJldHVybiAxIGlmIGdldGF0dHIoc2VsZiwgbWVtYmVyKSA+IGdldGF0dHIob3Ro ZXIsIG1lbWJlcikgZWxzZSAtMQorCisgICAgICAgIGZvciBtZW1iZXIgaW4gKCdlbWFpbHMnLCAn X2Nhc2VfcHJlc2VydmVkX2VtYWlscycsICdpcmNfbmlja25hbWVzJywgJ2V4cGVydGlzZScsICdp cmNfbmlja25hbWVzJywgJ2V4cGVydGlzZScpOgorICAgICAgICAgICAgY21wID0gaGFzaChnZXRh dHRyKHNlbGYsIG1lbWJlcikpIC0gaGFzaChnZXRhdHRyKG90aGVyLCBtZW1iZXIpKQorICAgICAg ICAgICAgaWYgY21wOgorICAgICAgICAgICAgICAgIHJldHVybiBjbXAKKworICAgICAgICByZXR1 cm4gMAorCiAgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhlcik6Ci0gICAgICAgIHJldHVybiAob3Ro ZXIgaXMgbm90IE5vbmUKLSAgICAgICAgICAgIGFuZCBzZWxmLmZ1bGxfbmFtZSA9PSBvdGhlci5m dWxsX25hbWUKLSAgICAgICAgICAgIGFuZCBzZWxmLmVtYWlscyA9PSBvdGhlci5lbWFpbHMKLSAg ICAgICAgICAgIGFuZCBzZWxmLl9jYXNlX3ByZXNlcnZlZF9lbWFpbHMgPT0gb3RoZXIuX2Nhc2Vf cHJlc2VydmVkX2VtYWlscwotICAgICAgICAgICAgYW5kIHNlbGYuaXJjX25pY2tuYW1lcyA9PSBv dGhlci5pcmNfbmlja25hbWVzCi0gICAgICAgICAgICBhbmQgc2VsZi5leHBlcnRpc2UgPT0gb3Ro ZXIuZXhwZXJ0aXNlCi0gICAgICAgICAgICBhbmQgc2VsZi5jYW5fY29tbWl0ID09IG90aGVyLmNh bl9jb21taXQKLSAgICAgICAgICAgIGFuZCBzZWxmLmNhbl9yZXZpZXcgPT0gb3RoZXIuY2FuX3Jl dmlldykKKyAgICAgICAgcmV0dXJuIHNlbGYuX19jbXBfXyhvdGhlcikgPT0gMAorCisgICAgZGVm IF9fbmVfXyhzZWxmLCBvdGhlcik6CisgICAgICAgIHJldHVybiBzZWxmLl9fY21wX18ob3RoZXIp ICE9IDAKKworICAgIGRlZiBfX2x0X18oc2VsZiwgb3RoZXIpOgorICAgICAgICByZXR1cm4gc2Vs Zi5fX2NtcF9fKG90aGVyKSA8IDAKKworICAgIGRlZiBfX2xlX18oc2VsZiwgb3RoZXIpOgorICAg ICAgICByZXR1cm4gc2VsZi5fX2NtcF9fKG90aGVyKSA8PSAwCisKKyAgICBkZWYgX19ndF9fKHNl bGYsIG90aGVyKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX19jbXBfXyhvdGhlcikgPiAwCisKKyAg ICBkZWYgX19nZV9fKHNlbGYsIG90aGVyKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX19jbXBfXyhv dGhlcikgPj0gMAogCiAgICAgZGVmIGNvbnRhaW5zX3N0cmluZyhzZWxmLCBzZWFyY2hfc3RyaW5n KToKICAgICAgICAgc3RyaW5nID0gc2VhcmNoX3N0cmluZy5sb3dlcigpCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29udHJpYnV0b3JzLmpzb24KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbnRyaWJ1dG9ycy5q c29uCShyZXZpc2lvbiAyNzMzMjIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j b25maWcvY29udHJpYnV0b3JzLmpzb24JKHdvcmtpbmcgY29weSkKQEAgLTQ0ODEsNyArNDQ4MSw3 IEBACiAgICAgICAgICAicGdyaWZmaXMiLAogICAgICAgICAgIlRpbmdQaW5nIgogICAgICAgXSwK LSAgICAgICJzdGF0dXMiOiAiY29tbWl0dGVyIgorICAgICAgInN0YXR1cyIgOiAiY29tbWl0dGVy IgogICAgfSwKICAgICJQYXVsbyBNYXRvcyIgOiB7CiAgICAgICAiZW1haWxzIiA6IFsKQEAgLTQ4 ODUsNiArNDg4NSwxMSBAQAogICAgICAgXSwKICAgICAgICJzdGF0dXMiIDogInJldmlld2VyIgog ICAgfSwKKyAgICJSdWJlbiBUdXJjaW9zIiA6IHsKKyAgICAgICJlbWFpbHMiIDogWworICAgICAg ICAgInJ1YmVudF8yMkBhcHBsZS5jb20iCisgICAgICBdCisgICB9LAogICAgIlJ1c3NlbGwgRXBz dGVpbiIgOiB7CiAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICJyZXBzdGVpbkBhcHBsZS5j b20iCkBAIC01Mjc0LDExICs1Mjc5LDYgQEAKICAgICAgICAgICJzemxlZGFuIgogICAgICAgXQog ICAgfSwKLSAgICJSdWJlbiBUdXJjaW9zIiA6IHsKLSAgICAgICJlbWFpbHMiIDogWwotCSAicnVi ZW50XzIyQGFwcGxlLmNvbSIKLSAgICAgIF0KLSAgIH0sCiAgICAiVGFiIEF0a2lucyIgOiB7CiAg ICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICJ0YWJhdGtpbnNAZ29vZ2xlLmNvbSIsCkBAIC02 MDU0LDQgKzYwNTQsNCBAQAogICAgICAgXSwKICAgICAgICJzdGF0dXMiIDogInJldmlld2VyIgog ICAgfQotfQorfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK 421346 2021-02-23 13:25:11 -0800 2021-02-23 16:16:55 -0800 Patch bug-222329-20210223132510.patch text/plain 4289 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzMzMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTAyLTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbY2hlY2std2Via2l0LXN0eWxlXSBGaXggQ29udHJpYnV0b3Igc29ydGlu ZyBpbiBQeXRob24gMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjIyMzI5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDY1NjY2Nz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5OgorICAgICAgICAoQ29udHJpYnV0b3IuX19j bXBfXyk6IFJldHVybiBhbiBpbnRlZ2VyIHRvIGluZGljYXRlIG9yZGVyaW5nLgorICAgICAgICAo Q29udHJpYnV0b3IuX19lcV9fKTogQWRkIHJpY2ggY29tcGFyaXNvbiBvcGVyYXRvcnMgZm9yIHNv cnRpbmcuCisgICAgICAgIChDb250cmlidXRvci5fX25lX18pOiBEaXR0by4KKyAgICAgICAgKENv bnRyaWJ1dG9yLl9fbHRfXyk6IERpdHRvLgorICAgICAgICAoQ29udHJpYnV0b3IuX19sZV9fKTog RGl0dG8uCisgICAgICAgIChDb250cmlidXRvci5fX2d0X18pOiBEaXR0by4KKyAgICAgICAgKENv bnRyaWJ1dG9yLl9fZ2VfXyk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbjoKKwogMjAyMS0wMi0yMyAgQ29tbWl0IFF1ZXVl ICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0 aW5nIHIyNzMzMDcuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv Y29tbWl0dGVycy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvY29tbWl0dGVycy5weQkocmV2aXNpb24gMjczMzIyKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHkJKHdvcmtpbmcgY29weSkKQEAg LTg3LDE1ICs4Nyw0MyBAQCBjbGFzcyBDb250cmlidXRvcihvYmplY3QpOgogICAgICAgICAgICAg XiBoYXNoKHNlbGYuY2FuX2NvbW1pdCkgXAogICAgICAgICAgICAgXiBoYXNoKHNlbGYuY2FuX3Jl dmlldykKIAorICAgIGRlZiBfX2NtcF9fKHNlbGYsIG90aGVyKToKKyAgICAgICAgaWYgb3RoZXIg aXMgTm9uZToKKyAgICAgICAgICAgIHJldHVybiAxCisKKyAgICAgICAgZm9yIG1lbWJlciBpbiAo J2Z1bGxfbmFtZScsICdlbWFpbHMnLCAnX2Nhc2VfcHJlc2VydmVkX2VtYWlscycsICdpcmNfbmlj a25hbWVzJywgJ2Nhbl9jb21taXQnLCAnY2FuX3JldmlldycsICdleHBlcnRpc2UnKToKKyAgICAg ICAgICAgIGlmIG1lbWJlciBpbiAoJ2VtYWlscycsICdfY2FzZV9wcmVzZXJ2ZWRfZW1haWxzJywg J2lyY19uaWNrbmFtZXMnKToKKyAgICAgICAgICAgICAgICBzZWxmX2xpc3QgPSBzb3J0ZWQoZ2V0 YXR0cihzZWxmLCBtZW1iZXIpIG9yIFtdKQorICAgICAgICAgICAgICAgIG90aGVyX2xpc3QgPSBz b3J0ZWQoZ2V0YXR0cihvdGhlciwgbWVtYmVyKSBvciBbXSkKKyAgICAgICAgICAgICAgICBmb3Ig aSBpbiByYW5nZShtaW4obGVuKHNlbGZfbGlzdCksIGxlbihvdGhlcl9saXN0KSkpOgorICAgICAg ICAgICAgICAgICAgICBpZiBzZWxmX2xpc3RbaV0gIT0gb3RoZXJfbGlzdFtpXToKKyAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybiAxIGlmIHNlbGZfbGlzdFtpXSA+IG90aGVyX2xpc3RbaV0g ZWxzZSAtMQorICAgICAgICAgICAgICAgIGlmIGxlbihzZWxmX2xpc3QpICE9IGxlbihvdGhlcl9s aXN0KToKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGxlbihzZWxmX2xpc3QpIC0gbGVuKG90 aGVyX2xpc3QpCisKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgaWYgZ2V0YXR0 cihzZWxmLCBtZW1iZXIpICE9IGdldGF0dHIob3RoZXIsIG1lbWJlcik6CisgICAgICAgICAgICAg ICAgICAgIHJldHVybiAxIGlmIGdldGF0dHIoc2VsZiwgbWVtYmVyKSA+IGdldGF0dHIob3RoZXIs IG1lbWJlcikgZWxzZSAtMQorCisgICAgICAgIHJldHVybiAwCisKICAgICBkZWYgX19lcV9fKHNl bGYsIG90aGVyKToKLSAgICAgICAgcmV0dXJuIChvdGhlciBpcyBub3QgTm9uZQotICAgICAgICAg ICAgYW5kIHNlbGYuZnVsbF9uYW1lID09IG90aGVyLmZ1bGxfbmFtZQotICAgICAgICAgICAgYW5k IHNlbGYuZW1haWxzID09IG90aGVyLmVtYWlscwotICAgICAgICAgICAgYW5kIHNlbGYuX2Nhc2Vf cHJlc2VydmVkX2VtYWlscyA9PSBvdGhlci5fY2FzZV9wcmVzZXJ2ZWRfZW1haWxzCi0gICAgICAg ICAgICBhbmQgc2VsZi5pcmNfbmlja25hbWVzID09IG90aGVyLmlyY19uaWNrbmFtZXMKLSAgICAg ICAgICAgIGFuZCBzZWxmLmV4cGVydGlzZSA9PSBvdGhlci5leHBlcnRpc2UKLSAgICAgICAgICAg IGFuZCBzZWxmLmNhbl9jb21taXQgPT0gb3RoZXIuY2FuX2NvbW1pdAotICAgICAgICAgICAgYW5k IHNlbGYuY2FuX3JldmlldyA9PSBvdGhlci5jYW5fcmV2aWV3KQorICAgICAgICByZXR1cm4gc2Vs Zi5fX2NtcF9fKG90aGVyKSA9PSAwCisKKyAgICBkZWYgX19uZV9fKHNlbGYsIG90aGVyKToKKyAg ICAgICAgcmV0dXJuIHNlbGYuX19jbXBfXyhvdGhlcikgIT0gMAorCisgICAgZGVmIF9fbHRfXyhz ZWxmLCBvdGhlcik6CisgICAgICAgIHJldHVybiBzZWxmLl9fY21wX18ob3RoZXIpIDwgMAorCisg ICAgZGVmIF9fbGVfXyhzZWxmLCBvdGhlcik6CisgICAgICAgIHJldHVybiBzZWxmLl9fY21wX18o b3RoZXIpIDw9IDAKKworICAgIGRlZiBfX2d0X18oc2VsZiwgb3RoZXIpOgorICAgICAgICByZXR1 cm4gc2VsZi5fX2NtcF9fKG90aGVyKSA+IDAKKworICAgIGRlZiBfX2dlX18oc2VsZiwgb3RoZXIp OgorICAgICAgICByZXR1cm4gc2VsZi5fX2NtcF9fKG90aGVyKSA+PSAwCiAKICAgICBkZWYgY29u dGFpbnNfc3RyaW5nKHNlbGYsIHNlYXJjaF9zdHJpbmcpOgogICAgICAgICBzdHJpbmcgPSBzZWFy Y2hfc3RyaW5nLmxvd2VyKCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9jb250cmlidXRvcnMuanNvbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jb25maWcvY29udHJpYnV0b3JzLmpzb24JKHJldmlzaW9uIDI3MzMyMikKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbgko d29ya2luZyBjb3B5KQpAQCAtNDQ4MSw3ICs0NDgxLDcgQEAKICAgICAgICAgICJwZ3JpZmZpcyIs CiAgICAgICAgICAiVGluZ1BpbmciCiAgICAgICBdLAotICAgICAgInN0YXR1cyI6ICJjb21taXR0 ZXIiCisgICAgICAic3RhdHVzIiA6ICJjb21taXR0ZXIiCiAgICB9LAogICAgIlBhdWxvIE1hdG9z IiA6IHsKICAgICAgICJlbWFpbHMiIDogWwpAQCAtNDg4NSw2ICs0ODg1LDExIEBACiAgICAgICBd LAogICAgICAgInN0YXR1cyIgOiAicmV2aWV3ZXIiCiAgICB9LAorICAgIlJ1YmVuIFR1cmNpb3Mi IDogeworICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAicnViZW50XzIyQGFwcGxlLmNvbSIK KyAgICAgIF0KKyAgIH0sCiAgICAiUnVzc2VsbCBFcHN0ZWluIiA6IHsKICAgICAgICJlbWFpbHMi IDogWwogICAgICAgICAgInJlcHN0ZWluQGFwcGxlLmNvbSIKQEAgLTUyNzQsMTEgKzUyNzksNiBA QAogICAgICAgICAgInN6bGVkYW4iCiAgICAgICBdCiAgICB9LAotICAgIlJ1YmVuIFR1cmNpb3Mi IDogewotICAgICAgImVtYWlscyIgOiBbCi0JICJydWJlbnRfMjJAYXBwbGUuY29tIgotICAgICAg XQotICAgfSwKICAgICJUYWIgQXRraW5zIiA6IHsKICAgICAgICJlbWFpbHMiIDogWwogICAgICAg ICAgInRhYmF0a2luc0Bnb29nbGUuY29tIiwKQEAgLTYwNTQsNCArNjA1NCw0IEBACiAgICAgICBd LAogICAgICAgInN0YXR1cyIgOiAicmV2aWV3ZXIiCiAgICB9Ci19Cit9ClwgTm8gbmV3bGluZSBh dCBlbmQgb2YgZmlsZQo=