kallithea Changeset - ed76a0466677

Changeset - ed76a0466677

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 6 years ago 2019-08-25 21:15:39
thomas.de_schampheleire@nokia.com

contributors: fix existing email-less entry of 'mikespook'

Commit 17bef51d7616 was committed as 'mikespook' without any email address.
This name was thus reflected without email in the CONTRIBUTORS file.

In the i18n copyright data, a 'mikespook' _with_ email address was
referenced. Assuming these two refer to the same person, add a 'name fix' to
combine them.

2 files changed with 1 insertions and 2 deletions:

CONTRIBUTORS

scripts/contributor_data.py

0 comments (0 inline, 0 general)

CONTRIBUTORS

➞

Show inline comments

@@ @@ -83,84 +83,83 @@ List of contributors to Kallithea projec @@
     Daniel Anderson <daniel@dattrix.com> 2014
     Henrik Stuart <hg@hstuart.dk> 2014
     Ingo von Borstel <kallithea@planetmaker.de> 2014
     invision70 <invision70@gmail.com> 2014
     Jelmer Vernooĳ <jelmer@samba.org> 2014
     Jim Hague <jim.hague@acm.org> 2014
     Matt Fellows <kallithea@matt-fellows.me.uk> 2014
     Max Roman <max@choloclos.se> 2014
     Na'Tosha Bard <natosha@unity3d.com> 2014
     Rasmus Selsmark <rasmuss@unity3d.com> 2014
     SkryabinD <skryabind@gmail.com> 2014
     Tim Freund <tim@freunds.net> 2014
     Travis Burtrum <android@moparisthebest.com> 2014
     whosaysni <whosaysni@gmail.com> 2014
     Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> 2014
     Marcin Kuźmiński <marcin@python-works.com> 2010-2013
     Nemcio <areczek01@gmail.com> 2012-2013
     xpol <xpolife@gmail.com> 2012-2013
     Andrey Mivrenik <myvrenik@gmail.com> 2013
     Aparkar <aparkar@icloud.com> 2013
     ArcheR <aleclitvinov1980@gmail.com> 2013
     Dennis Brakhane <brakhane@googlemail.com> 2013
     gnustavo <gustavo@gnustavo.com> 2013
     Grzegorz Rożniecki <xaerxess@gmail.com> 2013
     Ilya Beda <ir4y.ix@gmail.com> 2013
     ivlevdenis <ivlevdenis.ru@gmail.com> 2013
     Jonathan Sternberg <jonathansternberg@gmail.com> 2013
     Leonardo Carneiro <leonardo@unity3d.com> 2013
     Magnus Ericmats <magnus.ericmats@gmail.com> 2013
     Martin Vium <martinv@unity3d.com> 2013
     Mikhail Zholobov <legal90@gmail.com> 2013
     mokeev1995 <mokeev_andre@mail.ru> 2013
     Ruslan Bekenev <furyinbox@gmail.com> 2013
     shirou - しろう 2013
     Simon Lopez <simon.lopez@slopez.org> 2013
     softforwinxp <softforwinxp@gmail.com> 2013
     stephanj <info@stephan-jauernick.de> 2013
     Ton Plomp <tcplomp@gmail.com> 2013
     zhmylove <zhmylove@narod.ru> 2013
     こいんとす <tkondou@gmail.com> 2013
     Augusto Herrmann <augusto.herrmann@planejamento.gov.br> 2011-2012
     Augusto Herrmann <augusto.herrmann@gmail.com> 2012
     Dan Sheridan <djs@adelard.com> 2012
     Dies Koper <diesk@fast.au.fujitsu.com> 2012
     Erwin Kroon <e.kroon@smartmetersolutions.nl> 2012
     H Waldo G <gwaldo@gmail.com> 2012
     hppj <hppj@postmage.biz> 2012
     Indra Talip <indra.talip@gmail.com> 2012
     mikespook 2012
     mikespook <mikespook@gmail.com> 2012
     nansenat16 <nansenat16@null.tw> 2012
     Nemcio <bogdan114@g.pl> 2012
     Philip Jameson <philip.j@hostdime.com> 2012
     Raoul Thill <raoul.thill@gmail.com> 2012
     Stefan Engel <mail@engel-stefan.de> 2012
     Tony Bussieres <t.bussieres@gmail.com> 2012
     Vincent Caron <vcaron@bearstech.com> 2012
     Vincent Duvert <vincent@duvert.net> 2012
     Vladislav Poluhin <nuklea@gmail.com> 2012
     Zachary Auclair <zach101@gmail.com> 2012
     Ankit Solanki <ankit.solanki@gmail.com> 2011
     Dmitri Kuznetsov 2011
     Jared Bunting <jared.bunting@peachjean.com> 2011
     Jason Harris <jason@jasonfharris.com> 2011
     Les Peabody <lpeabody@gmail.com> 2011
     Liad Shani <liadff@gmail.com> 2011
     Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it> 2011
     Matt Zuba <matt.zuba@goodwillaz.org> 2011
     Nicolas VINOT <aeris@imirhil.fr> 2011
     Shawn K. O'Shea <shawn@eth0.net> 2011
     Thayne Harbaugh <thayne@fusionio.com> 2011
     Łukasz Balcerzak <lukaszbalcerzak@gmail.com> 2010
     Andrew Kesterson <andrew@aklabs.net>
     cejones
     David A. Sjøen <david.sjoen@westcon.no>
     James Rhodes <jrhodes@redpointsoftware.com.au>
     Jonas Oberschweiber <jonas.oberschweiber@d-velop.de>
     larikale
     RhodeCode GmbH
     Sebastian Kreutzberger <sebastian@rhodecode.com>
     Steve Romanow <slestak989@gmail.com>
     SteveCohen
     Thomas <thomas@rhodecode.com>
     Thomas Waldmann <tw-public@gmx.de>

scripts/contributor_data.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 # Some committers are so wrong that it doesn't point at any contributor:
 total_ignore = set()
 total_ignore.add('*** failed to import extension hggit: No module named hggit')
 total_ignore.add('<>')
 # Normalize some committer names where people have contributed under different
 # names or email addresses:
 name_fixes = {}
 name_fixes['Andrew Shadura'] = "Andrej Shadura <andrew@shadura.me>"
 name_fixes['aparkar'] = "Aparkar <aparkar@icloud.com>"
 name_fixes['Aras Pranckevicius'] = "Aras Pranckevičius <aras@unity3d.com>"
 name_fixes['Augosto Hermann'] = "Augusto Herrmann <augusto.herrmann@planejamento.gov.br>"
 name_fixes['"Bradley M. Kuhn" <bkuhn@ebb.org>'] = "Bradley M. Kuhn <bkuhn@sfconservancy.org>"
 name_fixes['dmitri.kuznetsov'] = "Dmitri Kuznetsov"
 name_fixes['Dmitri Kuznetsov'] = "Dmitri Kuznetsov"
 name_fixes['domruf'] = "Dominik Ruf <dominikruf@gmail.com>"
 name_fixes['Ingo von borstel'] = "Ingo von Borstel <kallithea@planetmaker.de>"
 name_fixes['Jan Heylen'] = "Jan Heylen <heyleke@gmail.com>"
 name_fixes['Jason F. Harris'] = "Jason Harris <jason@jasonfharris.com>"
 name_fixes['Jelmer Vernooij'] = "Jelmer Vernooĳ <jelmer@samba.org>"
 name_fixes['jfh <jason@jasonfharris.com>'] = "Jason Harris <jason@jasonfharris.com>"
 name_fixes['Leonardo Carneiro<leonardo@unity3d.com>'] = "Leonardo Carneiro <leonardo@unity3d.com>"
 name_fixes['leonardo'] = "Leonardo Carneiro <leonardo@unity3d.com>"
 name_fixes['Leonardo <leo@unity3d.com>'] = "Leonardo Carneiro <leonardo@unity3d.com>"
 name_fixes['Les Peabody'] = "Les Peabody <lpeabody@gmail.com>"
 name_fixes['"Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>'] = "Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>"
 name_fixes['Lukasz Balcerzak'] = "Łukasz Balcerzak <lukaszbalcerzak@gmail.com>"
 name_fixes['mao <mao@lins.fju.edu.tw>'] = "Ching-Chen Mao <mao@lins.fju.edu.tw>"
 name_fixes['marcink'] = "Marcin Kuźmiński <marcin@python-works.com>"
 name_fixes['Marcin Kuzminski'] = "Marcin Kuźmiński <marcin@python-works.com>"
 name_fixes['mikespook'] = "mikespook <mikespook@gmail.com>"
 name_fixes['nansenat16@null.tw'] = "nansenat16 <nansenat16@null.tw>"
 name_fixes['Peter Vitt'] = "Peter Vitt <petervitt@web.de>"
 name_fixes['philip.j@hostdime.com'] = "Philip Jameson <philip.j@hostdime.com>"
 name_fixes['Søren Løvborg'] = "Søren Løvborg <sorenl@unity3d.com>"
 name_fixes['Thomas De Schampheleire'] = "Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>"
 name_fixes['Hosted Weblate'] = "<>"
 name_fixes['Weblate'] = "<>"
 name_fixes['xpol'] = "xpol <xpolife@gmail.com>"
 name_fixes['Lars <devel@sumpfralle.de>'] = "Lars Kruse <devel@sumpfralle.de>"
 # Some committer email address domains that indicate that another entity might
 # hold some copyright too:
 domain_extra = {}
 domain_extra['unity3d.com'] = "Unity Technologies"
 domain_extra['rhodecode.com'] = "RhodeCode GmbH"
 # Repository history show some old contributions that traditionally hasn't been
 # listed in about.html - preserve that:
 no_about = set(total_ignore)
 # The following contributors were traditionally not listed in about.html and it
 # seems unclear if the copyright is personal or belongs to a company.
 no_about.add(('Thayne Harbaugh <thayne@fusionio.com>', '2011'))
 no_about.add(('Dies Koper <diesk@fast.au.fujitsu.com>', '2012'))
 no_about.add(('Erwin Kroon <e.kroon@smartmetersolutions.nl>', '2012'))
 no_about.add(('Vincent Caron <vcaron@bearstech.com>', '2012'))
 # These contributors' contributions might be too small to be copyrightable:
 no_about.add(('philip.j@hostdime.com', '2012'))
 no_about.add(('Stefan Engel <mail@engel-stefan.de>', '2012'))
 no_about.add(('Ton Plomp <tcplomp@gmail.com>', '2013'))
 # Was reworked and contributed later and shadowed by other contributions:
 no_about.add(('Sean Farley <sean.michael.farley@gmail.com>', '2013'))
 # Contributors in about.html and CONTRIBUTORS not appearing in repository
 # history:
 other = [
     # Work folded into commits attributed to others:
     ('2013', 'Ilya Beda <ir4y.ix@gmail.com>'),
     ('2015', 'Bradley M. Kuhn <bkuhn@sfconservancy.org>'),
     # Translators previously listed in
     # kallithea/i18n/*/LC_MESSAGES/kallithea.po and originating from before the
     # use of Weblate.
     ('2012', 'Augusto Herrmann <augusto.herrmann@gmail.com>'),
     ('2012', 'mikespook <mikespook@gmail.com>'),
     ('2012', 'Nemcio <areczek01@gmail.com>'),
     ('2012', 'Nemcio <bogdan114@g.pl>'),
     ('2012', 'xpol <xpolife@gmail.com>'),
     ('2013', 'Andrey Mivrenik <myvrenik@gmail.com>'),
     ('2013', 'ArcheR <aleclitvinov1980@gmail.com>'),
     ('2013', 'gnustavo <gustavo@gnustavo.com>'),
     ('2013', 'ivlevdenis <ivlevdenis.ru@gmail.com>'),
     ('2013', 'Marcin Kuźmiński <marcin@python-works.com>'),
     ('2013', 'Mikhail Zholobov <legal90@gmail.com>'),
     ('2013', 'mokeev1995 <mokeev_andre@mail.ru>'),
     ('2013', 'Nemcio <areczek01@gmail.com>'),
     ('2013', 'Ruslan Bekenev <furyinbox@gmail.com>'),
     ('2013', 'shirou - しろう'),
     ('2013', 'softforwinxp <softforwinxp@gmail.com>'),
     ('2013', 'stephanj <info@stephan-jauernick.de>'),
     ('2013', 'Takumi IINO <trot.thunder@gmail.com>'),
     ('2013', 'zhmylove <zhmylove@narod.ru>'),
     ('2013', 'こいんとす <tkondou@gmail.com>'),
     ('2014', 'invision70 <invision70@gmail.com>'),
     ('2014', 'SkryabinD <skryabind@gmail.com>'),
     ('2014', 'whosaysni <whosaysni@gmail.com>'),
     ('2015', 'Andrej Shadura <andrew@shadura.me>'),
     ('2016', 'Andrej Shadura <andrew@shadura.me>'),
+]
 # Preserve contributors listed in about.html but not appearing in repository
 # history:
 other_about = [
     ("2011", "Aparkar <aparkar@icloud.com>"),
     ("2010", "RhodeCode GmbH"),
     ("2011", "RhodeCode GmbH"),
     ("2012", "RhodeCode GmbH"),
     ("2013", "RhodeCode GmbH"),
+]
 # Preserve contributors listed in CONTRIBUTORS but not appearing in repository
 # history:
 other_contributors = [
     ("", "Andrew Kesterson <andrew@aklabs.net>"),
     ("", "cejones"),
     ("", "David A. Sjøen <david.sjoen@westcon.no>"),
     ("", "James Rhodes <jrhodes@redpointsoftware.com.au>"),
     ("", "Jonas Oberschweiber <jonas.oberschweiber@d-velop.de>"),
     ("", "larikale"),
     ("", "RhodeCode GmbH"),
     ("", "Sebastian Kreutzberger <sebastian@rhodecode.com>"),
     ("", "Steve Romanow <slestak989@gmail.com>"),
     ("", "SteveCohen"),

0 comments (0 inline, 0 general)