Changeset 246414 in webkit
- Timestamp:
- Jun 13, 2019 2:22:21 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r245081 r246414 12 12 project.xcworkspace 13 13 xcuserdata 14 .mailmap 14 15 15 16 # Ignore auto-generated files by VS & VSCode. -
trunk/ChangeLog
r246308 r246414 1 2019-06-13 Tim Horton <timothy_horton@apple.com> 2 3 Make it possible for validate-committer-lists to dump a mailmap file 4 https://bugs.webkit.org/show_bug.cgi?id=198517 5 6 Reviewed by Simon Fraser. 7 8 * .gitignore: 9 Ignore .mailmap files. 10 1 11 2019-06-11 Carlos Garcia Campos <cgarcia@igalia.com> 2 12 -
trunk/Tools/ChangeLog
r246373 r246414 1 2019-06-13 Tim Horton <timothy_horton@apple.com> 2 3 Make it possible for validate-committer-lists to dump a mailmap file 4 https://bugs.webkit.org/show_bug.cgi?id=198517 5 6 Reviewed by Simon Fraser. 7 8 Mailmaps wildly improve the output of various Git tools, including 9 `git shortlog -sne`, mapping committers to our canonical name/email pair. 10 11 * Scripts/validate-committer-lists: 12 (CommitterListFromGit): 13 (CommitterListBugzillaChecker.print_committers_with_invalid_bugzilla_emails): 14 Add some missing legacy username mappings. 15 16 (dump_mailmap): 17 (dump_mailmap.format_email): 18 (dump_mailmap.format_email_with_gitsvn_uuid): 19 (dump_mailmap.map_emails_to_legacy_username): 20 (main): 21 Add `validate-committer-lists --dump-mailmap`, which generates 22 one given committers.json and the existing mapping of legacy username 23 to email addresses that exists in validate-committer-lists. 24 1 25 2019-06-12 Aakash Jain <aakash_jain@apple.com> 2 26 -
trunk/Tools/Scripts/validate-committer-lists
r230010 r246414 122 122 class CommitterListFromGit(object): 123 123 login_to_email_address = { 124 'aboule' : 'aboule@apple.com', 125 'adachan' : 'adachan@apple.com', 126 'adele' : 'adele@apple.com', 124 127 'aliceli1' : 'alice.liu@apple.com', 128 'alp' : 'alp@nuanti.com', 129 'andersca' : 'andersca@apple.com', 130 'antti' : 'koivisto@iki.fi', 131 'ap' : 'ap@webkit.org', 132 'aroben' : 'aroben@webkit.org', 133 'bdakin' : 'bdakin@apple.com', 125 134 'bdash' : 'mrowe@apple.com', 126 135 'bdibello' : 'bdibello@apple.com', # Bruce DiBello, only 4 commits: r10023, r9548, r9538, r9535 136 'beidson' : 'beidson@apple.com', 127 137 'cblu' : 'cblu@apple.com', 128 138 'cpeterse' : 'cpetersen@apple.com', 139 'darin' : 'darin@apple.com', 140 'ddkilzer' : 'ddkilzer@webkit.org', 141 'dsmith' : 'catfish.man@gmail.com', 129 142 'eseidel' : 'eric@webkit.org', 130 143 'gdennis' : 'gdennis@webkit.org', 144 'ggaren' : 'ggaren@apple.com', 131 145 'goldsmit' : 'goldsmit@apple.com', # Debbie Goldsmith, only one commit r8839 132 146 'gramps' : 'gramps@apple.com', 147 'harrison' : 'harrison@apple.com', 148 'hausmann' : 'hausmann@webkit.org', 133 149 'honeycutt' : 'jhoneycutt@apple.com', 150 'hyatt' : 'hyatt@apple.com', 134 151 'jdevalk' : 'joost@webkit.org', 135 152 'jens' : 'jens@apple.com', 136 153 'justing' : 'justin.garcia@apple.com', 137 154 'kali' : 'kali@apple.com', # Christy Warren, did BIDI work, 5 commits: r8815, r8802, r8801, r8791, r8773, r8603 155 'kdecker' : 'kdecker@apple.com', 156 'kevino' : 'kevino@theolliviers.com', 138 157 'kjk' : 'kkowalczyk@gmail.com', 139 158 'kmccullo' : 'kmccullough@apple.com', … … 144 163 'lypanov' : 'lypanov@kde.org', 145 164 'mhay' : 'mhay@apple.com', # Mike Hay, 3 commits: r3813, r2552, r2548 165 'mitz' : 'mitz@webkit.org', 166 'mjs' : 'mjs@apple.com', 167 'oliver' : 'oliver@apple.com', 146 168 'ouch' : 'ouch@apple.com', # John Louch 169 'pewtermoose' : 'dev+webkit@mattlilek.com', 147 170 'pyeh' : 'patti@apple.com', # Patti Yeh, did VoiceOver work in WebKit 148 171 'rjw' : 'rjw@apple.com', 172 'rwlbuis' : 'rwlbuis@gmail.com', 149 173 'seangies' : 'seangies@apple.com', # Sean Gies?, only 5 commits: r16600, r16592, r16511, r16489, r16484 174 'sfalken' : 'sfalken@apple.com', 150 175 'sheridan' : 'sheridan@apple.com', # Shelly Sheridan 176 'slewis' : 'slewis@apple.com', 177 'staikos' : 'staikos@kde.org', 178 'sullivan' : 'sullivan@apple.com', 151 179 'thatcher' : 'timothy@apple.com', 152 180 'tomernic' : 'timo@apple.com', 181 'treat' : 'manyoso@yahoo.com', 153 182 'trey' : 'trey@usa.net', 154 183 'tristan' : 'tristan@apple.com', 155 184 'vicki' : 'vicki@apple.com', 156 185 'voas' : 'voas@apple.com', # Ed Voas, did some Carbon work in WebKit 186 'weinig' : 'sam@webkit.org', 157 187 'zack' : 'zack@kde.org', 188 'zecke' : 'zecke@selfish.org', 158 189 'zimmermann' : 'zimmermann@webkit.org', 159 190 } … … 304 335 305 336 337 def dump_mailmap(committer_list): 338 def format_email(email): 339 return "<{0}>".format(email) 340 341 def format_email_with_gitsvn_uuid(email): 342 return "<{0}@268f45cc-cd09-0410-ab3c-d52691b4dbfc>".format(email) 343 344 email_to_legacy_username = dict(map(reversed, CommitterListFromGit.login_to_email_address.items())) 345 def map_emails_to_legacy_username(emails): 346 legacy_username = None 347 for email in emails: 348 legacy_username = email_to_legacy_username.get(email) 349 if legacy_username: 350 break 351 return legacy_username 352 353 for contributor in committer_list.contributors(): 354 full_name = contributor.full_name.encode("utf-8") 355 canonical_email = contributor.bugzilla_email() 356 other_emails = contributor.emails 357 legacy_username = map_emails_to_legacy_username(contributor.emails) 358 if legacy_username: 359 other_emails.append(legacy_username) 360 361 for other_email in other_emails: 362 print full_name, format_email(canonical_email), format_email(other_email) 363 print full_name, format_email(canonical_email), format_email_with_uuid(other_email) 364 365 306 366 def main(): 307 367 parser = OptionParser() 308 368 parser.add_option("-b", "--check-bugzilla-emails", action="store_true", help="Check the bugzilla_email for each committer against bugs.webkit.org") 309 369 parser.add_option("-d", "--dump", action="store_true", help="Dump the contributor list as JSON to stdout (suitable for saving to contributors.json)") 370 parser.add_option("--dump-mailmap", action="store_true", help="Dump the contributor list as a Git Mailmap to stdout") 310 371 parser.add_option("-c", "--canonicalize", action="store_true", help="Canonicalize contributors.json, rewriting it in-place") 311 372 … … 315 376 if options.dump: 316 377 print committer_list.as_json() 317 return 0; 378 return 0 379 380 if options.dump_mailmap: 381 dump_mailmap(committer_list) 382 return 0 318 383 319 384 if options.canonicalize: … … 321 386 committer_list.reformat_in_place() 322 387 print "Done" 323 return 0 ;388 return 0 324 389 325 390 CommitterListFromMailingList().check_for_emails_missing_from_list(committer_list)
Note: See TracChangeset
for help on using the changeset viewer.