yellow team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/lp-tarmac-configs/tarmac-approvers-list into lp:~yellow/lp-tarmac-configs/tarmac-puppet.

Requested reviews:
  Yellow Squad (yellow)

For more details, see:
https://code.launchpad.net/~bac/lp-tarmac-configs/tarmac-approvers-list/+merge/114397

Currently our tarmac sets the commit message to "[r=approver] developer msg" but the 'approver' used is the person who does the final toggling of the MP to 'Approved', not the list of reviewers who actually reviewed and voted on the MP.

In our work-flow it is actually recommended that the developer do the final approval since that triggers the landing.  So it currently looks like developers are self-approving their MPs.

This change uses the voter list.
-- 
https://code.launchpad.net/~bac/lp-tarmac-configs/tarmac-approvers-list/+merge/114397
Your team Yellow Squad is requested to review the proposed merge of lp:~bac/lp-tarmac-configs/tarmac-approvers-list into lp:~yellow/lp-tarmac-configs/tarmac-puppet.

=== modified file 'commit.py'
--- commit.py	2012-06-26 21:36:24 +0000
+++ commit.py	2012-07-11 11:23:32 +0000
@@ -1,15 +1,21 @@
 import re
 
 from tarmac.hooks import tarmac_hooks
-from tarmac.plugins import TarmacPlugin
+from tarmac.plugins import (
+    CommitMessageTemplateInfo,
+    TarmacPlugin,
+    )
 
 
 class CommitMessage(TarmacPlugin):
 
     def run(self, command, target, source, proposal):
         if not re.match(r'^\[.+?\].*$', proposal.commit_message):
-            params = ["[r=%s]" % proposal.reviewer.name]
-            for bug in proposal.source_branch.linked_bugs:
+            cmti = CommitMessageTemplateInfo(proposal)
+            approvers = cmti.approved_by_nicks()
+            params = ["[r=%s]" % approvers]
+            bugs = cmti.bugs_fixed()
+            for bug in bugs.split(','):
                 params.append("[bug=%s]" % bug.id)
 
             proposal.commit_message = ("%s " % ",".join(params) +
@@ -17,7 +23,7 @@
             self.logger.debug("Setting commit_message to %s",
                               proposal.commit_message)
         else:
-            self.logger.debug("%s has already right commit message",
+            self.logger.debug("%s already has valid commit message",
                               proposal)
 
 tarmac_hooks['tarmac_pre_commit'].hook(CommitMessage(),