##// END OF EJS Templates
contributors: remove redundant entries...
Thomas De Schampheleire -
r7759:a22352f8 default
parent child Browse files
Show More
@@ -1,126 +1,121 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 # Some committers are so wrong that it doesn't point at any contributor:
3 # Some committers are so wrong that it doesn't point at any contributor:
4 total_ignore = set()
4 total_ignore = set()
5 total_ignore.add('*** failed to import extension hggit: No module named hggit')
5 total_ignore.add('*** failed to import extension hggit: No module named hggit')
6 total_ignore.add('<>')
6 total_ignore.add('<>')
7
7
8 # Normalize some committer names where people have contributed under different
8 # Normalize some committer names where people have contributed under different
9 # names or email addresses:
9 # names or email addresses:
10 name_fixes = {}
10 name_fixes = {}
11 name_fixes['Andrew Shadura'] = "Andrej Shadura <andrew@shadura.me>"
11 name_fixes['Andrew Shadura'] = "Andrej Shadura <andrew@shadura.me>"
12 name_fixes['aparkar'] = "Aparkar <aparkar@icloud.com>"
12 name_fixes['aparkar'] = "Aparkar <aparkar@icloud.com>"
13 name_fixes['Aras Pranckevicius'] = "Aras Pranckevičius <aras@unity3d.com>"
13 name_fixes['Aras Pranckevicius'] = "Aras Pranckevičius <aras@unity3d.com>"
14 name_fixes['Augosto Hermann'] = "Augusto Herrmann <augusto.herrmann@planejamento.gov.br>"
14 name_fixes['Augosto Hermann'] = "Augusto Herrmann <augusto.herrmann@planejamento.gov.br>"
15 name_fixes['"Bradley M. Kuhn" <bkuhn@ebb.org>'] = "Bradley M. Kuhn <bkuhn@sfconservancy.org>"
15 name_fixes['"Bradley M. Kuhn" <bkuhn@ebb.org>'] = "Bradley M. Kuhn <bkuhn@sfconservancy.org>"
16 name_fixes['dmitri.kuznetsov'] = "Dmitri Kuznetsov"
16 name_fixes['dmitri.kuznetsov'] = "Dmitri Kuznetsov"
17 name_fixes['Dmitri Kuznetsov'] = "Dmitri Kuznetsov"
17 name_fixes['Dmitri Kuznetsov'] = "Dmitri Kuznetsov"
18 name_fixes['domruf'] = "Dominik Ruf <dominikruf@gmail.com>"
18 name_fixes['domruf'] = "Dominik Ruf <dominikruf@gmail.com>"
19 name_fixes['Ingo von borstel'] = "Ingo von Borstel <kallithea@planetmaker.de>"
19 name_fixes['Ingo von borstel'] = "Ingo von Borstel <kallithea@planetmaker.de>"
20 name_fixes['Jan Heylen'] = "Jan Heylen <heyleke@gmail.com>"
20 name_fixes['Jan Heylen'] = "Jan Heylen <heyleke@gmail.com>"
21 name_fixes['Jason F. Harris'] = "Jason Harris <jason@jasonfharris.com>"
21 name_fixes['Jason F. Harris'] = "Jason Harris <jason@jasonfharris.com>"
22 name_fixes['Jelmer Vernooij'] = "Jelmer Vernooij <jelmer@samba.org>"
22 name_fixes['Jelmer Vernooij'] = "Jelmer Vernooij <jelmer@samba.org>"
23 name_fixes['jfh <jason@jasonfharris.com>'] = "Jason Harris <jason@jasonfharris.com>"
23 name_fixes['jfh <jason@jasonfharris.com>'] = "Jason Harris <jason@jasonfharris.com>"
24 name_fixes['Leonardo Carneiro<leonardo@unity3d.com>'] = "Leonardo Carneiro <leonardo@unity3d.com>"
24 name_fixes['Leonardo Carneiro<leonardo@unity3d.com>'] = "Leonardo Carneiro <leonardo@unity3d.com>"
25 name_fixes['leonardo'] = "Leonardo Carneiro <leonardo@unity3d.com>"
25 name_fixes['leonardo'] = "Leonardo Carneiro <leonardo@unity3d.com>"
26 name_fixes['Leonardo <leo@unity3d.com>'] = "Leonardo Carneiro <leonardo@unity3d.com>"
26 name_fixes['Leonardo <leo@unity3d.com>'] = "Leonardo Carneiro <leonardo@unity3d.com>"
27 name_fixes['Les Peabody'] = "Les Peabody <lpeabody@gmail.com>"
27 name_fixes['Les Peabody'] = "Les Peabody <lpeabody@gmail.com>"
28 name_fixes['"Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>'] = "Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>"
28 name_fixes['"Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>'] = "Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>"
29 name_fixes['Lukasz Balcerzak'] = "Łukasz Balcerzak <lukaszbalcerzak@gmail.com>"
29 name_fixes['Lukasz Balcerzak'] = "Łukasz Balcerzak <lukaszbalcerzak@gmail.com>"
30 name_fixes['mao <mao@lins.fju.edu.tw>'] = "Ching-Chen Mao <mao@lins.fju.edu.tw>"
30 name_fixes['mao <mao@lins.fju.edu.tw>'] = "Ching-Chen Mao <mao@lins.fju.edu.tw>"
31 name_fixes['marcink'] = "Marcin Kuźmiński <marcin@python-works.com>"
31 name_fixes['marcink'] = "Marcin Kuźmiński <marcin@python-works.com>"
32 name_fixes['Marcin Kuzminski'] = "Marcin Kuźmiński <marcin@python-works.com>"
32 name_fixes['Marcin Kuzminski'] = "Marcin Kuźmiński <marcin@python-works.com>"
33 name_fixes['mikespook'] = "mikespook <mikespook@gmail.com>"
33 name_fixes['mikespook'] = "mikespook <mikespook@gmail.com>"
34 name_fixes['nansenat16@null.tw'] = "nansenat16 <nansenat16@null.tw>"
34 name_fixes['nansenat16@null.tw'] = "nansenat16 <nansenat16@null.tw>"
35 name_fixes['Peter Vitt'] = "Peter Vitt <petervitt@web.de>"
35 name_fixes['Peter Vitt'] = "Peter Vitt <petervitt@web.de>"
36 name_fixes['philip.j@hostdime.com'] = "Philip Jameson <philip.j@hostdime.com>"
36 name_fixes['philip.j@hostdime.com'] = "Philip Jameson <philip.j@hostdime.com>"
37 name_fixes['Søren Løvborg'] = "Søren Løvborg <sorenl@unity3d.com>"
37 name_fixes['Søren Løvborg'] = "Søren Løvborg <sorenl@unity3d.com>"
38 name_fixes['Thomas De Schampheleire'] = "Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>"
38 name_fixes['Thomas De Schampheleire'] = "Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>"
39 name_fixes['Hosted Weblate'] = "<>"
39 name_fixes['Hosted Weblate'] = "<>"
40 name_fixes['Weblate'] = "<>"
40 name_fixes['Weblate'] = "<>"
41 name_fixes['xpol'] = "xpol <xpolife@gmail.com>"
41 name_fixes['xpol'] = "xpol <xpolife@gmail.com>"
42 name_fixes['Lars <devel@sumpfralle.de>'] = "Lars Kruse <devel@sumpfralle.de>"
42 name_fixes['Lars <devel@sumpfralle.de>'] = "Lars Kruse <devel@sumpfralle.de>"
43
43
44 # Some committer email address domains that indicate that another entity might
44 # Some committer email address domains that indicate that another entity might
45 # hold some copyright too:
45 # hold some copyright too:
46 domain_extra = {}
46 domain_extra = {}
47 domain_extra['unity3d.com'] = "Unity Technologies"
47 domain_extra['unity3d.com'] = "Unity Technologies"
48 domain_extra['rhodecode.com'] = "RhodeCode GmbH"
48 domain_extra['rhodecode.com'] = "RhodeCode GmbH"
49
49
50 # Repository history show some old contributions that traditionally hasn't been
50 # Repository history show some old contributions that traditionally hasn't been
51 # listed in about.html - preserve that:
51 # listed in about.html - preserve that:
52 no_about = set(total_ignore)
52 no_about = set(total_ignore)
53 # The following contributors were traditionally not listed in about.html and it
53 # The following contributors were traditionally not listed in about.html and it
54 # seems unclear if the copyright is personal or belongs to a company.
54 # seems unclear if the copyright is personal or belongs to a company.
55 no_about.add(('Thayne Harbaugh <thayne@fusionio.com>', '2011'))
55 no_about.add(('Thayne Harbaugh <thayne@fusionio.com>', '2011'))
56 no_about.add(('Dies Koper <diesk@fast.au.fujitsu.com>', '2012'))
56 no_about.add(('Dies Koper <diesk@fast.au.fujitsu.com>', '2012'))
57 no_about.add(('Erwin Kroon <e.kroon@smartmetersolutions.nl>', '2012'))
57 no_about.add(('Erwin Kroon <e.kroon@smartmetersolutions.nl>', '2012'))
58 no_about.add(('Vincent Caron <vcaron@bearstech.com>', '2012'))
58 no_about.add(('Vincent Caron <vcaron@bearstech.com>', '2012'))
59 # These contributors' contributions might be too small to be copyrightable:
59 # These contributors' contributions might be too small to be copyrightable:
60 no_about.add(('philip.j@hostdime.com', '2012'))
60 no_about.add(('philip.j@hostdime.com', '2012'))
61 no_about.add(('Stefan Engel <mail@engel-stefan.de>', '2012'))
61 no_about.add(('Stefan Engel <mail@engel-stefan.de>', '2012'))
62 no_about.add(('Ton Plomp <tcplomp@gmail.com>', '2013'))
62 no_about.add(('Ton Plomp <tcplomp@gmail.com>', '2013'))
63 # Was reworked and contributed later and shadowed by other contributions:
63 # Was reworked and contributed later and shadowed by other contributions:
64 no_about.add(('Sean Farley <sean.michael.farley@gmail.com>', '2013'))
64 no_about.add(('Sean Farley <sean.michael.farley@gmail.com>', '2013'))
65
65
66 # Contributors in about.html and CONTRIBUTORS not appearing in repository
66 # Contributors in about.html and CONTRIBUTORS not appearing in repository
67 # history:
67 # history:
68 other = [
68 other = [
69 # Work folded into commits attributed to others:
69 # Work folded into commits attributed to others:
70 ('2013', 'Ilya Beda <ir4y.ix@gmail.com>'),
70 ('2013', 'Ilya Beda <ir4y.ix@gmail.com>'),
71 ('2015', 'Bradley M. Kuhn <bkuhn@sfconservancy.org>'),
71 ('2015', 'Bradley M. Kuhn <bkuhn@sfconservancy.org>'),
72 # Translators previously listed in
72 # Translators previously listed in
73 # kallithea/i18n/*/LC_MESSAGES/kallithea.po and originating from before the
73 # kallithea/i18n/*/LC_MESSAGES/kallithea.po and originating from before the
74 # use of Weblate.
74 # use of Weblate.
75 ('2012', 'Augusto Herrmann <augusto.herrmann@gmail.com>'),
75 ('2012', 'Augusto Herrmann <augusto.herrmann@gmail.com>'),
76 ('2012', 'Nemcio <areczek01@gmail.com>'),
76 ('2012', 'Nemcio <areczek01@gmail.com>'),
77 ('2012', 'Nemcio <bogdan114@g.pl>'),
77 ('2012', 'Nemcio <bogdan114@g.pl>'),
78 ('2012', 'xpol <xpolife@gmail.com>'),
79 ('2013', 'Andrey Mivrenik <myvrenik@gmail.com>'),
78 ('2013', 'Andrey Mivrenik <myvrenik@gmail.com>'),
80 ('2013', 'ArcheR <aleclitvinov1980@gmail.com>'),
79 ('2013', 'ArcheR <aleclitvinov1980@gmail.com>'),
81 ('2013', 'gnustavo <gustavo@gnustavo.com>'),
80 ('2013', 'gnustavo <gustavo@gnustavo.com>'),
82 ('2013', 'ivlevdenis <ivlevdenis.ru@gmail.com>'),
81 ('2013', 'ivlevdenis <ivlevdenis.ru@gmail.com>'),
83 ('2013', 'Marcin Kuźmiński <marcin@python-works.com>'),
84 ('2013', 'Mikhail Zholobov <legal90@gmail.com>'),
82 ('2013', 'Mikhail Zholobov <legal90@gmail.com>'),
85 ('2013', 'mokeev1995 <mokeev_andre@mail.ru>'),
83 ('2013', 'mokeev1995 <mokeev_andre@mail.ru>'),
86 ('2013', 'Nemcio <areczek01@gmail.com>'),
84 ('2013', 'Nemcio <areczek01@gmail.com>'),
87 ('2013', 'Ruslan Bekenev <furyinbox@gmail.com>'),
85 ('2013', 'Ruslan Bekenev <furyinbox@gmail.com>'),
88 ('2013', 'shirou - しろう'),
86 ('2013', 'shirou - しろう'),
89 ('2013', 'softforwinxp <softforwinxp@gmail.com>'),
87 ('2013', 'softforwinxp <softforwinxp@gmail.com>'),
90 ('2013', 'stephanj <info@stephan-jauernick.de>'),
88 ('2013', 'stephanj <info@stephan-jauernick.de>'),
91 ('2013', 'Takumi IINO <trot.thunder@gmail.com>'),
92 ('2013', 'zhmylove <zhmylove@narod.ru>'),
89 ('2013', 'zhmylove <zhmylove@narod.ru>'),
93 ('2013', 'こいんとす <tkondou@gmail.com>'),
90 ('2013', 'こいんとす <tkondou@gmail.com>'),
94 ('2014', 'invision70 <invision70@gmail.com>'),
91 ('2014', 'invision70 <invision70@gmail.com>'),
95 ('2014', 'SkryabinD <skryabind@gmail.com>'),
92 ('2014', 'SkryabinD <skryabind@gmail.com>'),
96 ('2014', 'whosaysni <whosaysni@gmail.com>'),
93 ('2014', 'whosaysni <whosaysni@gmail.com>'),
97 ('2015', 'Andrej Shadura <andrew@shadura.me>'),
98 ('2016', 'Andrej Shadura <andrew@shadura.me>'),
99 ]
94 ]
100
95
101 # Preserve contributors listed in about.html but not appearing in repository
96 # Preserve contributors listed in about.html but not appearing in repository
102 # history:
97 # history:
103 other_about = [
98 other_about = [
104 ("2011", "Aparkar <aparkar@icloud.com>"),
99 ("2011", "Aparkar <aparkar@icloud.com>"),
105 ("2010", "RhodeCode GmbH"),
100 ("2010", "RhodeCode GmbH"),
106 ("2011", "RhodeCode GmbH"),
101 ("2011", "RhodeCode GmbH"),
107 ("2012", "RhodeCode GmbH"),
102 ("2012", "RhodeCode GmbH"),
108 ("2013", "RhodeCode GmbH"),
103 ("2013", "RhodeCode GmbH"),
109 ]
104 ]
110
105
111 # Preserve contributors listed in CONTRIBUTORS but not appearing in repository
106 # Preserve contributors listed in CONTRIBUTORS but not appearing in repository
112 # history:
107 # history:
113 other_contributors = [
108 other_contributors = [
114 ("", "Andrew Kesterson <andrew@aklabs.net>"),
109 ("", "Andrew Kesterson <andrew@aklabs.net>"),
115 ("", "cejones"),
110 ("", "cejones"),
116 ("", "David A. Sjøen <david.sjoen@westcon.no>"),
111 ("", "David A. Sjøen <david.sjoen@westcon.no>"),
117 ("", "James Rhodes <jrhodes@redpointsoftware.com.au>"),
112 ("", "James Rhodes <jrhodes@redpointsoftware.com.au>"),
118 ("", "Jonas Oberschweiber <jonas.oberschweiber@d-velop.de>"),
113 ("", "Jonas Oberschweiber <jonas.oberschweiber@d-velop.de>"),
119 ("", "larikale"),
114 ("", "larikale"),
120 ("", "RhodeCode GmbH"),
115 ("", "RhodeCode GmbH"),
121 ("", "Sebastian Kreutzberger <sebastian@rhodecode.com>"),
116 ("", "Sebastian Kreutzberger <sebastian@rhodecode.com>"),
122 ("", "Steve Romanow <slestak989@gmail.com>"),
117 ("", "Steve Romanow <slestak989@gmail.com>"),
123 ("", "SteveCohen"),
118 ("", "SteveCohen"),
124 ("", "Thomas <thomas@rhodecode.com>"),
119 ("", "Thomas <thomas@rhodecode.com>"),
125 ("", "Thomas Waldmann <tw-public@gmx.de>"),
120 ("", "Thomas Waldmann <tw-public@gmx.de>"),
126 ]
121 ]
General Comments 0
You need to be logged in to leave comments. Login now