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

Proposed by Martin Pool on 2010-01-28
Status: Merged
Approved by: Michael Hudson-Doyle on 2010-02-01
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~mbp/launchpad/436294-review-mails
Merge into: lp:launchpad/db-devel
Diff against target: 36 lines (+4/-4)
2 files modified
lib/lp/code/mail/branchmergeproposal.py (+3/-3)
lib/lp/code/mail/tests/test_branchmergeproposal.py (+1/-1)
To merge this branch: bzr merge lp:~mbp/launchpad/436294-review-mails
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle 2010-01-28 Approve on 2010-02-01
Review via email: mp+18227@code.launchpad.net

Commit message

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

To post a comment you must log in.
Martin Pool (mbp) wrote :

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) wrote :

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

Martin Pool (mbp) wrote :

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) wrote :

Looks fine to me.

review: Approve
Martin Pool (mbp) wrote :

Could one of you please land this for me?

Jonathan Lange (jml) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/mail/branchmergeproposal.py'
2--- lib/lp/code/mail/branchmergeproposal.py 2009-11-12 21:27:16 +0000
3+++ lib/lp/code/mail/branchmergeproposal.py 2010-01-28 18:38:25 +0000
4@@ -131,7 +131,7 @@
5 if delta is None:
6 return None
7 return cls(
8- '%(proposal_title)s updated',
9+ '%(proposal_title)s',
10 'branch-merge-proposal-updated.txt', recipients,
11 merge_proposal, from_address, delta, get_msgid())
12
13@@ -146,8 +146,8 @@
14 merge_proposal.registrant)):
15 comment = merge_proposal.root_comment
16 return cls(
17- 'Request to review proposed merge of %(source_branch)s into '
18- '%(target_branch)s', 'review-requested.txt', recipients,
19+ '%(proposal_title)s',
20+ 'review-requested.txt', recipients,
21 merge_proposal, from_address, message_id=get_msgid(),
22 comment=comment, preview_diff=merge_proposal.preview_diff,
23 direct_email=True)
24
25=== modified file 'lib/lp/code/mail/tests/test_branchmergeproposal.py'
26--- lib/lp/code/mail/tests/test_branchmergeproposal.py 2009-10-28 20:13:39 +0000
27+++ lib/lp/code/mail/tests/test_branchmergeproposal.py 2010-01-28 18:38:25 +0000
28@@ -298,7 +298,7 @@
29 ctrl = mailer.generateEmail('baz.quxx@example.com', subscriber)
30 self.assertEqual('[Merge] '
31 'lp://dev/~bob/super-product/fix-foo-for-bar into '
32- 'lp://dev/~mary/super-product/bar updated', ctrl.subject)
33+ 'lp://dev/~mary/super-product/bar', ctrl.subject)
34 url = canonical_url(mailer.merge_proposal)
35 reason = mailer._recipients.getReason(
36 subscriber.preferredemail.email)[0].getReason()

Subscribers

People subscribed via source and target branches

to status/vote changes: