Merge lp:~james-w/tarmac/commit-message into lp:~ubuntuone-hackers/tarmac/trunk

[James Westby]

Hi,

This adds the commit message plugin that CA used to set the [r=<reviewer>] and [bug=] things.

It might not be needed with the template plugin used by u1.

Thanks,

James

[lp:~james-w/tarmac/commit-message]

417. By James Westby on 2013-01-23

Merged utf8 into commit-message.

418. By James Westby on 2013-01-24

Merged utf8 into commit-message.

419. By James Westby on 2013-01-24

Merged utf8 into commit-message.

420. By James Westby on 2013-01-24

Merged utf8 into commit-message.

421. By James Westby on 2013-01-28

Remove the commit plugin.

422. By James Westby on 2013-01-31

Merged utf8 into commit-message.

Unmerged revisions

422. By James Westby on 2013-01-31

Merged utf8 into commit-message.

421. By James Westby on 2013-01-28

Remove the commit plugin.

420. By James Westby on 2013-01-24

Merged utf8 into commit-message.

419. By James Westby on 2013-01-24

Merged utf8 into commit-message.

418. By James Westby on 2013-01-24

Merged utf8 into commit-message.

417. By James Westby on 2013-01-23

Merged utf8 into commit-message.

=== modified file 'tarmac/plugins/command.py'
--- tarmac/plugins/command.py	2012-03-06 19:55:15 +0000
+++ tarmac/plugins/command.py	2012-12-18 21:20:41 +0000
@@ -185,7 +185,7 @@
                    u'%(output)s') % {
             'source': self.proposal.source_branch.display_name,
             'target': self.proposal.target_branch.display_name,
-            'output': u'\n'.join([stdout_value, stderr_value]),
+            'output': u'\n'.join([stdout_value.decode('utf-8', 'ignore'), stderr_value.decode('utf-8', 'ignore')]),
             }
         raise VerifyCommandFailed(message, comment)
 

=== added file 'tarmac/plugins/commit.py'
--- tarmac/plugins/commit.py	1970-01-01 00:00:00 +0000
+++ tarmac/plugins/commit.py	2012-12-18 21:20:41 +0000
@@ -0,0 +1,24 @@
+import re
+
+from tarmac.hooks import tarmac_hooks
+from tarmac.plugins import 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:
+                params.append("[bug=%s]" % bug.id)
+
+            proposal.commit_message = ("%s " % ",".join(params) +
+                                       proposal.commit_message)
+            self.logger.debug("Setting commit_message to %s",
+                              proposal.commit_message)
+        else:
+            self.logger.debug("%s has already right commit message",
+                              proposal)
+
+tarmac_hooks['tarmac_pre_commit'].hook(CommitMessage(),
+    'Commit messsage template editor.')