Add .mailmap file and us it in scripts/generate-AUTHORS.py.

Also, re-generate the AUTHORS file as a self-test.

Fixes mumble-voip/mumble#2125

1 files changed, 5 insertions, 108 deletions

diff --git a/scripts/generate-AUTHORS.py b/scripts/generate-AUTHORS.py
index 89ad86904..004a7a2a1 100644
--- a/scripts/generate-AUTHORS.py
+++ b/scripts/generate-AUTHORS.py
@@ -18,109 +18,12 @@ blacklist = (
 	"(no author) <(no author)@05730e5d-ab1b-0410-a4ac-84af385074fa>",
 	"root <root@DiskStation.(none)>",
 	"unknown <LoL@.(none)>",
-	"unknown <d0t@.(none)>",
 
 	# Bots
 	"MumbleTransifexBot <mumbletransifexbot@mumble.info>",
 
-	# Aliases of Bartek "stranded" Sumowski <sumowski@gmail.com>
-	"Bartek <sumowski@users.sourceforge.net>",
-	"Bartek Sumowksi <sumowski@gmail.com>",
-
-	# Alias of Benjamin Jemlich <pcgod@users.sourceforge.net>
-	"Benjamin Jemlich <pcgod@gmx.net>",
-
-	# Alias of EarlOfWenc <lorenz.schwittmann@gmail.com>
-	"EarlOfWenc <user@localhost>",
-
-	# Aliases of Jamie Fraser <fwagglechop@gmail.com> -- latest commit uses this email.a
-	"Jamie Fraser <jamie.f@mumbledog.com>",
-	"Jamie Fraser <jamie.f@sabrienix.com>",
-
-	# Aliases of Álvaro Manuel Recio Pérez <naproxeno@users.sourceforge.net>
-	"Álvaro M. Recio Pérez <naproxeno@users.sourceforge.net>",
-	"Álvaro Manuel Recio Pérez <naproxeno@kepis.(none)>",
-
-	# Aliases of Thorvald Natvig <slicer@users.sourceforge.net>
-	"Thorvald Natvig <github@natvig.com>",
-	"Thorvald Natvig <thorvald@-e false.(none)>",
-	"Thorvald Natvig <thorvald@debian.localdomain>",
-	"Thorvald Natvig <thorvald@natvig.com>",
-
-	# Alias of Spaccaossi <spaccaossi@gmail.com>
-	"Spaccaossi <spaccaossi@users.sourceforge.net>",
-
-	# Aliases of Stefan Hacker <dd0t@users.sourceforge.net>
-	"Stefan H <dd0t@users.sourceforge.net>",
-	"Stefan Hacker <hacker.stefan@googlemail.com>",
-	"Stefan Hacker <hast@hast-desktop.(none)>",
-
-	# Aliases of Michał "Zuko" Żukowski <zuczeq@gmail.com>
-	"Michał Żukowski <zuczeq@gmail.com>",
-	"Zukowski Michal <zuczeq@gmail.com>",
-	"Żukowski Michał <zuczeq@gmail.com>",
-	"zuczeq <zuczeq@users.sourceforge.net>",
-	"Zuko <zuczeq@gmail.com>",
-
-	# Two authors?! Both are listed elsewhere, so drop.
-	"Michael Ziegler and Natenom <natenom@googlemail.com>",
-
 	# ...What?
 	"Netbios Domain Administrator <admin@gameserver2.(none)>",
-
-	# Aliases of Mikkel Krautz <mikkel@krautz.dk>
-	"Mikkel <mikkel@krautz.dk>",
-	"Mikkel Krautz <mkrautz@users.sourceforge.net>",
-
-	# Alias of tkmorris <mauricioarozi@gmail.com>
-	"morris <tkmorris@users.sourceforge.net>",
-
-	# Alias of bendem <online@bendem.be>
-	"bendem <bendembd@gmail.com>",
-
-	# Alias of arrai <array.of.intellect@gmail.com>
-	"Arrai <arrai@users.sourceforge.net>",
-
-	# Alias of Joël Troch <joel.troch62@gmail.com>
-	"Joël Troch <https://github.com/JoelTroch>",
-
-	# Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
-	"Matthias Vogelgesang <m0ta@users.sourceforge.net>",
-
-	# Alias of Tuck Therebelos <snares@users.sourceforge.net>
-	"Snares <snares@users.sourceforge.net>",
-
-	# Aliases of Natenom <natenom@natenom.com>
-	"Natenom <natenom@googlemail.com>",
-	"Natenom <natenom@natenom.name>",
-
-	# Alias of haru_arc <arcenciel@users.sf.net>
-	"Arcenciel <arcenciel@users.sourceforge.net>",
-	"arcenciel <arcenciel@users.sourceforge.net>",
-
-	# Alias of Jonathan E. Hansen <zentriple@users.sourceforge.net>
-	"Jonathan <zentriple@users.sourceforge.net>",
-	"zentriple <zentriple@users.sourceforge.net>",
-	"Zentriple <zentriple@users.sourceforge.net>",
-
-	# Alias of Patrick Matthäi <pmatthaei@debian.org>
-	"Patrick Matthäi <the-me88@users.sourceforge.net>",
-
-	# Alias of Jan Klass <kissaki@gmx.de>
-	"Jan Klass <kissaki0@gmail.com>",
-
-	# Alias of Semion Tsinman <Necromancer3333@gmail.com>
-	"Necromancer <necromancer3@users.sourceforge.net>",
-	"Necromancer <necro3@users.sourceforge.net>",
-
-	# Alias of Svenne33 <svenne33@users.sourceforge.net>
-	"svenne33 <svenne33@users.sourceforge.net>",
-
-	# Potentially an alias of BAYSSE Laurent <lolo_32@users.sourceforge.net>
-	"lolo_32 <Alex@.(none)>",
-
-	# Alias of Kevin Rohland <kevin@nascher.org>
-	"SuperNascher <kevin@nascher.org>",
 )
 
 # These are authors whose patches were applied during
@@ -210,7 +113,7 @@ patchAuthors = (
 )
 
 def gitAuthorsOutput():
-	p = subprocess.Popen(["git", "log", "--format=%aN <%aE>", "master", "1.2.x"], stdout=subprocess.PIPE)
+	p = subprocess.Popen(["git", "log", "--use-mailmap", "--format=%aN <%aE>", "master", "1.2.x"], stdout=subprocess.PIPE)
 	stdout, stderr = p.communicate()
 	if stdout is not None:
 		stdout = stdout.decode('utf-8')
@@ -229,16 +132,10 @@ def main():
 		if line == '':
 			continue
 
-		if line == "zapman <unknown>":
-			line = "zapman"
-
-		if line == "Derrick Dymock <derrick@puppetlabs.com>":
-			line = "Derrick Dymock <actown@gmail.com>"
-
-		# Fix "=?UTF-8 Michał Żukowski?=" and possibly others like it.
-		if line.startswith("=?UTF-8 "):
-			line = line.replace("=?UTF-8 ", "")
-			line = line.replace("?=", "")
+		# Email addresses completely when they are not set.
+		# See for example "zapman <unknown>".
+		if " <unknown>" in line:
+			line = line.replace(" <unknown>", "")
 
 		# Use GitHub URL instead of $user@users.noreply.github.com
 		if '@users.noreply.github.com' in line: