Merge lp:~mbp/launchpad/436294-review-mails into lp:launchpad/db-devel

[Martin Pool]

All emails sent about merge proposals now have more consistent subject lines; they should thread properly in gmail.

[Martin Pool (mbp)]

Here's a short patch that changes the merge review mails to use the same subject. This is a bit of a pragmatic concession to gmail, but I think is worthwhile even for other clients: the 'updated' at the end doesn't tell you much because all the mails are for kinds of updates, and the 'requested review ....' is needlessly different in style.

[Tim Penhey (thumper)]

Fair enough, but there will be tests that need updating too.

[Martin Pool (mbp)]

Fixed in a later push, I think?

- Martin

On 28/01/2010 10:15 PM, "Tim Penhey" <email address hidden> wrote:

Fair enough, but there will be tests that need updating too.

--
https://code.launchpad.net/~mbp/launchpad/436294-review-mails/+merge/18227You
are the owner of ...

[Michael Hudson-Doyle (mwhudson)]

Looks fine to me.

review: Approve

[Martin Pool (mbp)]

Could one of you please land this for me?

[Jonathan Lange (jml)]

On Tue, Feb 2, 2010 at 4:51 PM, Martin Pool <email address hidden> wrote:
> Could one of you please land this for me?

Sure.

jml

=== modified file 'lib/lp/code/mail/branchmergeproposal.py'
--- lib/lp/code/mail/branchmergeproposal.py	2009-11-12 21:27:16 +0000
+++ lib/lp/code/mail/branchmergeproposal.py	2010-01-28 18:38:25 +0000
@@ -131,7 +131,7 @@
         if delta is None:
             return None
         return cls(
-            '%(proposal_title)s updated',
+            '%(proposal_title)s',
             'branch-merge-proposal-updated.txt', recipients,
             merge_proposal, from_address, delta, get_msgid())
 
@@ -146,8 +146,8 @@
              merge_proposal.registrant)):
             comment = merge_proposal.root_comment
         return cls(
-            'Request to review proposed merge of %(source_branch)s into '
-            '%(target_branch)s', 'review-requested.txt', recipients,
+            '%(proposal_title)s',
+            'review-requested.txt', recipients,
             merge_proposal, from_address, message_id=get_msgid(),
             comment=comment, preview_diff=merge_proposal.preview_diff,
             direct_email=True)

=== modified file 'lib/lp/code/mail/tests/test_branchmergeproposal.py'
--- lib/lp/code/mail/tests/test_branchmergeproposal.py	2009-10-28 20:13:39 +0000
+++ lib/lp/code/mail/tests/test_branchmergeproposal.py	2010-01-28 18:38:25 +0000
@@ -298,7 +298,7 @@
         ctrl = mailer.generateEmail('[e-mail]', subscriber)
         self.assertEqual('[Merge] '
             'lp://dev/~bob/super-product/fix-foo-for-bar into '
-            'lp://dev/~mary/super-product/bar updated', ctrl.subject)
+            'lp://dev/~mary/super-product/bar', ctrl.subject)
         url = canonical_url(mailer.merge_proposal)
         reason = mailer._recipients.getReason(
             subscriber.preferredemail.email)[0].getReason()