<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206967] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206967">206967</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-10-09 09:34:53 -0700 (Sun, 09 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for canonicalizing contributors.json, and have check-webkit-style check the format.
https://bugs.webkit.org/show_bug.cgi?id=163177
Reviewed by Ryosuke Niwa.
Make it possible to round-trip contributors.json through CommitterList, so we can
support writing out contributors.json in canonical format. This requires saving
the case-preserved email and expertise in Contributor. CommitterList also needs
to be able to generate the "exclusive" lists, since it currently uses lists
that are the union of, say, committers and reviewers.
If contributors.json is malformed (invalid JSON), catch the Exception, report it
and exit rather than allowing the exception to propagate. With an invalid file,
an exception would be thrown before the JSON style checker reached this file, so
the error was not correctly reported.
Add style/checker/committer.py for checking that committers.json has the canonical format.
Add support to validate-committer-lists to dump out the canonical json (-d) or update
the file in-place (-c).
* Scripts/validate-committer-lists:
(CommitterListFromGit._print_three_column_row):
(CommitterListFromGit.possibly_expired_committers):
(CommitterListFromGit):
(CommitterListFromGit.print_possibly_expired_committers):
(main):
* Scripts/webkitpy/common/config/committers.py:
(Contributor.__init__):
(Contributor.__dict__):
(Committer.__init__):
(Reviewer.__init__):
(CommitterList.load_json):
(CommitterList):
(CommitterList._contributor_list_to_dict):
(CommitterList.as_json):
(CommitterList.reformat_in_place):
(CommitterList._exclusive_contributors):
(CommitterList._exclusive_committers):
(Contributor.matches_glob): Deleted.
(CommitterList.contributors): Deleted.
* Scripts/webkitpy/common/config/contributors.json:
* Scripts/webkitpy/style/checker.py:
(CheckerDispatcher._create_checker):
* Scripts/webkitpy/style/checkers/contributors.py: Added.
(ContributorsChecker):
(ContributorsChecker.__init__):
(ContributorsChecker.check):
(ContributorsChecker._unidiff_output):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsvalidatecommitterlists">trunk/Tools/Scripts/validate-committer-lists</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigcommitterspy">trunk/Tools/Scripts/webkitpy/common/config/committers.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigcontributorsjson">trunk/Tools/Scripts/webkitpy/common/config/contributors.json</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscontributorspy">trunk/Tools/Scripts/webkitpy/style/checkers/contributors.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206966 => 206967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-10-09 07:34:08 UTC (rev 206966)
+++ trunk/Tools/ChangeLog 2016-10-09 16:34:53 UTC (rev 206967)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2016-10-08 Simon Fraser <simon.fraser@apple.com>
+
+ Add support for canonicalizing contributors.json, and have check-webkit-style check the format.
+ https://bugs.webkit.org/show_bug.cgi?id=163177
+
+ Reviewed by Ryosuke Niwa.
+
+ Make it possible to round-trip contributors.json through CommitterList, so we can
+ support writing out contributors.json in canonical format. This requires saving
+ the case-preserved email and expertise in Contributor. CommitterList also needs
+ to be able to generate the "exclusive" lists, since it currently uses lists
+ that are the union of, say, committers and reviewers.
+
+ If contributors.json is malformed (invalid JSON), catch the Exception, report it
+ and exit rather than allowing the exception to propagate. With an invalid file,
+ an exception would be thrown before the JSON style checker reached this file, so
+ the error was not correctly reported.
+
+ Add style/checker/committer.py for checking that committers.json has the canonical format.
+
+ Add support to validate-committer-lists to dump out the canonical json (-d) or update
+ the file in-place (-c).
+
+ * Scripts/validate-committer-lists:
+ (CommitterListFromGit._print_three_column_row):
+ (CommitterListFromGit.possibly_expired_committers):
+ (CommitterListFromGit):
+ (CommitterListFromGit.print_possibly_expired_committers):
+ (main):
+ * Scripts/webkitpy/common/config/committers.py:
+ (Contributor.__init__):
+ (Contributor.__dict__):
+ (Committer.__init__):
+ (Reviewer.__init__):
+ (CommitterList.load_json):
+ (CommitterList):
+ (CommitterList._contributor_list_to_dict):
+ (CommitterList.as_json):
+ (CommitterList.reformat_in_place):
+ (CommitterList._exclusive_contributors):
+ (CommitterList._exclusive_committers):
+ (Contributor.matches_glob): Deleted.
+ (CommitterList.contributors): Deleted.
+ * Scripts/webkitpy/common/config/contributors.json:
+ * Scripts/webkitpy/style/checker.py:
+ (CheckerDispatcher._create_checker):
+ * Scripts/webkitpy/style/checkers/contributors.py: Added.
+ (ContributorsChecker):
+ (ContributorsChecker.__init__):
+ (ContributorsChecker.check):
+ (ContributorsChecker._unidiff_output):
+
</ins><span class="cx"> 2016-10-06 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Next step on moving to modern way to return DOM exceptions
</span></span></pre></div>
<a id="trunkToolsScriptsvalidatecommitterlists"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/validate-committer-lists (206966 => 206967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/validate-committer-lists 2016-10-09 07:34:08 UTC (rev 206966)
+++ trunk/Tools/Scripts/validate-committer-lists 2016-10-09 16:34:53 UTC (rev 206967)
</span><span class="lines">@@ -215,19 +215,27 @@
</span><span class="cx"> def _print_three_column_row(widths, values):
</span><span class="cx"> print "%s%s%s" % (values[0].ljust(widths[0]), values[1].ljust(widths[1]), values[2])
</span><span class="cx">
</span><del>- def print_possibly_expired_committers(self, committer_list):
</del><ins>+ def possibly_expired_committers(self, committer_list):
</ins><span class="cx"> authors_and_last_commits = self._last_commit_by_author().items()
</span><span class="cx"> authors_and_last_commits.sort(lambda a,b: cmp(a[1], b[1]), reverse=True)
</span><del>- committer_cuttof = date.today() - timedelta(days=365)
</del><ins>+ committer_cutof = date.today() - timedelta(days=365)
+ retired_authors_and_last_commits = []
+ for (author, last_commit) in authors_and_last_commits:
+ last_commit_date = date.fromtimestamp(last_commit)
+ if committer_cutof > last_commit_date:
+ retired_authors_and_last_commits.append((author, last_commit))
+ return retired_authors_and_last_commits
+
+ def print_possibly_expired_committers(self, committer_list):
+ retired_authors_and_last_commits = self.possibly_expired_committers(committer_list)
</ins><span class="cx"> column_widths = [13, 25]
</span><span class="cx"> print
</span><span class="cx"> print "Committers who have not committed within one year:"
</span><span class="cx"> self._print_three_column_row(column_widths, ("Last Commit", "Committer Email", "Committer Record"))
</span><del>- for (author, last_commit) in authors_and_last_commits:
</del><ins>+ for (author, last_commit) in retired_authors_and_last_commits:
+ committer_record = committer_list.committer_by_email(author)
</ins><span class="cx"> last_commit_date = date.fromtimestamp(last_commit)
</span><del>- if committer_cuttof > last_commit_date:
- committer_record = committer_list.committer_by_email(author)
- self._print_three_column_row(column_widths, (str(last_commit_date), author, committer_record))
</del><ins>+ self._print_three_column_row(column_widths, (str(last_commit_date), author, committer_record))
</ins><span class="cx">
</span><span class="cx"> def print_committers_missing_from_committer_list(self, committer_list):
</span><span class="cx"> missing_from_contributors_json = []
</span><span class="lines">@@ -265,9 +273,22 @@
</span><span class="cx"> def main():
</span><span class="cx"> parser = OptionParser()
</span><span class="cx"> parser.add_option("-b", "--check-bugzilla-emails", action="store_true", help="Check the bugzilla_email for each committer against bugs.webkit.org")
</span><ins>+ parser.add_option("-d", "--dump", action="store_true", help="Dump the contributor list as JSON to stdout (suitable for saving to contributors.json)")
+ parser.add_option("-c", "--canonicalize", action="store_true", help="Canonicalize contributors.json, rewriting it in-place")
+
</ins><span class="cx"> (options, args) = parser.parse_args()
</span><span class="cx">
</span><span class="cx"> committer_list = CommitterList()
</span><ins>+ if options.dump:
+ print committer_list.as_json()
+ return 0;
+
+ if options.canonicalize:
+ print "Updating contributors.json in-place..."
+ committer_list.reformat_in_place()
+ print "Done"
+ return 0;
+
</ins><span class="cx"> CommitterListFromMailingList().check_for_emails_missing_from_list(committer_list)
</span><span class="cx">
</span><span class="cx"> if not Git.in_working_directory("."):
</span><span class="lines">@@ -277,6 +298,7 @@
</span><span class="cx"> - List of historical committers missing from contributors.json
</span><span class="cx"> """
</span><span class="cx"> return 1
</span><ins>+
</ins><span class="cx"> svn_committer_list = CommitterListFromGit()
</span><span class="cx"> svn_committer_list.print_possibly_expired_committers(committer_list)
</span><span class="cx"> svn_committer_list.print_committers_missing_from_committer_list(committer_list)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigcommitterspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/committers.py (206966 => 206967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/committers.py 2016-10-09 07:34:08 UTC (rev 206966)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers.py 2016-10-09 16:34:53 UTC (rev 206967)
</span><span class="lines">@@ -31,17 +31,14 @@
</span><span class="cx">
</span><span class="cx"> import fnmatch
</span><span class="cx"> import json
</span><ins>+import sys
</ins><span class="cx">
</span><span class="cx"> from webkitpy.common.editdistance import edit_distance
</span><span class="cx"> from webkitpy.common.memoized import memoized
</span><span class="cx"> from webkitpy.common.system.filesystem import FileSystem
</span><span class="cx">
</span><del>-
-# The list of contributors have been moved to contributors.json
-
-
</del><span class="cx"> class Contributor(object):
</span><del>- def __init__(self, name, email_or_emails, irc_nickname_or_nicknames=None):
</del><ins>+ def __init__(self, name, email_or_emails, irc_nickname_or_nicknames=None, expertise=None):
</ins><span class="cx"> assert(name)
</span><span class="cx"> assert(email_or_emails)
</span><span class="cx"> self.full_name = name
</span><span class="lines">@@ -49,11 +46,13 @@
</span><span class="cx"> self.emails = [email_or_emails]
</span><span class="cx"> else:
</span><span class="cx"> self.emails = email_or_emails
</span><ins>+ self._case_preserved_emails = self.emails
</ins><span class="cx"> self.emails = map(lambda email: email.lower(), self.emails) # Emails are case-insensitive.
</span><span class="cx"> if isinstance(irc_nickname_or_nicknames, str):
</span><span class="cx"> self.irc_nicknames = [irc_nickname_or_nicknames]
</span><span class="cx"> else:
</span><span class="cx"> self.irc_nicknames = irc_nickname_or_nicknames
</span><ins>+ self.expertise = expertise
</ins><span class="cx"> self.can_commit = False
</span><span class="cx"> self.can_review = False
</span><span class="cx">
</span><span class="lines">@@ -93,16 +92,26 @@
</span><span class="cx"> return True
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+ def __dict__(self):
+ info = {"emails" : self._case_preserved_emails}
</ins><span class="cx">
</span><ins>+ if self.irc_nicknames:
+ info["nicks"] = self.irc_nicknames
+
+ if self.expertise:
+ info["expertise"] = self.expertise
+
+ return info
+
</ins><span class="cx"> class Committer(Contributor):
</span><del>- def __init__(self, name, email_or_emails, irc_nickname=None):
- Contributor.__init__(self, name, email_or_emails, irc_nickname)
</del><ins>+ def __init__(self, name, email_or_emails, irc_nickname=None, expertise=None):
+ Contributor.__init__(self, name, email_or_emails, irc_nickname, expertise)
</ins><span class="cx"> self.can_commit = True
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class Reviewer(Committer):
</span><del>- def __init__(self, name, email_or_emails, irc_nickname=None):
- Committer.__init__(self, name, email_or_emails, irc_nickname)
</del><ins>+ def __init__(self, name, email_or_emails, irc_nickname=None, expertise=None):
+ Committer.__init__(self, name, email_or_emails, irc_nickname, expertise)
</ins><span class="cx"> self.can_review = True
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -132,17 +141,50 @@
</span><span class="cx"> def load_json():
</span><span class="cx"> filesystem = FileSystem()
</span><span class="cx"> json_path = filesystem.join(filesystem.dirname(filesystem.path_to_module('webkitpy.common.config')), 'contributors.json')
</span><del>- contributors = json.loads(filesystem.read_text_file(json_path))
</del><ins>+ try:
+ contributors = json.loads(filesystem.read_text_file(json_path))
+ except ValueError, e:
+ sys.exit('contributors.json is malformed: ' + str(e))
</ins><span class="cx">
</span><span class="cx"> return {
</span><del>- 'Contributors': [Contributor(name, data.get('emails'), data.get('nicks')) for name, data in contributors['Contributors'].iteritems()],
- 'Committers': [Committer(name, data.get('emails'), data.get('nicks')) for name, data in contributors['Committers'].iteritems()],
- 'Reviewers': [Reviewer(name, data.get('emails'), data.get('nicks')) for name, data in contributors['Reviewers'].iteritems()],
</del><ins>+ 'Contributors': [Contributor(name, data.get('emails'), data.get('nicks'), data.get('expertise')) for name, data in contributors['Contributors'].iteritems()],
+ 'Committers': [Committer(name, data.get('emails'), data.get('nicks'), data.get('expertise')) for name, data in contributors['Committers'].iteritems()],
+ 'Reviewers': [Reviewer(name, data.get('emails'), data.get('nicks'), data.get('expertise')) for name, data in contributors['Reviewers'].iteritems()],
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ @staticmethod
+ def _contributor_list_to_dict(list):
+ committers_dict = {}
+ for contributor in sorted(list):
+ committers_dict[contributor.full_name] = contributor.__dict__()
+ return committers_dict
+
+ def as_json(self):
+ result = {
+ 'Contributors': CommitterList._contributor_list_to_dict(self._exclusive_contributors()),
+ 'Committers': CommitterList._contributor_list_to_dict(self._exclusive_committers()),
+ 'Reviewers': CommitterList._contributor_list_to_dict(self._reviewers)
+ }
+ return json.dumps(result, sort_keys=True, indent=3, separators=(',', ' : '))
+
+ def reformat_in_place(self):
+ filesystem = FileSystem()
+ json_path = filesystem.join(filesystem.dirname(filesystem.path_to_module('webkitpy.common.config')), 'contributors.json')
+ filesystem.write_text_file(json_path, self.as_json())
+
+ # Contributors who are not in any other category.
+ def _exclusive_contributors(self):
+ return filter(lambda contributor: not (contributor.can_commit or contributor.can_review), self._contributors)
+
+ # Committers who are not reviewers.
+ def _exclusive_committers(self):
+ return filter(lambda contributor: contributor.can_commit and not contributor.can_review, self._committers)
+
+ # This is the superset of contributors + committers + reviewers
</ins><span class="cx"> def contributors(self):
</span><span class="cx"> return self._contributors
</span><span class="cx">
</span><ins>+ # This is the superset of committers + reviewers
</ins><span class="cx"> def committers(self):
</span><span class="cx"> return self._committers
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigcontributorsjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (206966 => 206967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2016-10-09 07:34:08 UTC (rev 206966)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2016-10-09 16:34:53 UTC (rev 206967)
</span><span class="lines">@@ -359,10 +359,10 @@
</span><span class="cx"> "anilsson"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Babak Shafiei": {
- "emails" : [
</del><ins>+ "Babak Shafiei" : {
+ "emails" : [
</ins><span class="cx"> "bshafiei@apple.com"
</span><del>- ]
</del><ins>+ ]
</ins><span class="cx"> },
</span><span class="cx"> "Balazs Kelemen" : {
</span><span class="cx"> "emails" : [
</span><span class="lines">@@ -376,13 +376,13 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> "Basile Clement" : {
</span><del>- "emails" : [
</del><ins>+ "emails" : [
</ins><span class="cx"> "basile_clement@apple.com",
</span><span class="cx"> "cbasile06+webkit@gmail.com"
</span><del>- ],
- "nicks" : [
</del><ins>+ ],
+ "nicks" : [
</ins><span class="cx"> "elarnon"
</span><del>- ]
</del><ins>+ ]
</ins><span class="cx"> },
</span><span class="cx"> "Bear Travis" : {
</span><span class="cx"> "emails" : [
</span><span class="lines">@@ -680,16 +680,6 @@
</span><span class="cx"> "danakj"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "D\u00E1niel B\u00E1tyai" : {
- "emails" : [
- "dbatyai.u-szeged@partner.samsung.com",
- "dbatyai@inf.u-szeged.hu",
- "Batyai.Daniel@stud.u-szeged.hu"
- ],
- "nicks" : [
- "dbatyai"
- ]
- },
</del><span class="cx"> "Daniel Cheng" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "dcheng@chromium.org"
</span><span class="lines">@@ -896,6 +886,16 @@
</span><span class="cx"> "atwilson"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "D\u00e1niel B\u00e1tyai" : {
+ "emails" : [
+ "dbatyai.u-szeged@partner.samsung.com",
+ "dbatyai@inf.u-szeged.hu",
+ "Batyai.Daniel@stud.u-szeged.hu"
+ ],
+ "nicks" : [
+ "dbatyai"
+ ]
+ },
</ins><span class="cx"> "Eli Fidler" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "efidler@rim.com",
</span><span class="lines">@@ -914,7 +914,7 @@
</span><span class="cx"> "epoger"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Enrique Oca\u00F1a Gonz\u00E1lez" : {
</del><ins>+ "Enrique Oca\u00f1a Gonz\u00e1lez" : {
</ins><span class="cx"> "emails" : [
</span><span class="cx"> "eocanha@igalia.com",
</span><span class="cx"> "eocanha@gmail.com"
</span><span class="lines">@@ -1016,7 +1016,7 @@
</span><span class="cx"> "fmalita"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Frédéric Wang" : {
</del><ins>+ "Fr\u00e9d\u00e9ric Wang" : {
</ins><span class="cx"> "emails" : [
</span><span class="cx"> "fred.wang@free.fr",
</span><span class="cx"> "fwang@igalia.com"
</span><span class="lines">@@ -1271,6 +1271,18 @@
</span><span class="cx"> "ike@apple.com"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "JF Bastien" : {
+ "emails" : [
+ "jfbastien@apple.com",
+ "jfb@chromium.org"
+ ],
+ "expertise" : "JavaScript/ECMAScript",
+ "nicks" : [
+ "jfb",
+ "jfb_",
+ "jfbastien"
+ ]
+ },
</ins><span class="cx"> "Jacky Jiang" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "jkjiang@webkit.org",
</span><span class="lines">@@ -1283,22 +1295,22 @@
</span><span class="cx"> "jkjiang"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Jaehun Lim" : {
</del><ins>+ "Jae Hyun Park" : {
</ins><span class="cx"> "emails" : [
</span><del>- "ljaehun.lim@samsung.com"
</del><ins>+ "jaepark@webkit.org",
+ "jae.park@company100.net"
</ins><span class="cx"> ],
</span><del>- "expertise" : "The EFLWebKit port",
</del><span class="cx"> "nicks" : [
</span><del>- "jaehun"
</del><ins>+ "jaepark"
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Jae Hyun Park" : {
</del><ins>+ "Jaehun Lim" : {
</ins><span class="cx"> "emails" : [
</span><del>- "jaepark@webkit.org",
- "jae.park@company100.net"
</del><ins>+ "ljaehun.lim@samsung.com"
</ins><span class="cx"> ],
</span><ins>+ "expertise" : "The EFLWebKit port",
</ins><span class="cx"> "nicks" : [
</span><del>- "jaepark"
</del><ins>+ "jaehun"
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> "Jake Nielsen" : {
</span><span class="lines">@@ -1472,18 +1484,6 @@
</span><span class="cx"> "jeez_"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "JF Bastien" : {
- "emails" : [
- "jfbastien@apple.com",
- "jfb@chromium.org"
- ],
- "expertise" : "JavaScript/ECMAScript",
- "nicks" : [
- "jfb",
- "jfb_",
- "jfbastien"
- ]
- },
</del><span class="cx"> "Jia Pu" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "jiapu.mail@gmail.com",
</span><span class="lines">@@ -1498,15 +1498,6 @@
</span><span class="cx"> "Jiewen"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Jinyoung Hur" : {
- "emails" : [
- "hur.ims@navercorp.com"
- ],
- "expertise" : "The WinCairo Port, WebGL, Canvas, Accelerated Compositing",
- "nicks" : [
- "jyhur"
- ]
- },
</del><span class="cx"> "Jinwoo Song" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "jinwoo7.song@samsung.com",
</span><span class="lines">@@ -1517,6 +1508,15 @@
</span><span class="cx"> "jinwoo"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Jinyoung Hur" : {
+ "emails" : [
+ "hur.ims@navercorp.com"
+ ],
+ "expertise" : "The WinCairo Port, WebGL, Canvas, Accelerated Compositing",
+ "nicks" : [
+ "jyhur"
+ ]
+ },
</ins><span class="cx"> "Joe Thomas" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "joethomas@motorola.com"
</span><span class="lines">@@ -1696,6 +1696,15 @@
</span><span class="cx"> "jschuh"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Kalyan Kondapally" : {
+ "emails" : [
+ "kalyan.kondapally@intel.com",
+ "kondapallykalyan@gmail.com"
+ ],
+ "nicks" : [
+ "kalyank"
+ ]
+ },
</ins><span class="cx"> "Kangil Han" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "kangil.han@samsung.com",
</span><span class="lines">@@ -1715,15 +1724,6 @@
</span><span class="cx"> "kareng"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Kalyan Kondapally" : {
- "emails" : [
- "kalyan.kondapally@intel.com",
- "kondapallykalyan@gmail.com"
- ],
- "nicks" : [
- "kalyank"
- ]
- },
</del><span class="cx"> "Kaustubh Atrawalkar" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "kaustubh.ra@gmail.com",
</span><span class="lines">@@ -1733,11 +1733,6 @@
</span><span class="cx"> "silverroots"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Keith Rollin" : {
- "emails" : [
- "krollin@apple.com"
- ]
- },
</del><span class="cx"> "Keishi Hattori" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "keishi@webkit.org"
</span><span class="lines">@@ -1747,6 +1742,11 @@
</span><span class="cx"> "keishi"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Keith Rollin" : {
+ "emails" : [
+ "krollin@apple.com"
+ ]
+ },
</ins><span class="cx"> "Kelly Norton" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "knorton@google.com",
</span><span class="lines">@@ -1889,15 +1889,6 @@
</span><span class="cx"> "hyuki"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "L\u00E1szl\u00F3 Lang\u00F3" : {
- "emails" : [
- "llango.u-szeged@partner.samsung.com",
- "lango@inf.u-szeged.hu"
- ],
- "nicks" : [
- "llango"
- ]
- },
</del><span class="cx"> "Laszlo Vidacs" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "lvidacs.u-szeged@partner.samsung.com",
</span><span class="lines">@@ -1980,6 +1971,15 @@
</span><span class="cx"> "macpherson"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "L\u00e1szl\u00f3 Lang\u00f3" : {
+ "emails" : [
+ "llango.u-szeged@partner.samsung.com",
+ "lango@inf.u-szeged.hu"
+ ],
+ "nicks" : [
+ "llango"
+ ]
+ },
</ins><span class="cx"> "Mads Ager" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "ager@chromium.org"
</span><span class="lines">@@ -2385,7 +2385,7 @@
</span><span class="cx"> "galpeter@inf.u-szeged.hu",
</span><span class="cx"> "pgal.u-szeged@partner.samsung.com"
</span><span class="cx"> ],
</span><del>- "expertise": "Python, CURL HTTP backend",
</del><ins>+ "expertise" : "Python, CURL HTTP backend",
</ins><span class="cx"> "nicks" : [
</span><span class="cx"> "elecro"
</span><span class="cx"> ]
</span><span class="lines">@@ -2831,15 +2831,6 @@
</span><span class="cx"> "tdanderson"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Thiago de Barros Lacerda" : {
- "emails" : [
- "thiago.lacerda@openbossa.org"
- ],
- "expertise" : "Nix port, WebRTC, MediaStream",
- "nicks" : [
- "lacerda"
- ]
- },
</del><span class="cx"> "Thiago Marcos P. Santos" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "tmpsantos@gmail.com",
</span><span class="lines">@@ -2850,6 +2841,15 @@
</span><span class="cx"> "tmpsantos"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Thiago de Barros Lacerda" : {
+ "emails" : [
+ "thiago.lacerda@openbossa.org"
+ ],
+ "expertise" : "Nix port, WebRTC, MediaStream",
+ "nicks" : [
+ "lacerda"
+ ]
+ },
</ins><span class="cx"> "Thomas Sepez" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "tsepez@chromium.org"
</span><span class="lines">@@ -3542,7 +3542,7 @@
</span><span class="cx"> "plinss"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Philip J\u00E4genstedt" : {
</del><ins>+ "Philip J\u00e4genstedt" : {
</ins><span class="cx"> "emails" : [
</span><span class="cx"> "philipj@opera.com"
</span><span class="cx"> ],
</span><span class="lines">@@ -3565,10 +3565,10 @@
</span><span class="cx"> },
</span><span class="cx"> "Rebecca Hauck" : {
</span><span class="cx"> "emails" : [
</span><del>- "rhauck@adobe.com"
</del><ins>+ "rhauck@adobe.com"
</ins><span class="cx"> ],
</span><span class="cx"> "nicks" : [
</span><del>- "rhauck"
</del><ins>+ "rhauck"
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> "Ricky Mondello" : {
</span><span class="lines">@@ -3635,11 +3635,6 @@
</span><span class="cx"> "webcomponents-bugzilla@chromium.org"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "WebKitGTK+ Bugs" : {
- "emails" : [
- "bugs-noreply@webkitgtk.org"
- ]
- },
</del><span class="cx"> "WebKit Review Bot" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "webkit.review.bot@gmail.com"
</span><span class="lines">@@ -3648,6 +3643,11 @@
</span><span class="cx"> "sheriff-bot"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "WebKitGTK+ Bugs" : {
+ "emails" : [
+ "bugs-noreply@webkitgtk.org"
+ ]
+ },
</ins><span class="cx"> "Wyatt Carss" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "wcarss@chromium.org",
</span><span class="lines">@@ -3864,6 +3864,15 @@
</span><span class="cx"> "estes"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Antoine Quint" : {
+ "emails" : [
+ "graouts@apple.com",
+ "graouts@webkit.org"
+ ],
+ "nicks" : [
+ "graouts"
+ ]
+ },
</ins><span class="cx"> "Antonio Gomes" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "tonikitoo@webkit.org",
</span><span class="lines">@@ -3876,15 +3885,6 @@
</span><span class="cx"> "tonikitoo"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Antoine Quint" : {
- "emails" : [
- "graouts@apple.com",
- "graouts@webkit.org"
- ],
- "nicks" : [
- "graouts"
- ]
- },
</del><span class="cx"> "Antti Koivisto" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "koivisto@iki.fi",
</span><span class="lines">@@ -4291,14 +4291,6 @@
</span><span class="cx"> "ggaren"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Mark Lam" : {
- "emails" : [
- "mark.lam@apple.com"
- ],
- "nicks" : [
- "mlam"
- ]
- },
</del><span class="cx"> "George Staikos" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "staikos@kde.org",
</span><span class="lines">@@ -4674,6 +4666,14 @@
</span><span class="cx"> "mhahnenberg"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Mark Lam" : {
+ "emails" : [
+ "mark.lam@apple.com"
+ ],
+ "nicks" : [
+ "mlam"
+ ]
+ },
</ins><span class="cx"> "Mark Rowe" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "mrowe@bdash.net.nz",
</span><span class="lines">@@ -4899,6 +4899,15 @@
</span><span class="cx"> "rniwa"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><ins>+ "Saam Barati" : {
+ "emails" : [
+ "sbarati@apple.com",
+ "saambarati1@gmail.com"
+ ],
+ "nicks" : [
+ "saamyjoon"
+ ]
+ },
</ins><span class="cx"> "Sam Weinig" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "sam@webkit.org",
</span><span class="lines">@@ -4909,15 +4918,6 @@
</span><span class="cx"> "weinig"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Saam Barati" : {
- "emails" : [
- "sbarati@apple.com",
- "saambarati1@gmail.com"
- ],
- "nicks" : [
- "saamyjoon"
- ]
- },
</del><span class="cx"> "Sergio Villar Senin" : {
</span><span class="cx"> "emails" : [
</span><span class="cx"> "svillar@igalia.com",
</span><span class="lines">@@ -5003,7 +5003,7 @@
</span><span class="cx"> "sfalken"
</span><span class="cx"> ]
</span><span class="cx"> },
</span><del>- "Sukolsak Sakshuwong": {
</del><ins>+ "Sukolsak Sakshuwong" : {
</ins><span class="cx"> "emails" : [
</span><span class="cx"> "sukolsak@gmail.com",
</span><span class="cx"> "ssakshuwong@apple.com"
</span><span class="lines">@@ -5202,4 +5202,4 @@
</span><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-}
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (206966 => 206967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker.py 2016-10-09 07:34:08 UTC (rev 206966)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2016-10-09 16:34:53 UTC (rev 206967)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> from checkers.common import categories as CommonCategories
</span><span class="cx"> from checkers.common import CarriageReturnChecker
</span><ins>+from checkers.contributors import ContributorsChecker
</ins><span class="cx"> from checkers.changelog import ChangeLogChecker
</span><span class="cx"> from checkers.cpp import CppChecker
</span><span class="cx"> from checkers.cmake import CMakeChecker
</span><span class="lines">@@ -603,9 +604,12 @@
</span><span class="cx"> checker = TextChecker(file_path, handle_style_error)
</span><span class="cx"> elif file_type == FileType.JSON:
</span><span class="cx"> basename = os.path.basename(file_path)
</span><del>- if commit_queue and basename == 'contributors.json':
- checker = JSONContributorsChecker(file_path, handle_style_error)
- if basename == 'features.json':
</del><ins>+ if basename == 'contributors.json':
+ if commit_queue:
+ checker = JSONContributorsChecker(file_path, handle_style_error)
+ else:
+ checker = ContributorsChecker(file_path, handle_style_error)
+ elif basename == 'features.json':
</ins><span class="cx"> checker = JSONFeaturesChecker(file_path, handle_style_error)
</span><span class="cx"> else:
</span><span class="cx"> checker = JSONChecker(file_path, handle_style_error)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscontributorspy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/style/checkers/contributors.py (0 => 206967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/contributors.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/contributors.py 2016-10-09 16:34:53 UTC (rev 206967)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+# Copyright (C) 2016 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Checks WebKit style for the contributors.json file."""
+
+import difflib
+import json
+import re
+from sets import Set
+from jsonchecker import JSONChecker
+from webkitpy.common.config.committers import CommitterList
+from webkitpy.common.system.filesystem import FileSystem
+
+
+class ContributorsChecker(JSONChecker):
+ """Processes contributors.json lines"""
+
+ def __init__(self, file_path, handle_style_error):
+ super(ContributorsChecker, self).__init__(file_path, handle_style_error)
+ self._file_path = file_path
+
+ def check(self, lines):
+ super(ContributorsChecker, self).check(lines)
+ canonicalized = CommitterList().as_json()
+ actual = FileSystem().read_text_file(self._file_path)
+ diff = self._unidiff_output(actual, canonicalized)
+ if diff:
+ self._handle_style_error(0, 'json/syntax', 5, 'contributors.json differs from the canonical format. Use "validate-committer-lists --canonicalize" to reformat it.')
+ print diff
+
+ def _unidiff_output(self, expected, actual):
+ expected = expected.splitlines(1)
+ actual = actual.splitlines(1)
+ diff = difflib.unified_diff(expected, actual)
+ return ''.join(diff)
</ins></span></pre>
</div>
</div>
</body>
</html>