Bug 199161 - contributors.json not canonicalized since r243297
Summary: contributors.json not canonicalized since r243297
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: PC Linux
: P2 Normal
Assignee: Michael Catanzaro
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2019-06-24 08:18 PDT by Michael Catanzaro
Modified: 2019-06-24 12:01 PDT (History)
5 users (show)

See Also:


Attachments
Patch (83.39 KB, patch)
2019-06-24 08:21 PDT, Michael Catanzaro
ap: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Catanzaro 2019-06-24 08:18:06 PDT
"status" : "contributor", added all over the place in r243297 "Update status inactive committers' status to 'contributor'," isn't recognized as canonical format by validate-committer-lists --canonicalize. Canonicalizing contributors.json will result in the removal of "status" : "contributor" wherever it exists.

We could make it canonical form with this simple tweak:

diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/
webkitpy/common/config/committers.py
index ed927ba52ea..c446ce53a04 100644
--- a/Tools/Scripts/webkitpy/common/config/committers.py
+++ b/Tools/Scripts/webkitpy/common/config/committers.py
@@ -142,6 +142,8 @@ class Contributor(object):
             info["status"] = "reviewer"
         elif self.can_commit:
             info["status"] = "committer"
+        else:
+            info["status"] = "contributor"
 
         if self.irc_nicknames:
             info["nicks"] = self.irc_nicknames

Or we could just remove it everywhere. Alexey, your preference?
Comment 1 Michael Catanzaro 2019-06-24 08:20:58 PDT
This patch canonicalizes it without changing the format.
Comment 2 Michael Catanzaro 2019-06-24 08:21:12 PDT
Created attachment 372764 [details]
Patch
Comment 3 Michael Catanzaro 2019-06-24 08:22:31 PDT
(In reply to Michael Catanzaro from comment #0)
> We could make it canonical form with this simple tweak:

(Note this will result in it being added in a ton of places where it's not currently.)
Comment 4 Build Bot 2019-06-24 08:22:56 PDT
Attachment 372764 [details] did not pass style-queue:


ERROR: Tools/Scripts/webkitpy/common/config/contributors.json:0:  contributors.json should not be modified through the commit queue  [json/syntax] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 5 Alexey Proskuryakov 2019-06-24 09:36:56 PDT
Comment on attachment 372764 [details]
Patch

No preference as far as I’m concerned. I didn’t know that there was a canonical form.
Comment 6 Michael Catanzaro 2019-06-24 11:59:45 PDT
Committed r246751: <https://trac.webkit.org/changeset/246751>
Comment 7 Radar WebKit Bug Importer 2019-06-24 12:01:16 PDT
<rdar://problem/52063832>