Mercurial > kallithea

changeset 7755:a44228cd208b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scripts: prepare for giving credit for contributions that have been integrated into other changesets
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 19 Jul 2019 01:00:11 +0200
parents 76e2072b88f6
children f68db0c03a78
files scripts/contributor_data.py scripts/update-copyrights.py
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/contributor_data.py	Thu Jan 17 03:56:34 2019 +0100
+++ b/scripts/contributor_data.py	Fri Jul 19 01:00:11 2019 +0200
@@ -62,6 +62,12 @@
 # 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 = [
--- a/scripts/update-copyrights.py	Thu Jan 17 03:56:34 2019 +0100
+++ b/scripts/update-copyrights.py	Fri Jul 19 01:00:11 2019 +0200
@@ -127,7 +127,7 @@
 
     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 @@
 
     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)*',