svn commit: r339693 - in svnadmin: conf hooks/scripts

[Mathieu Arnold]

Author: mat
Date: Tue Jan 14 16:03:10 2014
New Revision: 339693
URL: http://svnweb.freebsd.org/changeset/ports/339693
QAT: https://qat.redports.org/buildarchive/r339693/

Log:
  Add the QAT URL to commit messages.

Modified:
  svnadmin/conf/mailer.conf
  svnadmin/hooks/scripts/mailer.py

Modified: svnadmin/conf/mailer.conf
==============================================================================
--- svnadmin/conf/mailer.conf	Tue Jan 14 15:54:26 2014	(r339692)
+++ svnadmin/conf/mailer.conf	Tue Jan 14 16:03:10 2014	(r339693)
@@ -202,6 +202,7 @@ generate_diffs = add copy modify
 # The available substitution variable is: rev
 #commit_url = http://diffs.server.com/trac/software/changeset/%(rev)s
 commit_url = http://svnweb.freebsd.org/changeset/ports/%(rev)s
+qat_url = https://qat.redports.org/buildarchive/r%(rev)s/
 
 # Diff URL construction.  For the configured diff URL types, the diff
 # section (which follows the message header) will include the URL

Modified: svnadmin/hooks/scripts/mailer.py
==============================================================================
--- svnadmin/hooks/scripts/mailer.py	Tue Jan 14 15:54:26 2014	(r339692)
+++ svnadmin/hooks/scripts/mailer.py	Tue Jan 14 16:03:10 2014	(r339693)
@@ -678,6 +678,7 @@ def generate_content(renderer, cfg, repo
   params_with_rev = params.copy()
   params_with_rev['rev'] = repos.rev
   commit_url = cfg.get('commit_url', group, params_with_rev)
+  qat_url = cfg.get('qat_url', group, params_with_rev)
 
   # figure out the lists of changes outside the selected path-space
   other_added_data = other_replaced_data = other_deleted_data = \
@@ -700,6 +701,7 @@ def generate_content(renderer, cfg, repo
     rev=repos.rev,
     log=repos.get_rev_prop(svn.core.SVN_PROP_REVISION_LOG) or '',
     commit_url=commit_url,
+    qat_url=qat_url,
     added_data=generate_list('A', changelist, paths, True),
     replaced_data=generate_list('R', changelist, paths, True),
     deleted_data=generate_list('D', changelist, paths, True),
@@ -999,9 +1001,12 @@ class TextCommitRenderer:
     w('\nDate: %s\nNew Revision: %s\n' % (data.date, data.rev))
 
     if data.commit_url:
-      w('URL: %s\n\n' % data.commit_url)
-    else:
-      w('\n')
+      w('URL: %s\n' % data.commit_url)
+
+    if data.qat_url:
+      w('QAT: %s\n' % data.qat_url)
+
+    w('\n')
 
     w('Log:\n')
     for line in data.log.splitlines():