Merge stable

scripts/update-copyrights.py

@@ -0,0 +1,253 b''
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+"""
+Kallithea script for maintaining contributor lists from version control
+history.
+
+This script and the data in it is a best effort attempt at reverse engineering
+previous attributions and correlate that with version control history while
+preserving all existing copyright statements and attribution. This script is
+processing and summarizing information found elsewhere - it is not by itself
+making any claims. Comments in the script are an attempt at reverse engineering
+possible explanations - they are not showing any intent or confirming it is
+correct.
+
+Three files are generated / modified by this script:
+
+kallithea/templates/about.html claims to show copyright holders, and the GPL
+license requires such existing "legal notices" to be preserved. We also try to
+keep it updated with copyright holders, but do not claim it is a correct list.
+
+CONTRIBUTORS has the purpose of giving credit where credit is due and list all
+the contributor names in the source.
+
+kallithea/templates/base/base.html contains the copyright years in the page
+footer.
+
+Both make a best effort of listing all copyright holders, but revision control
+history might be a better and more definitive source.
+
+Contributors are sorted "fairly" by copyright year and amount of
+contribution.
+
+New contributors are listed, without considering if the contribution contains
+copyrightable work.
+
+When the copyright might belong to a different legal entity than the
+contributor, the legal entity is given credit too.
+"""
+
+
+# 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'] = "Andrew Shadura <[e-mail]>"
+name_fixes['aparkar'] = "Aparkar <[e-mail]>"
+name_fixes['Aras Pranckevicius'] = "Aras Pranckevičius <[e-mail]>"
+name_fixes['Augosto Hermann'] = "Augusto Herrmann <[e-mail]>"
+name_fixes['"Bradley M. Kuhn" <[e-mail]>'] = "Bradley M. Kuhn <[e-mail]>"
+name_fixes['dmitri.kuznetsov'] = "Dmitri Kuznetsov"
+name_fixes['Dmitri Kuznetsov'] = "Dmitri Kuznetsov"
+name_fixes['domruf'] = "Dominik Ruf <[e-mail]>"
+name_fixes['Ingo von borstel'] = "Ingo von Borstel <[e-mail]>"
+name_fixes['Jan Heylen'] = "Jan Heylen <[e-mail]>"
+name_fixes['Jason F. Harris'] = "Jason Harris <[e-mail]>"
+name_fixes['Jelmer Vernooij'] = "Jelmer Vernooij <[e-mail]>"
+name_fixes['jfh <[e-mail]>'] = "Jason Harris <[e-mail]>"
+name_fixes['Leonardo Carneiro<[e-mail]>'] = "Leonardo Carneiro <[e-mail]>"
+name_fixes['leonardo'] = "Leonardo Carneiro <[e-mail]>"
+name_fixes['Leonardo <[e-mail]>'] = "Leonardo Carneiro <[e-mail]>"
+name_fixes['Les Peabody'] = "Les Peabody <[e-mail]>"
+name_fixes['"Lorenzo M. Catucci" <[e-mail]>'] = "Lorenzo M. Catucci <[e-mail]>"
+name_fixes['Lukasz Balcerzak'] = "Łukasz Balcerzak <[e-mail]>"
+name_fixes['mao <[e-mail]>'] = "Ching-Chen Mao <[e-mail]>"
+name_fixes['marcink'] = "Marcin Kuźmiński <[e-mail]>"
+name_fixes['Marcin Kuzminski'] = "Marcin Kuźmiński <[e-mail]>"
+name_fixes['[e-mail]'] = "nansenat16 <[e-mail]>"
+name_fixes['Peter Vitt'] = "Peter Vitt <[e-mail]>"
+name_fixes['[e-mail]'] = "Philip Jameson <[e-mail]>"
+name_fixes['Søren Løvborg'] = "Søren Løvborg <[e-mail]>"
+name_fixes['Thomas De Schampheleire'] = "Thomas De Schampheleire <[e-mail]>"
+name_fixes['Weblate'] = "<>"
+name_fixes['xpol'] = "xpol <[e-mail]>"
+
+
+# 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 <[e-mail]>', '2011'))
+no_about.add(('Dies Koper <[e-mail]>', '2012'))
+no_about.add(('Erwin Kroon <[e-mail]>', '2012'))
+no_about.add(('Vincent Caron <[e-mail]>', '2012'))
+# These contributors' contributions might be too small to be copyrightable:
+no_about.add(('[e-mail]', '2012'))
+no_about.add(('Stefan Engel <[e-mail]>', '2012'))
+no_about.add(('Ton Plomp <[e-mail]>', '2013'))
+# Was reworked and contributed later and shadowed by other contributions:
+no_about.add(('Sean Farley <[e-mail]>', '2013'))
+
+# Preserve contributors listed in about.html but not appearing in repository
+# history:
+other_about = [
+    ("2011", "Aparkar <[e-mail]>"),
+    ("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 <[e-mail]>"),
+    ("", "cejones"),
+    ("", "David A. Sjøen <[e-mail]>"),
+    ("", "James Rhodes <[e-mail]>"),
+    ("", "Jonas Oberschweiber <[e-mail]>"),
+    ("", "larikale"),
+    ("", "RhodeCode GmbH"),
+    ("", "Sebastian Kreutzberger <[e-mail]>"),
+    ("", "Steve Romanow <[e-mail]>"),
+    ("", "SteveCohen"),
+    ("", "Thomas <[e-mail]>"),
+    ("", "Thomas Waldmann <[e-mail]>"),
+]
+
+
+import os
+import re
+from collections import defaultdict
+
+
+def sortkey(x):
+    """Return key for sorting contributors "fairly":
+    * latest contribution
+    * first contribution
+    * number of contribution years
+    * name (with some unicode normalization)
+    The entries must be 2-tuples of a list of string years and the unicode name"""
+    return (x[0] and -int(x[0][-1]),
+            x[0] and int(x[0][0]),
+            -len(x[0]),
+            x[1].decode('utf8').lower().replace(u'\xe9', u'e').replace(u'\u0142', u'l')
+        )
+
+
+def nice_years(l, dash='-', join=' '):
+    """Convert a list of years into brief range like '1900-1901, 1921'."""
+    if not l:
+        return ''
+    start = end = int(l[0])
+    ranges = []
+    for year in l[1:] + [0]:
+        year = int(year)
+        if year == end + 1:
+            end = year
+            continue
+        if start == end:
+            ranges.append('%s' % start)
+        else:
+            ranges.append('%s%s%s' % (start, dash, end))
+        start = end = year
+    assert start == 0 and end == 0, (start, end)
+    return join.join(ranges)
+
+
+def insert_entries(
+        filename,
+        all_entries,
+        no_entries,
+        domain_extra,
+        split_re,
+        normalize_name,
+        format_f):
+    """Update file with contributor information.
+    all_entries: list of tuples with year and name
+    no_entries: set of names or name and year tuples to ignore
+    domain_extra: map domain name to extra credit name
+    split_re: regexp matching the part of file to rewrite
+    normalize_name: function to normalize names for grouping and display
+    format_f: function formatting year list and name to a string
+    """
+    name_years = defaultdict(set)
+
+    for year, name in all_entries:
+        if name in no_entries or (name, year) in no_entries:
+            continue
+        domain = name.split('@', 1)[-1].rstrip('>')
+        if domain in domain_extra:
+            name_years[domain_extra[domain]].add(year)
+        name_years[normalize_name(name)].add(year)
+
+    l = [(list(sorted(year for year in years if year)), name)
+         for name, years in name_years.items()]
+    l.sort(key=sortkey)
+
+    with file(filename) as f:
+        pre, post = re.split(split_re, f.read())
+
+    with file(filename, 'w') as f:
+        f.write(pre +
+                ''.join(format_f(years, name) for years, name in l) +
+                post)
+
+
+def main():
+    repo_entries = [
+        (year, name_fixes.get(name) or name_fixes.get(name.rsplit('<', 1)[0].strip()) or name)
+        for year, name in
+        (line.strip().split(' ', 1)
+         for line in os.popen("""hg log -r '::.' -T '{date(date,"%Y")} {author}\n'""").readlines())
+        ]
+
+    insert_entries(
+        filename='kallithea/templates/about.html',
+        all_entries=repo_entries + other_about,
+        no_entries=no_about,
+        domain_extra=domain_extra,
+        split_re=r'(?:  <li>Copyright &copy; [^\n]*</li>\n)*',
+        normalize_name=lambda name: name.split('<', 1)[0].strip(),
+        format_f=lambda years, name: '  <li>Copyright &copy; %s, %s</li>\n' % (nice_years(years, '&ndash;', ', '), name),
+        )
+
+    insert_entries(
+        filename='CONTRIBUTORS',
+        all_entries=repo_entries + other_contributors,
+        no_entries=total_ignore,
+        domain_extra=domain_extra,
+        split_re=r'(?:    [^\n]*\n)*',
+        normalize_name=lambda name: name,
+        format_f=lambda years, name: ('    %s%s%s\n' % (name, ' ' if years else '', nice_years(years))),
+        )
+
+    insert_entries(
+        filename='kallithea/templates/base/base.html',
+        all_entries=repo_entries,
+        no_entries=total_ignore,
+        domain_extra={},
+        split_re=r'(?<=&copy;) .* (?=by various authors)',
+        normalize_name=lambda name: '',
+        format_f=lambda years, name: ' ' + nice_years(years, '&ndash;', ', ') + ' ',
+        )
+
+
+if __name__ == '__main__':
+    main()
+
+
+# To list new contributors since last tagging:
+# { hg log -r '::tagged()' -T '    {author}\n    {author}\n'; hg log -r '::.' -T '    {author}\n' | sort | uniq; } | sort | uniq -u

.hgsigs

@@ -1,3 +1,4 b''
 9b3e9e242f5c97cc0c7657e5ac93dce7de61ca16 0 iQEcBAABAgAGBQJWDuAdAAoJEJ1bI/kYT6UUAlYH/ReCa7Im5tvy+ot5oAc7xey/O2rCVHp2h6i82tTWK/0i9EaS4DP+eTbAjV4WJA4qWF5DPenEJ3X9JhrTLNvGkR0f7lUqiFVMTJ472YlSsvIWg38gVFruzwk1cODRfq72o8ERYcRSfzrL4cDpIqjEd/vVVCV/gKVvPmzr4/FED/ZmS0X6T9gxWJo/eWSuLNAxHHtE/pCWDO3XEe+iOm+hHjkyz4Hn2r9/+ucrirnzycH6DnYO/kWvQzBnzgMjJm+1rLZ5cfU89V8zfhv6z0pd8CHZfpKGc2Z8EwVJq9LR+M4/76uDlYXx7IfZAxhRNqN6MC+yvPmDo3382dNr7Wkopi0=
 9bf8eb837e785b6856ccfac264e977ce3ebe1535 0 iQEcBAABAgAGBQJW5XaVAAoJEJ1bI/kYT6UUbeMH/AsGg21jTc0tTT+228T+WfrfkbxrPkkULQF/Eo3ChlrhnFZ5B1y7ellSx6XGas7yKpqHHtNmrVwY3KBfUaYEljML/osEt1kvM6JGcd0vDbAW1uA2sdJR2AXmf32MjguFVhmYi9Lj79WYtgg241YGPe4dH0ompNFVqazNxCfmDBZijzSkF57FURMpV2e6+MyNq0txSo9Q82eALy0GAIX7NKQcxtynxG9ETzVzuVpeNE9MEZh0ObbUtPGezd55GXXcVqI8ZEurZwf6KHnd5M+5wxIZf84gM/k4QgQbRiIxNj4QfVmTZlVNSkC7PwSbF8twZPjlAprwldYvMi/c7ZVocEY=
 a84d40e9481fcea4dafadee86b03f0dd401527d6 0 iQEcBAABAgAGBQJXJ4XhAAoJEJ1bI/kYT6UUKaIH/i33ZiT95pWF3pHEftgrZWvMwvz9tAuoHgf7ntkIUPnxfNteXKw8FiKcSQ9f8I41VyML+rqsnBBIfltJknfoqTV+9jNkHwc62OfcqQ3RbBDXQbcSi1CHn2ihJiZadqiKEyUw7JJqOMyWp+AWQyywcF/ea+pwXPJG5A2fd4vnBWHSxhD+6Ig1KipZNORzZY7fAec185M7NOZCZC+5qOLIkoQZaGq+D2Aipx5eZkpgFd4W+0LQY1ywMV5CiOY1OG0mry7l6NfIZvPY9Kiwg37G6ZUi8fhwVvn6Y8UACcAnWunBfKt9PWK0rAgNyJ9HDk/+3S5g6HcNKUb6YRTzEcLshIc=
+64ea7ea0923618a0c117acebb816a6f0d162bfdb 0 iQEvBAABCAAZBQJZeN4NEhxhbmRyZXdAc2hhZHVyYS5tZQAKCRCdWyP5GE+lFGi/CACBEWfdtZNumWz5LJ6yHbiceEDXZ+9aD44EU3J3VfbRwLeZhQ7J0WwBCFg0qPxh08O+TMaeRP4ur20hczyR6u8fwmIc9KDmNZHujlG0Q6GkNSMizyfJgf/MYJD+03q2Z0S4e9QdPfc746TBZKaqqauV0uVjtd7+m3L4R+Qh5shxBNxshqGGWtMtXpO9iojCJEqxde9RVm+w9NidKdCLGoDlVpJ42iFSrUMeWBnVUMRhOiz6XKUrIPEjUfWMFe0gOR55wZcF3tJo8XBqqqhecI69cmLmkv1xG92V+jC5gTC3STYTASJqXHKEp2cRvUGbHrFF9ODBvcYjj+VsY5r2aU1l

.hgtags

@@ -64,3 +64,4 b' 14f488a5dc4ca6647bc6acf12534fd137e968aa8'
 9b3e9e242f5c97cc0c7657e5ac93dce7de61ca16 0.3
 9bf8eb837e785b6856ccfac264e977ce3ebe1535 0.3.1
 a84d40e9481fcea4dafadee86b03f0dd401527d6 0.3.2
+64ea7ea0923618a0c117acebb816a6f0d162bfdb 0.3.3

CONTRIBUTORS

@@ -1,18 +1,30 b''
 List of contributors to Kallithea project:
 
-    Mads Kiilerich <[e-mail]> 2012-2016
+    Mads Kiilerich <[e-mail]> 2012-2017
+    Unity Technologies 2012-2017
+    Andrew Shadura <[e-mail]> 2012 2014-2017
+    Dominik Ruf <[e-mail]> 2012 2014-2017
+    Thomas De Schampheleire <[e-mail]> 2014-2017
+    Søren Løvborg <[e-mail]> 2015-2017
+    Sam Jaques <[e-mail]> 2015 2017
+    Asterios Dimitriou <[e-mail]> 2016-2017
+    Mads Kiilerich <[e-mail]> 2016-2017
+    Alessandro Molina <[e-mail]> 2017
+    Anton Schur <[e-mail]> 2017
+    Ching-Chen Mao <[e-mail]> 2017
+    Eivind Tagseth <[e-mail]> 2017
+    FUJIWARA Katsunori <[e-mail]> 2017
+    Karl Goetz <[e-mail]> 2017
+    Marko Semet <[e-mail]> 2017
+    Viktar Vauchkevich <[e-mail]> 2017
     Takumi IINO <[e-mail]> 2012-2016
-    Unity Technologies 2012-2016
-    Andrew Shadura <[e-mail]> 2012 2014-2016
-    Dominik Ruf <[e-mail]> 2012 2014-2016
-    Thomas De Schampheleire <[e-mail]> 2014-2016
     Étienne Gilli <[e-mail]> 2015-2016
     Jan Heylen <[e-mail]> 2015-2016
     Robert Martinez <[e-mail]> 2015-2016
     Robert Rauch <[e-mail]> 2015-2016
-    Søren Løvborg <[e-mail]> 2015-2016
     Angel Ezquerra <[e-mail]> 2016
-    Asterios Dimitriou <[e-mail]> 2016
+    Anton Shestakov <[e-mail]> 2016
+    Brandon Jones <[e-mail]> 2016
     Kateryna Musina <[e-mail]> 2016
     Konstantin Veretennicov <[e-mail]> 2016
     Oscar Curero <[e-mail]> 2016
@@ -49,7 +61,6 b' List of contributors to Kallithea projec'
     Niemand Jedermann <[e-mail]> 2015
     Peter Vitt <[e-mail]> 2015
     Ronny Pfannschmidt <[e-mail]> 2015
-    Sam Jaques <[e-mail]> 2015
     Tuux <[e-mail]> 2015
     Viktar Palstsiuk <[e-mail]> 2015
     Ante Ilic <[e-mail]> 2014

kallithea/templates/about.html

@@ -27,19 +27,30 b''
   necessarily limited to the following:</p>
   <ul>
 
-  <li>Copyright &copy; 2012&ndash;2016, Mads Kiilerich</li>
+  <li>Copyright &copy; 2012&ndash;2017, Mads Kiilerich</li>
+  <li>Copyright &copy; 2012&ndash;2017, Unity Technologies</li>
+  <li>Copyright &copy; 2012, 2014&ndash;2017, Andrew Shadura</li>
+  <li>Copyright &copy; 2012, 2014&ndash;2017, Dominik Ruf</li>
+  <li>Copyright &copy; 2014&ndash;2017, Thomas De Schampheleire</li>
+  <li>Copyright &copy; 2015&ndash;2017, Søren Løvborg</li>
+  <li>Copyright &copy; 2015, 2017, Sam Jaques</li>
+  <li>Copyright &copy; 2016&ndash;2017, Asterios Dimitriou</li>
+  <li>Copyright &copy; 2017, Alessandro Molina</li>
+  <li>Copyright &copy; 2017, Anton Schur</li>
+  <li>Copyright &copy; 2017, Ching-Chen Mao</li>
+  <li>Copyright &copy; 2017, Eivind Tagseth</li>
+  <li>Copyright &copy; 2017, FUJIWARA Katsunori</li>
+  <li>Copyright &copy; 2017, Karl Goetz</li>
+  <li>Copyright &copy; 2017, Marko Semet</li>
+  <li>Copyright &copy; 2017, Viktar Vauchkevich</li>
   <li>Copyright &copy; 2012&ndash;2016, Takumi IINO</li>
-  <li>Copyright &copy; 2012&ndash;2016, Unity Technologies</li>
-  <li>Copyright &copy; 2012, 2014&ndash;2016, Andrew Shadura</li>
-  <li>Copyright &copy; 2012, 2014&ndash;2016, Dominik Ruf</li>
-  <li>Copyright &copy; 2014&ndash;2016, Thomas De Schampheleire</li>
   <li>Copyright &copy; 2015&ndash;2016, Étienne Gilli</li>
   <li>Copyright &copy; 2015&ndash;2016, Jan Heylen</li>
   <li>Copyright &copy; 2015&ndash;2016, Robert Martinez</li>
   <li>Copyright &copy; 2015&ndash;2016, Robert Rauch</li>
-  <li>Copyright &copy; 2015&ndash;2016, Søren Løvborg</li>
   <li>Copyright &copy; 2016, Angel Ezquerra</li>
-  <li>Copyright &copy; 2016, Asterios Dimitriou</li>
+  <li>Copyright &copy; 2016, Anton Shestakov</li>
+  <li>Copyright &copy; 2016, Brandon Jones</li>
   <li>Copyright &copy; 2016, Kateryna Musina</li>
   <li>Copyright &copy; 2016, Konstantin Veretennicov</li>
   <li>Copyright &copy; 2016, Oscar Curero</li>
@@ -76,7 +87,6 b''
   <li>Copyright &copy; 2015, Niemand Jedermann</li>
   <li>Copyright &copy; 2015, Peter Vitt</li>
   <li>Copyright &copy; 2015, Ronny Pfannschmidt</li>
-  <li>Copyright &copy; 2015, Sam Jaques</li>
   <li>Copyright &copy; 2015, Tuux</li>
   <li>Copyright &copy; 2015, Viktar Palstsiuk</li>
   <li>Copyright &copy; 2014, Ante Ilic</li>