Merge lp:~rockstar/tarmac/review-url-commit-message into lp:tarmac

[Paul Hummer]

Add the review url to the commit message template plugin.

This branch just adds support for putting the review url in the commit message.

[dobey (dobey)]

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2010-10-12 19:58:22 +0000
+++ tarmac/bin/commands.py	2010-10-25 21:34:41 +0000
@@ -2,7 +2,6 @@
 import httplib2
 import logging
 import os
-import re
 
 from bzrlib.commands import Command
 from bzrlib.errors import PointlessMerge
@@ -17,6 +16,7 @@
 from tarmac.exceptions import (TarmacMergeError, TarmacCommandError,
                                UnapprovedChanges)
 from tarmac.plugin import load_plugins
+from tarmac.utility import get_review_url
 
 
 class TarmacCommand(Command):
@@ -233,9 +233,7 @@
                     target.cleanup()
                     continue
 
-                urlp = re.compile('http[s]?://api\.(.*)launchpad\.net/[^/]+/')
-                merge_url = urlp.sub(
-                    'http://code.launchpad.net/', proposal.self_link)
+                merge_url = get_review_url(proposal)
                 revprops = {'merge_url': merge_url}
 
                 commit_message = proposal.commit_message

=== modified file 'tarmac/plugins/commitmessage.py'
--- tarmac/plugins/commitmessage.py	2010-07-21 07:25:47 +0000
+++ tarmac/plugins/commitmessage.py	2010-10-25 21:34:41 +0000
@@ -17,6 +17,7 @@
 '''Tarmac plugin for enforcing a commit message format.'''
 from tarmac.hooks import tarmac_hooks
 from tarmac.plugins import TarmacPlugin
+from tarmac.utility import get_review_url
 
 
 class CommitMessageTemplate(TarmacPlugin):
@@ -107,6 +108,10 @@
         return ",".join(
             str(bug.id) for bug in self._proposal.source_branch.linked_bugs)
 
+    @property
+    def review_url(self):
+        return get_review_url(self._proposal)
+
 
 tarmac_hooks['tarmac_pre_commit'].hook(CommitMessageTemplate(),
     'Commit messsage template editor.')

=== modified file 'tarmac/plugins/tests/test_commitmessage.py'
--- tarmac/plugins/tests/test_commitmessage.py	2010-09-02 22:56:39 +0000
+++ tarmac/plugins/tests/test_commitmessage.py	2010-10-25 21:34:41 +0000
@@ -25,7 +25,8 @@
                     comment=Thing(vote=u"Approve"),
                     reviewer=Thing(
                         display_name="Virginia Voter", name="virginia")),
-                ])
+                ],
+            self_link=u"http://api.launchpad.net/1.0/~rockstar/tarmac/tarmac/+merge/1")
         self.info = CommitMessageTemplateInfo(self.proposal)
 
     def test_author(self):
@@ -45,6 +46,11 @@
             "Virgil Voter, Virginia Voter",
             self.info.approved_by)
 
+    def test_review_url(self):
+        self.assertEqual(
+            u"http://code.launchpad.net/~rockstar/tarmac/tarmac/+merge/1",
+            self.info.review_url)
+
     def test_approved_by_nicks(self):
         self.assertEqual(
             "virgil,virginia",

=== added file 'tarmac/utility.py'
--- tarmac/utility.py	1970-01-01 00:00:00 +0000
+++ tarmac/utility.py	2010-10-25 21:34:41 +0000
@@ -0,0 +1,10 @@
+"""Utilities for Tarmac."""
+import re
+
+
+def get_review_url(proposal):
+    """Return the web url for a given proposal."""
+    urlp = re.compile('http[s]?://api\.(.*)launchpad\.net/[^/]+/')
+    merge_url = urlp.sub(
+        'http://code.launchpad.net/', proposal.self_link)
+    return merge_url