launchpad-reviewers team mailing list archive

[Robert Collins <robertc@xxxxxxxxxxxxxxxxx>]

Robert Collins has proposed merging lp:~lifeless/launchpad/code into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


Make merge proposal emails a little nicer.
-- 
https://code.launchpad.net/~lifeless/launchpad/code/+merge/31596
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~lifeless/launchpad/code into lp:launchpad/devel.

=== modified file 'lib/canonical/launchpad/emailtemplates/branch-merge-proposal-created.txt'
--- lib/canonical/launchpad/emailtemplates/branch-merge-proposal-created.txt	2009-10-28 20:13:39 +0000
+++ lib/canonical/launchpad/emailtemplates/branch-merge-proposal-created.txt	2010-08-03 01:54:50 +0000
@@ -1,6 +1,6 @@
 %(proposal_registrant)s has proposed merging %(source_branch)s into %(target_branch)s%(prerequisite)s.
 
-%(reviews)s%(related_bugs)s%(gap)s%(comment)s%(diff_cutoff_warning)s
+%(reviews)s%(related_bugs)s%(gap)s%(comment)s
 -- 
-%(proposal_url)s
+%(diff_cutoff_warning)s%(proposal_url)s
 %(reason)s%(edit_subscription)s

=== modified file 'lib/canonical/launchpad/emailtemplates/review-requested.txt'
--- lib/canonical/launchpad/emailtemplates/review-requested.txt	2009-08-04 09:15:32 +0000
+++ lib/canonical/launchpad/emailtemplates/review-requested.txt	2010-08-03 01:54:50 +0000
@@ -1,7 +1,7 @@
 You have been requested to review the proposed merge of %(source_branch)s into %(target_branch)s.
 
-%(comment)s%(diff_cutoff_warning)s
+%(comment)s
 
 -- 
-%(proposal_url)s
+%(diff_cutoff_warning)s%(proposal_url)s
 %(reason)s%(edit_subscription)s

=== modified file 'lib/lp/code/mail/branchmergeproposal.py'
--- lib/lp/code/mail/branchmergeproposal.py	2010-03-30 03:11:26 +0000
+++ lib/lp/code/mail/branchmergeproposal.py	2010-08-03 01:54:50 +0000
@@ -135,7 +135,7 @@
                     inline=True, filename='review-diff.txt')
 
     def _generateTemplateParams(self):
-        """For template params that don't change, calcualte just once."""
+        """For template params that don't change, calculate just once."""
         proposal = self.merge_proposal
         params = {
             'proposal_registrant': proposal.registrant.displayname,
@@ -179,7 +179,7 @@
 
         if (self.preview_diff is not None and self.preview_diff.oversized):
             params['diff_cutoff_warning'] = (
-                "The attached diff has been truncated due to its size.")
+                "The attached diff has been truncated due to its size.\n")
 
         params['reviews'] = self._getRequestedReviews()
         params['related_bugs'] = self._getRelatedBugs()

=== modified file 'lib/lp/code/mail/tests/test_branchmergeproposal.py'
--- lib/lp/code/mail/tests/test_branchmergeproposal.py	2010-05-25 03:13:25 +0000
+++ lib/lp/code/mail/tests/test_branchmergeproposal.py	2010-08-03 01:54:50 +0000
@@ -277,7 +277,7 @@
         self.assertEqual('inline; filename="review-diff.txt"',
                          attachment['Content-Disposition'])
         self.assertEqual(diff_text[:25], attachment.get_payload(decode=True))
-        warning_text = "The attached diff has been truncated due to its size."
+        warning_text = "The attached diff has been truncated due to its size.\n"
         self.assertTrue(warning_text in ctrl.body)
 
     def getProposalUpdatedEmailJob(self, merge_proposal):