diff --git a/.mailmap b/.mailmap index aad595f12458fa..a314fe408f0455 100644 --- a/.mailmap +++ b/.mailmap @@ -21,6 +21,7 @@ Alfred Cepeda ALJCepeda Allen Yonghuang Wang Amery 子丶言 Amit Bendor +Anatoli Papirovski Andreas Offenhaeuser anoff Andy Bettisworth Angel Stoyanov atstojanov @@ -42,6 +43,7 @@ Ben Lugavere blugavere Ben Noordhuis Ben Noordhuis Ben Taber +Benjamin Coe Benjamin Fleischer Benjamin Fleischer Benjamin Gruenbaum Benjamin Waters @@ -72,6 +74,8 @@ Chew Choon Keat Chris Andrews cpandrews8 Chris Johnson Chris Young +Christian Clauss +Christian Clauss Christophe Naud-Dulude Chris911 Christopher Lenz Claudio Rodriguez @@ -80,7 +84,7 @@ Corey Martin Damien Simonin Feugas Dan Kaplun Dan Williams Dan.Williams -Daniel Abrão Daniel Abrão > +Daniel Abrão Daniel Abrão Daniel Bevenius daniel.bevenius Daniel Berger Daniel Chcouri <333222@gmail.com> @@ -94,8 +98,9 @@ Danny Nemer Danny Nemer Dave Pacheco David Cai DavidCai -David Mark Clements davidmarkclements -David Mark Clements davidmarkclements +David Mark Clements +David Mark Clements +David Mark Clements David Siegel DC dcposch@dcpos.ch Deepjyoti Mondal @@ -266,7 +271,7 @@ Mitar Milutinovic Myles Borins Myles Borins Nam Nguyen -Nebu Pookins +Nebu Pookins Netto Farah nettofarah Nicholas Kinsey Nick Soggin @@ -410,6 +415,8 @@ Yazhong Liu Yorkie Yazhong Liu Yorkie Yazhong Liu Yorkie Liu Yingchen Xue +Yongsheng Zhang +Yongsheng Zhang <17367077526@163.com> Yoshihiro KIKUCHI Yosuke Furukawa Yuichiro MASUI diff --git a/AUTHORS b/AUTHORS index c46bf7939a7a10..f1d2517b554a22 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1661,11 +1661,10 @@ Cyril Lakech Eduard Bondarenko Adina Shanholtz Guy Bedford -Jan Krems Miguel Martins Yury Popov George Bezerra -Benjamin Coe +Benjamin Coe Tim Costa Rahul Mishra Damien O'Reilly @@ -2249,6 +2248,7 @@ Sam Ruby Haroon Khan Developer Davo Jacek Pospychała +MaleDong iwko Sohail Rajdev Niicck @@ -2276,9 +2276,8 @@ Jacob Page sagulati conectado Vitor Bruno de Oliveira Barth -cclauss +Christian Clauss James Ide -MaleDong bhavayAnand9 Brandon Lee <40652534+brandonlwt@users.noreply.github.com> Oryan Moshe @@ -2302,7 +2301,7 @@ Dzmitry_Prudnikau Ian McKellar Jennifer Bland Kyle Fuller -ZYSzys +Yongsheng Zhang Neeraj Laad Scott Van Gilder Yaniv Friedensohn @@ -2316,5 +2315,373 @@ Ben Newman Szymon Marczak Tessei Kameyama Chakravarthy S M +Andreas Haas +Saud Khanzada +Hariss096 +William Skellenger +iliashkolyar +Tien Do +Sagi Tsofan +Mohammed Essehemy +chocolateboy +William Chargin +Mohit kumar Bajoria +Mark Abel +Alexander Mills +Rodrigo Bruno +Lovingly <42682205+lovinglyy@users.noreply.github.com> +Klaus Meinhardt +Jennifer Bland +Sintendo +Nitish Sakhawalkar +André Cruz +Josh Broomfield +Julien Gilli +Umang Raghuvanshi +Duarte David +Aleksey Chemakin +siddhant <30566406+siddhant1@users.noreply.github.com> +Brandon Smith +Bastian Krol +Vitaly Dyatlov +Joe Sepi +et4891 +Kayla Altepeter +Shannon +David Xue +garrik.leonardo@gmail.com +jungkumseok +Khalid Adil +Jared Haines +Danu Widatama +mmisiarek +Andrew Eisenberg +Ivan Sieder +andy addington +Matt Holmes +epeden +mdaum +Richard Markins +Denny Scott +Amie +Maggie Nolan +S. Everett Abbott +James Traver +Emily Kolar +Yitong +Tim Cheung +Lian Li +Dylson Valente Neto +ashleysimpson +Paige Kato +Stephen Heitman +Muzafar Umarov +Quinn Langille +Bruce A. MacNaughton +Ian Sutherland +Rock Hu +Stacey +Matt Jiles +Claire Liu +Michal Hynek +David Corona +Anna Zhao +Diana Holland +Chris Nguyen +Artur Hayrapetyan +Carolina Pinzon +Carl Richmond +Felix Schlenkrich +chrisforrette +@CAYdenberg <@CAYdenberg> +Long Nguyen +Greg Goforth +scabhi +Robert Monks +Andrew MacCuaig +Milton Sosa +Illescas, Ricardo +Jean-Francois Arseneau +Viacheslav Liakhov +David Scott +Daniyal Mokhammad +Joshua Belcher +Jonny Kalambay +Pascal Lambert +Arne Schramm +Lee Gray +Randy Wressell +Tyler Vann-Campbell +surreal8 +Takdeer Sodhan +Ben Schaaf +David Ward +Elvis-Philip N +edgarzapeka +Michael Chen +MarianneDr +Marcos Frony +Andrew J D McCann +nofwayy +jaxyz +ssamuels0916 +Diana Lee +Oktavianus Ludiro +Eli Itah +Sean Healy +KelvinLawHF1 +Cody Hazelwood +Erin Bush +Allan Zheng +Ivan Lukasevych +Justin denBroeder +Chris Bautista +Joe Grosspietsch +naris93 +Victor Poriazov +peter +Jackelin Herrera +Murtaza H <1850989+mhussa19@users.noreply.github.com> +Clinton Pahl +Maki Toda +Jason Nutter +blakehall +seantcoyote +Salman Shakeel +Liran Tal +Joe Shindelar +AlixAng +francois +Saleh Abdel Motaal +Richard Hoehn +Ethan Weber +Pete Lombardo +Savio Resende +Mel +keeysnc +erickwendel +Martin Omander +Jeff Marvin +vchoubey08 +Stéphane Vasseur +Vsevolod Geraskin +Israel Ortiz +Paul Tichonczuk +Gino Notto +David Jiang +Chuck Theobald +Derek +Amanuel Ghebreweldi +christian-bromann +Jonathan Samines +Steven Auger +Nancy Truong +James Irwin +nick-ng +Dusan Radovanovic +jn99 +Ulises Gascón +Elian Gutierrez +Jose Bucio +Thomas GENTILHOMME +Romain Lanz +Andre Jodat-Danbrani +Nolan Rigo +Jonathan Cardoso Machado +Raoof +Loic +Denis McDonald +Arvind Pandey +Jagannath Bhat +Geoffrey Booth +mritunjaygoutam12 +Esteban Sotillo +Jerome Covington +Rob Reynolds +warnerp18 +chux0519 +Tadhg Creedon +Petar Dodev +mzucker +Morgan Roderick +Remy Parzinski +Roland Broekema +Florin-Daniel BÎLBÎE +Robin Drexler +ZauberNerd +G. Carcaci +Jackson Chui <14085209+haiXchuus@users.noreply.github.com> +Marc Posth +Simona Cotin +Mathieu Pavageau +Clement +razvanbh +reineke-fox +Mark Arranz +alyssaq +Manish Poddar +szabolcsit +Kevin Seidel +Jonah Polack +Paul Isache +Artur Daschevici +Grant Carthew +Alex Seifert +Amer Alimanović +Nikita Malyschkin +ivan.filenko +Marcus Scott +Berry de Witte +saurabhSiddhu +Marie Terrier +John Mc Quillan +Ulises Santana Suárez +Yehiyam Livneh +Aivo Paas +James Herrington +Natalie Cluer +Dmitry Igrishin +Martin Kask +Alessandro Gatti +Vladyslav Kopylash +Osmond van Hemert +msmichellegar +Robert Pamely +Lauri Piisang +kiyomizumia +Paul Hodgson +Emanuel Kluge +Andrey Melikhov +Philipp Dunkel +Steven Gabarro +Dan Corman +Rodger Combs +Charalampos Fanoulis <38255093+cfanoulis@users.noreply.github.com> +Julia +Kanika Singhal +Gagandeep Singh +Lakshmi Shanmugam +Jayasankar +Pushkal B +potham +Shubham Urkade +Nikhil M +leeight +Selvaraj +Mayank Asthana +Simon Bruce +NoSkillGirl +apoorvanand +Jay Arthanareeswaran +Amanpreet +kanishk30 +UjjwalUpadhyay +Namit Bhalla +Matteo +dexterleng +Kunda Sunil Kumar +rahulshuklab4u +gengjiawen +Maya Anilson +Mrityunjoy Saha +Robin Drexler +Prabu Subra +Abhishek Dixit +Sarath Govind K K +Dexter Leng +Gary Hsu +Dan Foley +Pranay Kothapalli +Nethra Ravindran +Juan José Arboleda +prodroy1 +Yusuke Kawasaki +yuriettys +sadness_ojisan +ka2jun8 +sota1235 +dominikeinkemmer +mki-skt +Laszlo.Moczo +jamesgeorge007 +koki-oshima +takato +yosuke ota +tottokotkd +kazuya kawaguchi +Naojirou Hisada +tpanthera +feng jianmei +DoiChris +VeysonD +susantruong +Takahiro Nakamura +Daiki Arai +horihiro +grimrose +timothy searcy +nakashima +/Jesse +Tadhg Creedon +exoego +sigwyg +pastak +lakatostamas +Mike Samuel +Suguru Motegi +Gerhard Stoebich <18708370+Flarna@users.noreply.github.com> +jy95 +Kenigbolo Meya Stephen +Charles Samborski +zhmushan +yoshimoto koki +Ilarion Halushka +Yael Hermon +Mitch Hankins +Mikko Rantanen +wenjun ye <1728914873@qq.com> +briete +Philipp Renoth +Audrey Eschright +Kazushi Kitaya +peterwmwong +Thomas Chung +Jordan Harband +P. Mike +Corey Farrell +Furqan Shaikh +Roy Sommer +James Bunton +Kevin Smith +Minwoo Jung +H1Gdev +Julian Alimin +Lakshmi Swetha Gopireddy +Manusaporn Treerungroj +Richard Chamberlain +Daniel George Holz +yathamravali +Tim De Pauw +Filip Skokan +Samuel D. Leslie +Eric Whitebloom +Lee Byron +Kei Ito +Albert Still +Raido Kuli +Robin Neatherway +Andrew Moss +Amit Zur +Thang Tran +Kai +Abhishek Agarwal +Uttam Pawar +Jon Kunkee +Mukul Khanna +Jarrod Connolly +Michael Wei +Alexander Sattelmaier +Avi ד +Thomas # Generated by tools/update-authors.js diff --git a/tools/update-authors.js b/tools/update-authors.js index 1c48eaec85c823..3d7fcb14b2f461 100755 --- a/tools/update-authors.js +++ b/tools/update-authors.js @@ -3,6 +3,7 @@ // Passing --dry will redirect output to stdout rather than write to 'AUTHORS'. 'use strict'; const { spawn } = require('child_process'); +const path = require('path'); const fs = require('fs'); const readline = require('readline'); @@ -22,6 +23,38 @@ else output.write('# Authors ordered by first contribution.\n\n'); +const mailmap = new Map(); +{ + const lines = fs.readFileSync(path.resolve(__dirname, '../', '.mailmap'), + { encoding: 'utf8' }).split('\n'); + for (let line of lines) { + line = line.trim(); + if (line.startsWith('#') || line === '') continue; + + let match; + // Replaced Name + if (match = line.match(/^([^<]+)\s+(<[^>]+>)$/)) { + mailmap.set(match[2], { author: match[1] }); + // + } else if (match = line.match(/^<([^>]+)>\s+(<[^>]+>)$/)) { + mailmap.set(match[2], { email: match[1] }); + // Replaced Name + } else if (match = line.match(/^([^<]+)\s+(<[^>]+>)\s+(<[^>]+>)$/)) { + mailmap.set(match[3], { + author: match[1], email: match[2] + }); + // Replaced Name Original Name + } else if (match = + line.match(/^([^<]+)\s+(<[^>]+>)\s+([^<]+)\s+(<[^>]+>)$/)) { + mailmap.set(match[3] + '\0' + match[4], { + author: match[1], email: match[2] + }); + } else { + console.warn('Unknown .mailmap format:', line); + } + } +} + const seen = new Set(); // Support regular git author metadata, as well as `Author:` and @@ -34,7 +67,13 @@ rl.on('line', (line) => { const match = line.match(authorRe); if (!match) return; - const { author, email } = match.groups; + let { author, email } = match.groups; + + const replacement = mailmap.get(author + '\0' + email) || mailmap.get(email); + if (replacement) { + ({ author, email } = { author, email, ...replacement }); + } + if (seen.has(email) || /@chromium\.org/.test(email) || email === '') {