Merge lp:~thumper/launchpad/description-change-email into lp:launchpad

[Tim Penhey]

Email subscribers when a merge proposal description changes.

Changing the description on a merge proposal doesn't currently cause an email to be sent.

This branch fixes that issue.

[Michael Hudson-Doyle (mwhudson)]

After a bit of head scratching to figure out how the mail stuff works, this looks fine to me.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-03-05 19:41:41 +0000
+++ .bzrignore	2010-03-09 02:48:27 +0000
@@ -60,4 +60,5 @@
 .testrepository
 .memcache.pid
 ./pipes
+lib/canonical/launchpad/apidoc/wadl-development-*.xml
 tags.new

=== modified file 'lib/lp/code/adapters/branch.py'
--- lib/lp/code/adapters/branch.py	2009-10-01 13:25:12 +0000
+++ lib/lp/code/adapters/branch.py	2010-03-09 02:48:27 +0000
@@ -69,7 +69,7 @@
     delta_values = (
         'registrant', 'source_branch', 'target_branch', 'prerequisite_branch',
         'queue_status', 'queue_position',)
-    new_values = ('commit_message', 'whiteboard',)
+    new_values = ('commit_message', 'whiteboard', 'description')
     interface = IBranchMergeProposal
 
     def __init__(self, **kwargs):

=== modified file 'lib/lp/code/adapters/tests/test_branch.py'
--- lib/lp/code/adapters/tests/test_branch.py	2009-06-25 04:06:00 +0000
+++ lib/lp/code/adapters/tests/test_branch.py	2010-03-09 02:48:27 +0000
@@ -48,11 +48,13 @@
             registrant=registrant)
         old_merge_proposal = BranchMergeProposalDelta.snapshot(merge_proposal)
         merge_proposal.commit_message = 'Change foo into bar.'
+        merge_proposal.description = 'Set the description.'
         merge_proposal.markAsMerged()
         delta = BranchMergeProposalDelta.construct(
             old_merge_proposal, merge_proposal)
         assert delta is not None
         self.assertEqual('Change foo into bar.', delta.commit_message)
+        self.assertEqual('Set the description.', delta.description)
         self.assertEqual(
             {'old': BranchMergeProposalStatus.WORK_IN_PROGRESS,
             'new': BranchMergeProposalStatus.MERGED},

=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py	2010-02-26 09:54:20 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py	2010-03-09 02:48:27 +0000
@@ -97,7 +97,7 @@
                 "If True, this proposal is visible only to subscribers.")))
 
     description = exported(
-        Text(title=_('Description of the Change'), required=False,
+        Text(title=_('Description'), required=False,
              description=_(
                 "A detailed description of the changes that are being "
                 "addressed by the branch being proposed to be merged."),

=== modified file 'lib/lp/code/mail/tests/test_branchmergeproposal.py'
--- lib/lp/code/mail/tests/test_branchmergeproposal.py	2010-02-17 08:57:04 +0000
+++ lib/lp/code/mail/tests/test_branchmergeproposal.py	2010-03-09 02:48:27 +0000
@@ -135,7 +135,9 @@
         mailer = BMPMailer.forCreation(bmp, bmp.registrant)
         ctrl = mailer.generateEmail('[e-mail]', subscriber)
         self.assertIn(
-            '\nRequested reviews:\n  Review-person (review-person)\n\n-- \n',
+            '\nRequested reviews:'
+            '\n  Review-person (review-person)'
+            '\n\n-- \n',
             ctrl.body)
 
     def test_forCreation_with_review_request_and_bug(self):
@@ -286,6 +288,7 @@
         old_merge_proposal = BranchMergeProposalDelta.snapshot(merge_proposal)
         merge_proposal.requestReview()
         merge_proposal.commit_message = 'new commit message'
+        merge_proposal.description = 'change description'
         mailer = BMPMailer.forModification(
             old_merge_proposal, merge_proposal, merge_proposal.registrant)
         return mailer, subscriber
@@ -306,7 +309,8 @@
         mailer, subscriber = self.makeMergeProposalMailerModification()
         self.assertEqual(
             '    Status: Work in progress => Needs review\n\n'
-            'Commit Message changed to:\n\nnew commit message',
+            'Commit Message changed to:\n\nnew commit message\n\n'
+            'Description changed to:\n\nchange description',
             mailer.textDelta())
 
     def test_generateEmail(self):
@@ -327,6 +331,10 @@
 Commit Message changed to:
 
 new commit message
+
+Description changed to:
+
+change description
 --\x20
 %s
 %s