summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-25 23:04:43 +0000
committerGerrit Code Review <review@openstack.org>2013-03-25 23:04:43 +0000
commite61cbe5819343d3f69fff2efa1807bf7bf7fa2ad (patch)
tree7cea96eee814b32e99fbc691657331411a7d8f59
parentae2aa3c2c2211d9c5670a05b02782706b4c19f01 (diff)
parentc88db2c8f73e13e1cfba081d91743a7450c5732d (diff)
downloadnova-e61cbe5819343d3f69fff2efa1807bf7bf7fa2ad.tar.gz
nova-e61cbe5819343d3f69fff2efa1807bf7bf7fa2ad.tar.xz
nova-e61cbe5819343d3f69fff2efa1807bf7bf7fa2ad.zip
Merge "Include Co-authored-by entries in AUTHORS"
-rw-r--r--nova/openstack/common/setup.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/openstack/common/setup.py b/nova/openstack/common/setup.py
index 030df61c9..dec74fd0d 100644
--- a/nova/openstack/common/setup.py
+++ b/nova/openstack/common/setup.py
@@ -171,6 +171,14 @@ def generate_authors():
" log --format='%aN <%aE>' | sort -u | "
"egrep -v '" + jenkins_email + "'")
changelog = _run_shell_command(git_log_cmd)
+ signed_cmd = ("git log --git-dir=" + git_dir +
+ " | grep -i Co-authored-by: | sort -u")
+ signed_entries = _run_shell_command(signed_cmd)
+ if signed_entries:
+ new_entries = "\n".join(
+ [signed.split(":", 1)[1].strip()
+ for signed in signed_entries.split("\n") if signed])
+ changelog = "\n".join((changelog, new_entries))
mailmap = _parse_git_mailmap(git_dir)
with open(new_authors, 'w') as new_authors_fh:
new_authors_fh.write(canonicalize_emails(changelog, mailmap))