Skip to content

Commit 1d8c354

Browse files
dmitshurdmitshur
committed
internal/gophers: restore valid Gerrit emails
CL 132995 made a lot of changes to the gophers table based on the output of gopherstats -mode=find-gerrit-gophers, which is a new cmd/gopherstats mode added in that very CL. The current implementation of Person.mergeIDs makes it so that the first email seen is considered the Gerrit email. Many of the additions of CL 132995 did not take that into account, causing the Gerrit field to change for some gophers incorrectly. Overall, that CL caused the following changes to gophers: Github field changes: [email protected]: GitHub="" -> "TomOnTime" Carl Henrik Lunde: GitHub="" -> "chlunde" Dieter Plaetinck: GitHub="" -> "Dieterbe" Diogo Pinela: GitHub="" -> "dpinela" Frank Schroeder: GitHub="" -> "magiconair" Gregory Man: GitHub="" -> "gregory-m" Jan Berktold: GitHub="" -> "JanBerktold" Jean de Klerk: GitHub="" -> "jadekler" Josselin Costanzi: GitHub="" -> "josselin-c" Martin Garton: GitHub="MartinGarton" -> "mjgarton" Matt Harden: GitHub="" -> "nerdatmath" Michael Darakananda: GitHub="" -> "pongad" Mostyn Bramley-Moore: GitHub="" -> "mostynb" Nicholas Maniscalco: GitHub="" -> "nicholasmaniscalco" Roland Illig: GitHub="" -> "rillig" Yasha Bubnov: GitHub="" -> "ybubnov" Zheng Xu: GitHub="" -> "Zheng-Xu" ltnwgl: GitHub="" -> "gengliangwang" oiooj: GitHub="" -> "oiooj" thoeni: GitHub="" -> "thoeni" Gerrit field changes: Andrew Bonventre: Gerrit="[email protected]" -> "[email protected]" Carl Mastrangelo: Gerrit="[email protected]" -> "[email protected]" Chris McGee: Gerrit="[email protected]" -> "[email protected]" Eric Lagergren: Gerrit="[email protected]" -> "[email protected]" Filippo Valsorda: Gerrit="[email protected]" -> "6195@62eb7196-b449-3ce5-99f1-c037f21e1705" Guillaume J. Charmes: Gerrit="[email protected]" -> "[email protected]" Harshavardhana: Gerrit="[email protected]" -> "[email protected]" Jean de Klerk: Gerrit="[email protected]" -> "[email protected]" Joe Tsai: Gerrit="[email protected]" -> "[email protected]" Martin Möhrmann: Gerrit="[email protected]" -> "[email protected]" Matthew Dempsky: Gerrit="[email protected]" -> "[email protected]" Olivier Poitrey: Gerrit="[email protected]" -> "[email protected]" Paul Jolly: Gerrit="[email protected]" -> "[email protected]" Ralph Corderoy: Gerrit="[email protected]" -> "[email protected]" Raul Silvera: Gerrit="[email protected]" -> "[email protected]" Richard Miller: Gerrit="[email protected]" -> "[email protected]" Sebastien Binet: Gerrit="[email protected]" -> "[email protected]" Tobias Klauser: Gerrit="[email protected]" -> "[email protected]" Vitor De Mario: Gerrit="[email protected]" -> "[email protected]" Googler field changes: Aaron Kemp: Googler=false -> true Jason Hall: Googler=false -> true Jean de Klerk: Googler=false -> true (It also caused many emails to be added, but I'm not considering those changes since they're not relevant to golang/go#27517 and aren't causing harm.) All of the Github and Googler field changes are good, but not all of the Gerrit field changes are good. I've manually checked them against the go-review.googlesource.com Gerrit server, and classified them as follows: bad Andrew Bonventre: Gerrit="[email protected]" -> "[email protected]" bad Carl Mastrangelo: Gerrit="[email protected]" -> "[email protected]" ok Chris McGee: Gerrit="[email protected]" -> "[email protected]" bad Eric Lagergren: Gerrit="[email protected]" -> "[email protected]" bad Filippo Valsorda: Gerrit="[email protected]" -> "6195@62eb7196-b449-3ce5-99f1-c037f21e1705" bad Guillaume J. Charmes: Gerrit="[email protected]" -> "[email protected]" bad Harshavardhana: Gerrit="[email protected]" -> "[email protected]" ok Jean de Klerk: Gerrit="[email protected]" -> "[email protected]" bad Joe Tsai: Gerrit="[email protected]" -> "[email protected]" bad Martin Möhrmann: Gerrit="[email protected]" -> "[email protected]" bad Matthew Dempsky: Gerrit="[email protected]" -> "[email protected]" ok Olivier Poitrey: Gerrit="[email protected]" -> "[email protected]" bad Paul Jolly: Gerrit="[email protected]" -> "[email protected]" bad Ralph Corderoy: Gerrit="[email protected]" -> "[email protected]" bad Raul Silvera: Gerrit="[email protected]" -> "[email protected]" ok Richard Miller: Gerrit="[email protected]" -> "[email protected]" bad Sebastien Binet: Gerrit="[email protected]" -> "[email protected]" bad Tobias Klauser: Gerrit="[email protected]" -> "[email protected]" bad Vitor De Mario: Gerrit="[email protected]" -> "[email protected]" I considered any @google.com -> [email protected] changes as bad. For the rest, it was based on which email was recognized by the Gerrit server and had more activity overall, as well as recently. This CL undoes all the bad Gerrit field changes, reverting them to their original pre-CL 132995 values. It also changes the Gerrit email for Gopherbot, and cleans up my own entry. That leaves just: Gerrit field changes: Chris McGee: Gerrit="[email protected]" -> "[email protected]" Jean de Klerk: Gerrit="[email protected]" -> "[email protected]" Olivier Poitrey: Gerrit="[email protected]" -> "[email protected]" Richard Miller: Gerrit="[email protected]" -> "[email protected]" In future CLs, we'll need to be careful with the order in which emails are added, until golang/go#27631 is resolved. Updates golang/go#27631. Fixes golang/go#27517. Change-Id: I6bd289af6ea2c50c293c4576de3873658994b98a Reviewed-on: https://go-review.googlesource.com/135456 Reviewed-by: Andrew Bonventre <[email protected]>
1 parent 431df8c commit 1d8c354

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎internal/gophers/gophers.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func addPerson(ids ...string) *Person {
9494

9595
func init() {
9696
// Not people, but hereby granted personhood:
97-
addPerson("Gopherbot", "5976@62eb7196-b449-3ce5-99f1-c037f21e1705", "[email protected]", "@gopherbot", "*bot")
97+
addPerson("Gopherbot", "[email protected]", "@gopherbot", "5976@62eb7196-b449-3ce5-99f1-c037f21e1705", "*bot")
9898
addPerson("Gerrit Bot", "[email protected]", "12446@62eb7196-b449-3ce5-99f1-c037f21e1705", "*bot")
9999

100100
addPerson("212472270", "[email protected]", "@ggriffiths")
@@ -287,9 +287,9 @@ func init() {
287287
addPerson("Andres Erbsen", "[email protected]")
288288
addPerson("Andrew Austin", "[email protected]", "@andrewaustin")
289289
addPerson("Andrew Benton", "[email protected]", "@andrewmbenton")
290+
addPerson("Andrew Bonventre", "[email protected]", "[email protected]", "@andybons")
290291
addPerson("Andrew Bonventre", "[email protected]")
291292
addPerson("Andrew Bonventre", "[email protected]", "22285@62eb7196-b449-3ce5-99f1-c037f21e1705")
292-
addPerson("Andrew Bonventre", "[email protected]", "[email protected]", "@andybons")
293293
addPerson("Andrew Bonventre", "[email protected]", "10660@62eb7196-b449-3ce5-99f1-c037f21e1705")
294294
addPerson("Andrew Bonventre", "[email protected]")
295295
addPerson("Andrew Brampton", "[email protected]")
@@ -525,10 +525,10 @@ func init() {
525525
addPerson("Carl Jackson", "[email protected]", "@carl-stripe")
526526
addPerson("Carl Johnson", "[email protected]", "12425@62eb7196-b449-3ce5-99f1-c037f21e1705")
527527
addPerson("Carl Johnson", "[email protected]", "@carlmjohnson")
528+
addPerson("Carl Mastrangelo", "[email protected]", "@carl-mastrangelo")
528529
addPerson("Carl Mastrangelo", "[email protected]")
529530
addPerson("Carl Mastrangelo", "[email protected]")
530531
addPerson("Carl Mastrangelo", "[email protected]", "12225@62eb7196-b449-3ce5-99f1-c037f21e1705")
531-
addPerson("Carl Mastrangelo", "[email protected]", "@carl-mastrangelo")
532532
addPerson("Carlisia Campos", "[email protected]", "@carlisia")
533533
addPerson("Carlo Alberto Ferraris", "[email protected]", "11500@62eb7196-b449-3ce5-99f1-c037f21e1705")
534534
addPerson("Carlo Alberto Ferraris", "[email protected]", "@CAFxX")
@@ -829,8 +829,8 @@ func init() {
829829
addPerson("Dirk Gadsden", "[email protected]", "@dirk")
830830
addPerson("Diwaker Gupta", "[email protected]", "@diwakergupta")
831831
addPerson("Dmitri Popov", "[email protected]", "@pin")
832-
addPerson("Dmitri Shuralyov", "[email protected]", "6005@62eb7196-b449-3ce5-99f1-c037f21e1705")
833832
addPerson("Dmitri Shuralyov", "[email protected]", "[email protected]", "[email protected]", "@dmitshur")
833+
addPerson("Dmitri Shuralyov", "[email protected]", "6005@62eb7196-b449-3ce5-99f1-c037f21e1705")
834834
addPerson("Dmitriy Dudkin", "[email protected]", "@tmwh")
835835
addPerson("Dmitriy", "[email protected]")
836836
addPerson("Dmitry Chestnykh", "[email protected]", "@dchest")
@@ -909,9 +909,9 @@ func init() {
909909
addPerson("Eric Garrido", "[email protected]", "@minusnine")
910910
addPerson("Eric Hopper", "[email protected]")
911911
addPerson("Eric Koleda", "[email protected]")
912+
addPerson("Eric Lagergren", "[email protected]", "@ericlagergren")
912913
addPerson("Eric Lagergren", "[email protected]", "@ericlagergren")
913914
addPerson("Eric Lagergren", "[email protected]", "7276@62eb7196-b449-3ce5-99f1-c037f21e1705")
914-
addPerson("Eric Lagergren", "[email protected]", "@ericlagergren")
915915
addPerson("Eric Milliken", "[email protected]", "@emilliken")
916916
addPerson("Eric Pauley", "[email protected]", "@ericpauley")
917917
addPerson("Eric Ponce", "[email protected]", "@trico")
@@ -979,10 +979,10 @@ func init() {
979979
addPerson("Filip Haglund", "[email protected]")
980980
addPerson("Filip Ochnik", "[email protected]")
981981
addPerson("Filip Stanis", "[email protected]")
982+
addPerson("Filippo Valsorda", "[email protected]", "[email protected]", "@FiloSottile")
982983
addPerson("Filippo Valsorda", "", "6195@62eb7196-b449-3ce5-99f1-c037f21e1705")
983984
addPerson("Filippo Valsorda", "[email protected]")
984985
addPerson("Filippo Valsorda", "[email protected]", "11715@62eb7196-b449-3ce5-99f1-c037f21e1705")
985-
addPerson("Filippo Valsorda", "[email protected]", "[email protected]", "@FiloSottile")
986986
addPerson("Firmansyah Adiputra", "[email protected]", "@frm-adiputra")
987987
addPerson("Florian Forster", "[email protected]", "@octo")
988988
addPerson("Florian Uekermann", "[email protected]", "13410@62eb7196-b449-3ce5-99f1-c037f21e1705")
@@ -1078,8 +1078,8 @@ func init() {
10781078
addPerson("Guilherme Rezende", "[email protected]", "22856@62eb7196-b449-3ce5-99f1-c037f21e1705")
10791079
addPerson("Guilherme Rezende", "[email protected]", "@guilhermebr")
10801080
addPerson("Guilherme Santos", "[email protected]")
1081-
addPerson("Guillaume J. Charmes", "[email protected]")
10821081
addPerson("Guillaume J. Charmes", "[email protected]", "@creack")
1082+
addPerson("Guillaume J. Charmes", "[email protected]")
10831083
addPerson("Guillaume Koenig", "[email protected]")
10841084
addPerson("Guillaume Leroi", "[email protected]")
10851085
addPerson("Guillermo López-Anglada", "[email protected]", "@guillermooo")
@@ -1111,9 +1111,9 @@ func init() {
11111111
addPerson("Hari haran", "[email protected]", "@hariharan-uno")
11121112
addPerson("Hariharan Srinath", "[email protected]", "@srinathh")
11131113
addPerson("Harry Moreno", "[email protected]", "@morenoh149")
1114+
addPerson("Harshavardhana", "[email protected]", "@harshavardhana")
11141115
addPerson("Harshavardhana", "[email protected]")
11151116
addPerson("Harshavardhana", "[email protected]", "11900@62eb7196-b449-3ce5-99f1-c037f21e1705")
1116-
addPerson("Harshavardhana", "[email protected]", "@harshavardhana")
11171117
addPerson("Hauke Löffler", "[email protected]", "@hloeffler")
11181118
addPerson("He Liu", "[email protected]")
11191119
addPerson("Hector Chu", "[email protected]", "@hectorchu")
@@ -1379,9 +1379,9 @@ func init() {
13791379
addPerson("Joe Shaw", "[email protected]", "@joeshaw")
13801380
addPerson("Joe Sylve", "[email protected]", "11851@62eb7196-b449-3ce5-99f1-c037f21e1705")
13811381
addPerson("Joe Sylve", "[email protected]", "@jtsylve")
1382+
addPerson("Joe Tsai", "[email protected]", "[email protected]", "[email protected]", "@dsnet")
13821383
addPerson("Joe Tsai", "[email protected]", "8495@62eb7196-b449-3ce5-99f1-c037f21e1705")
13831384
addPerson("Joe Tsai", "[email protected]", "12850@62eb7196-b449-3ce5-99f1-c037f21e1705")
1384-
addPerson("Joe Tsai", "[email protected]", "[email protected]", "[email protected]", "@dsnet")
13851385
addPerson("Joe Tsai", "[email protected]", "9735@62eb7196-b449-3ce5-99f1-c037f21e1705")
13861386
addPerson("Joel Sing", "[email protected]", "13640@62eb7196-b449-3ce5-99f1-c037f21e1705")
13871387
addPerson("Joel Sing", "[email protected]", "[email protected]", "@4a6f656c")
@@ -1745,9 +1745,9 @@ func init() {
17451745
addPerson("Martin Kunc", "[email protected]")
17461746
addPerson("Martin Lee", "[email protected]")
17471747
addPerson("Martin Lindhe", "[email protected]", "@martinlindhe")
1748+
addPerson("Martin Möhrmann", "[email protected]", "[email protected]", "@martisch")
17481749
addPerson("Martin Möhrmann", "[email protected]", "5846@62eb7196-b449-3ce5-99f1-c037f21e1705")
17491750
addPerson("Martin Möhrmann", "[email protected]", "16006@62eb7196-b449-3ce5-99f1-c037f21e1705")
1750-
addPerson("Martin Möhrmann", "[email protected]", "[email protected]", "@martisch")
17511751
addPerson("Martin Olsen", "[email protected]", "@martinolsen")
17521752
addPerson("Martin Olsson", "[email protected]", "@mo")
17531753
addPerson("Martin Probst", "[email protected]")
@@ -1802,9 +1802,9 @@ func init() {
18021802
addPerson("Matthew Broberg", "[email protected]")
18031803
addPerson("Matthew Byrne", "[email protected]")
18041804
addPerson("Matthew Cottingham", "[email protected]", "@mattrco")
1805+
addPerson("Matthew Dempsky", "[email protected]", "@mdempsky")
18051806
addPerson("Matthew Dempsky", "[email protected]", "8715@62eb7196-b449-3ce5-99f1-c037f21e1705")
18061807
addPerson("Matthew Dempsky", "[email protected]", "5440@62eb7196-b449-3ce5-99f1-c037f21e1705")
1807-
addPerson("Matthew Dempsky", "[email protected]", "@mdempsky")
18081808
addPerson("Matthew Denton", "[email protected]", "@mdentonSkyport")
18091809
addPerson("Matthew Endsley", "[email protected]")
18101810
addPerson("Matthew Herrmann", "[email protected]")
@@ -2088,9 +2088,9 @@ func init() {
20882088
addPerson("Paul Chang", "[email protected]", "@pchx")
20892089
addPerson("Paul Gier", "[email protected]")
20902090
addPerson("Paul Hankin", "[email protected]")
2091+
addPerson("Paul Jolly", "[email protected]", "@myitcv")
20912092
addPerson("Paul Jolly", "[email protected]", "@myitcv")
20922093
addPerson("Paul Jolly", "[email protected]", "16375@62eb7196-b449-3ce5-99f1-c037f21e1705")
2093-
addPerson("Paul Jolly", "[email protected]", "@myitcv")
20942094
addPerson("Paul Lalonde", "[email protected]", "@paul-lalonde")
20952095
addPerson("Paul M Furley", "[email protected]")
20962096
addPerson("Paul Marks", "[email protected]", "6050@62eb7196-b449-3ce5-99f1-c037f21e1705")
@@ -2215,8 +2215,8 @@ func init() {
22152215
addPerson("Rajat Goel", "[email protected]", "@rajatgoel")
22162216
addPerson("Rajath Agasthya", "[email protected]", "24258@62eb7196-b449-3ce5-99f1-c037f21e1705")
22172217
addPerson("Rajath Agasthya", "[email protected]", "@rajathagasthya")
2218-
addPerson("Ralph Corderoy", "[email protected]", "7020@62eb7196-b449-3ce5-99f1-c037f21e1705")
22192218
addPerson("Ralph Corderoy", "[email protected]")
2219+
addPerson("Ralph Corderoy", "[email protected]", "7020@62eb7196-b449-3ce5-99f1-c037f21e1705")
22202220
addPerson("Ralph Corderoy", "[email protected]", "10961@62eb7196-b449-3ce5-99f1-c037f21e1705")
22212221
addPerson("Ralph Ligtenberg", "[email protected]")
22222222
addPerson("Ramazan AYYILDIZ", "[email protected]", "@rayyildiz")
@@ -2225,9 +2225,9 @@ func init() {
22252225
addPerson("Randy Reddig", "[email protected]")
22262226
addPerson("Raph Levien", "[email protected]", "@raphlinus")
22272227
addPerson("Raphael Geronimi", "[email protected]", "@rgeronimi")
2228+
addPerson("Raul Silvera", "[email protected]", "@rauls5382")
22282229
addPerson("Raul Silvera", "[email protected]")
22292230
addPerson("Raul Silvera", "[email protected]", "10031@62eb7196-b449-3ce5-99f1-c037f21e1705")
2230-
addPerson("Raul Silvera", "[email protected]", "@rauls5382")
22312231
addPerson("RaviTeja", "[email protected]")
22322232
addPerson("Ray Tung", "[email protected]", "@raytung")
22332233
addPerson("Raymond Kazlauskas", "[email protected]", "@Rhymond")
@@ -2384,9 +2384,9 @@ func init() {
23842384
addPerson("Sebastian Schmidt", "[email protected]")
23852385
addPerson("Sebastian Schuberth", "[email protected]")
23862386
addPerson("Sebastian Willing", "[email protected]")
2387+
addPerson("Sebastien Binet", "[email protected]", "@sbinet")
23872388
addPerson("Sebastien Binet", "[email protected]")
23882389
addPerson("Sebastien Binet", "[email protected]", "5810@62eb7196-b449-3ce5-99f1-c037f21e1705")
2389-
addPerson("Sebastien Binet", "[email protected]", "@sbinet")
23902390
addPerson("Seebs", "[email protected]", "@seebs")
23912391
addPerson("Seiji Takahashi", "[email protected]", "15570@62eb7196-b449-3ce5-99f1-c037f21e1705")
23922392
addPerson("Seiji Takahashi", "[email protected]", "@timakin")
@@ -2587,9 +2587,9 @@ func init() {
25872587
addPerson("Tipp Moseley", "[email protected]", "@tippjammer")
25882588
addPerson("Tobias Assarsson", "[email protected]")
25892589
addPerson("Tobias Columbus", "[email protected]", "@tc-0")
2590+
addPerson("Tobias Klauser", "[email protected]", "@tklauser")
25902591
addPerson("Tobias Klauser", "[email protected]", "@tklauser")
25912592
addPerson("Tobias Klauser", "[email protected]", "19560@62eb7196-b449-3ce5-99f1-c037f21e1705")
2592-
addPerson("Tobias Klauser", "[email protected]", "@tklauser")
25932593
addPerson("Tobias Schottdorf", "[email protected]")
25942594
addPerson("Toby Burress", "[email protected]")
25952595
addPerson("Todd Neal", "[email protected]", "12836@62eb7196-b449-3ce5-99f1-c037f21e1705")
@@ -2669,8 +2669,8 @@ func init() {
26692669
addPerson("Vincenzo Pupillo", "[email protected]", "24134@62eb7196-b449-3ce5-99f1-c037f21e1705")
26702670
addPerson("Vinu Rajashekhar", "[email protected]", "@vinuraja")
26712671
addPerson("Vishvananda Ishaya", "[email protected]", "@vishvananda")
2672-
addPerson("Vitor De Mario", "[email protected]")
26732672
addPerson("Vitor De Mario", "[email protected]", "@vdemario")
2673+
addPerson("Vitor De Mario", "[email protected]")
26742674
addPerson("Vivek Ayer", "[email protected]")
26752675
addPerson("Vivek Sekhar", "[email protected]")
26762676
addPerson("Vlad Krasnov", "[email protected]", "7601@62eb7196-b449-3ce5-99f1-c037f21e1705")

0 commit comments

Comments
 (0)