Attachment 371249 Details for Bug 198517 – Patch

[patch] Patch

bug-198517-20190603223956.patch (text/plain), 10.16 KB, created by Tim Horton on 2019-06-03 22:39:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2019-06-03 22:39:57 PDT

Size: 10.16 KB

patch

obsolete

>Subversion Revision: 246013
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 288349033ceec728bdcd2b28d92272549e0c674c..25a3cceda253be27d9dea813ba31715816239f93 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,30 @@
>+2019-06-03  Tim Horton  <timothy_horton@apple.com>
>+
>+        Make it possible for validate-committer-lists to dump a mailmap file
>+        https://bugs.webkit.org/show_bug.cgi?id=198517
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Mailmaps wildly improve the output of various Git tools, including
>+        `git shortlog -sne`, mapping committers to our canonical name/email pair.
>+
>+        * Scripts/validate-committer-lists:
>+        (CommitterListFromGit):
>+        (CommitterListBugzillaChecker.print_committers_with_invalid_bugzilla_emails):
>+        Add some missing legacy username mappings.
>+
>+        (dump_mailmap):
>+        (dump_mailmap.format_email):
>+        (dump_mailmap.format_email_with_gitsvn_uuid):
>+        (dump_mailmap.map_emails_to_legacy_username):
>+        (main):
>+        Add `validate-committer-lists --dump-mailmap`, which generates
>+        one given committers.json and the existing mapping of legacy username
>+        to email addresses that exists in validate-committer-lists.
>+
>+        * Scripts/webkitpy/common/config/contributors.json:
>+        Add some historical email addresses for people as aliases to improve mapping.
>+
> 2019-05-31  Sihui Liu  <sihui_liu@apple.com>
> 
>         TestWebKitAPI.WKWebView.LocalStorageProcessSuspends is flaky
>diff --git a/Tools/Scripts/validate-committer-lists b/Tools/Scripts/validate-committer-lists
>index 0ba4b7ed31150770875485147f23991477a67ec5..2d9c4ee0c636cbe3b7128b7de27c136e77148358 100755
>--- a/Tools/Scripts/validate-committer-lists
>+++ b/Tools/Scripts/validate-committer-lists
>@@ -121,20 +121,39 @@ class CommitterListFromMailingList(object):
> 
> class CommitterListFromGit(object):
>     login_to_email_address = {
>+        'aboule' : 'aboule@apple.com',
>+        'adachan' : 'adachan@apple.com',
>+        'adele' : 'adele@apple.com',
>         'aliceli1' : 'alice.liu@apple.com',
>+        'alp' : 'alp@nuanti.com',
>+        'andersca' : 'andersca@apple.com',
>+        'antti' : 'koivisto@iki.fi',
>+        'ap' : 'ap@webkit.org',
>+        'aroben' : 'aroben@webkit.org',
>+        'bdakin' : 'bdakin@apple.com',
>         'bdash' : 'mrowe@apple.com',
>         'bdibello' : 'bdibello@apple.com', # Bruce DiBello, only 4 commits: r10023, r9548, r9538, r9535
>+        'beidson' : 'beidson@apple.com',
>         'cblu' : 'cblu@apple.com',
>         'cpeterse' : 'cpetersen@apple.com',
>+        'darin' : 'darin@apple.com',
>+        'ddkilzer' : 'ddkilzer@webkit.org',
>+        'dsmith' : 'catfish.man@gmail.com',
>         'eseidel' : 'eric@webkit.org',
>         'gdennis' : 'gdennis@webkit.org',
>+        'ggaren' : 'ggaren@apple.com',
>         'goldsmit' : 'goldsmit@apple.com', # Debbie Goldsmith, only one commit r8839
>         'gramps' : 'gramps@apple.com',
>+        'harrison' : 'harrison@apple.com',
>+        'hausmann' : 'hausmann@webkit.org',
>         'honeycutt' : 'jhoneycutt@apple.com',
>+        'hyatt' : 'hyatt@apple.com',
>         'jdevalk' : 'joost@webkit.org',
>         'jens' : 'jens@apple.com',
>         'justing' : 'justin.garcia@apple.com',
>         'kali' : 'kali@apple.com', # Christy Warren, did BIDI work, 5 commits: r8815, r8802, r8801, r8791, r8773, r8603
>+        'kdecker' : 'kdecker@apple.com',
>+        'kevino' : 'kevino@theolliviers.com',
>         'kjk' : 'kkowalczyk@gmail.com',
>         'kmccullo' : 'kmccullough@apple.com',
>         'kocienda' : 'kocienda@apple.com',
>@@ -143,18 +162,30 @@ class CommitterListFromGit(object):
>         'lweintraub' : 'lweintraub@apple.com',
>         'lypanov' : 'lypanov@kde.org',
>         'mhay' : 'mhay@apple.com', # Mike Hay, 3 commits: r3813, r2552, r2548
>+        'mitz' : 'mitz@webkit.org',
>+        'mjs' : 'mjs@apple.com',
>+        'oliver' : 'oliver@apple.com',
>         'ouch' : 'ouch@apple.com', # John Louch
>+        'pewtermoose' : 'dev+webkit@mattlilek.com',
>         'pyeh' : 'patti@apple.com', # Patti Yeh, did VoiceOver work in WebKit
>         'rjw' : 'rjw@apple.com',
>+        'rwlbuis' : 'rwlbuis@gmail.com',
>         'seangies' : 'seangies@apple.com', # Sean Gies?, only 5 commits: r16600, r16592, r16511, r16489, r16484
>+        'sfalken' : 'sfalken@apple.com',
>         'sheridan' : 'sheridan@apple.com', # Shelly Sheridan
>+        'slewis' : 'slewis@apple.com',
>+        'staikos' : 'staikos@kde.org',
>+        'sullivan' : 'sullivan@apple.com',
>         'thatcher' : 'timothy@apple.com',
>         'tomernic' : 'timo@apple.com',
>+        'treat' : 'manyoso@yahoo.com',
>         'trey' : 'trey@usa.net',
>         'tristan' : 'tristan@apple.com',
>         'vicki' : 'vicki@apple.com',
>         'voas' : 'voas@apple.com', # Ed Voas, did some Carbon work in WebKit
>+        'weinig' : 'sam@webkit.org',
>         'zack' : 'zack@kde.org',
>+        'zecke' : 'zecke@selfish.org',
>         'zimmermann' : 'zimmermann@webkit.org',
>     }
> 
>@@ -303,10 +334,40 @@ class CommitterListBugzillaChecker(object):
>         print_list_if_non_empty("Committers with invalid bugzilla email:", committers_with_invalid_bugzilla_email)
> 
> 
>+def dump_mailmap(committer_list):
>+    def format_email(email):
>+        return "<{0}>".format(email)
>+
>+    def format_email_with_gitsvn_uuid(email):
>+        return "<{0}@268f45cc-cd09-0410-ab3c-d52691b4dbfc>".format(email)        
>+
>+    email_to_legacy_username = dict(map(reversed, CommitterListFromGit.login_to_email_address.items()))
>+    def map_emails_to_legacy_username(emails):
>+        legacy_username = None
>+        for email in emails:
>+            legacy_username = email_to_legacy_username.get(email)
>+            if legacy_username:
>+                break
>+        return legacy_username
>+
>+    for contributor in committer_list.contributors():
>+        full_name = contributor.full_name.encode("utf-8")
>+        canonical_email = contributor.bugzilla_email()
>+        other_emails = contributor.emails
>+        legacy_username = map_emails_to_legacy_username(contributor.emails)
>+        if legacy_username:
>+            other_emails.append(legacy_username)
>+
>+        for other_email in other_emails:
>+            print full_name, format_email(canonical_email), format_email(other_email)
>+            print full_name, format_email(canonical_email), format_email_with_uuid(other_email)
>+
>+
> def main():
>     parser = OptionParser()
>     parser.add_option("-b", "--check-bugzilla-emails", action="store_true", help="Check the bugzilla_email for each committer against bugs.webkit.org")
>     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("--dump-mailmap", action="store_true", help="Dump the contributor list as a Git Mailmap to stdout")
>     parser.add_option("-c", "--canonicalize", action="store_true", help="Canonicalize contributors.json, rewriting it in-place")
> 
>     (options, args) = parser.parse_args()
>@@ -314,13 +375,17 @@ def main():
>     committer_list = CommitterList()
>     if options.dump:
>         print committer_list.as_json()
>-        return 0;
>+        return 0
>+
>+    if options.dump_mailmap:
>+        dump_mailmap(committer_list)
>+        return 0
> 
>     if options.canonicalize:
>         print "Updating contributors.json in-place..."
>         committer_list.reformat_in_place()
>         print "Done"
>-        return 0;
>+        return 0
> 
>     CommitterListFromMailingList().check_for_emails_missing_from_list(committer_list)
>  
>diff --git a/Tools/Scripts/webkitpy/common/config/contributors.json b/Tools/Scripts/webkitpy/common/config/contributors.json
>index 828e1b0ee797559ff3ee9f1493ce0f0b0a382d41..e9cf111e7c4133b1adb10630bac99bb7e2129664 100644
>--- a/Tools/Scripts/webkitpy/common/config/contributors.json
>+++ b/Tools/Scripts/webkitpy/common/config/contributors.json
>@@ -1190,7 +1190,8 @@
>    },
>    "ChangSeok Oh" : {
>       "emails" : [
>-         "changseok@webkit.org"
>+         "changseok@webkit.org",
>+         "changseok.oh@collabora.com"
>       ],
>       "expertise" : "The WebKitGTK+ port, H/W acceleration, Layout and Rendering",
>       "nicks" : [
>@@ -2785,7 +2786,8 @@
>    },
>    "Jason Liu" : {
>       "emails" : [
>-         "jasonliuwebkit@gmail.com"
>+         "jasonliuwebkit@gmail.com",
>+         "jason.liu@torchmobile.com.cn"
>       ],
>       "nicks" : [
>          "jasonliu"
>@@ -3769,7 +3771,8 @@
>          "leoyang@rim.com",
>          "leoyang@blackberry.com",
>          "leoyang@webkit.org",
>-         "leoyang.webkit@gmail.com"
>+         "leoyang.webkit@gmail.com",
>+         "leo.yang@torchmobile.com.cn"
>       ],
>       "expertise" : "The BlackBerry Port",
>       "nicks" : [
>@@ -3807,7 +3810,8 @@
>    },
>    "Ling Ho" : {
>       "emails" : [
>-         "lingho@apple.com"
>+         "lingho@apple.com",
>+         "lingcherd_ho@apple.com"
>       ],
>       "expertise" : "webkit.org admin"
>    },
>@@ -4020,7 +4024,8 @@
>    "Mary Wu" : {
>       "emails" : [
>          "mawu@blackberry.com",
>-         "wwendy2007@gmail.com"
>+         "wwendy2007@gmail.com",
>+         "mary.wu@torchmobile.com.cn"
>       ],
>       "nicks" : [
>          "marywu"
>@@ -6033,7 +6038,8 @@
>       "emails" : [
>          "youennf@gmail.com",
>          "youenn@apple.com",
>-         "yfablet@apple.com"
>+         "yfablet@apple.com",
>+         "youenn.fablet@crf.canon.fr"
>       ],
>       "nicks" : [
>          "youenn"
>diff --git a/.gitignore b/.gitignore
>index 8ecdbeb4b8cbe6edfb9864b4823f3a6ae20c542a..5da2c2d7a052ec01def31ae04f9484d83180b2b3 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -11,6 +11,7 @@ build/
> autoinstall.cache.d
> project.xcworkspace
> xcuserdata
>+.mailmap
> 
> # Ignore auto-generated files by VS & VSCode.
> *.vcproj.*.user
>diff --git a/ChangeLog b/ChangeLog
>index 4fb464521d95111461e7b3a7d1b131a226c7a165..e3c65709e3b7a6674c7196970a73fe49caf2762a 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-03  Tim Horton  <timothy_horton@apple.com>
>+
>+        Make it possible for validate-committer-lists to dump a mailmap file
>+        https://bugs.webkit.org/show_bug.cgi?id=198517
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * .gitignore:
>+        Ignore .mailmap files.
>+
> 2019-05-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WEBKIT_FRAMEWORK_TARGET macro

Actions: View | Formatted Diff | Diff

Attachments on bug 198517: 371249 | 372034