# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2019-07-18 23:00:11
# Node ID a44228cd208b7e45b2903f9c316cb72dfa397ebe
# Parent  76e2072b88f6261792ab4e8093fb5478e25bb9f0

scripts: prepare for giving credit for contributions that have been integrated into other changesets

diff --git a/scripts/contributor_data.py b/scripts/contributor_data.py
--- a/scripts/contributor_data.py
+++ b/scripts/contributor_data.py
@@ -62,6 +62,12 @@ no_about.add(('Ton Plomp <tcplomp@gmail.
 # 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:
+]
+
 # Preserve contributors listed in about.html but not appearing in repository
 # history:
 other_about = [
diff --git a/scripts/update-copyrights.py b/scripts/update-copyrights.py
--- a/scripts/update-copyrights.py
+++ b/scripts/update-copyrights.py
@@ -127,7 +127,7 @@ def main():
 
     insert_entries(
         filename='kallithea/templates/about.html',
-        all_entries=repo_entries + contributor_data.other_about,
+        all_entries=repo_entries + contributor_data.other_about + contributor_data.other,
         no_entries=contributor_data.no_about,
         domain_extra=contributor_data.domain_extra,
         split_re=r'(?:  <li>Copyright &copy; [^\n]*</li>\n)*',
@@ -137,7 +137,7 @@ def main():
 
     insert_entries(
         filename='CONTRIBUTORS',
-        all_entries=repo_entries + contributor_data.other_contributors,
+        all_entries=repo_entries + contributor_data.other_contributors + contributor_data.other,
         no_entries=contributor_data.total_ignore,
         domain_extra=contributor_data.domain_extra,
         split_re=r'(?:    [^\n]*\n)*',