Merge lp:~thumper/launchpad/no-none-subject into lp:launchpad

[Tim Penhey]

Stop using None as an email subject for some revision emails.

[Tim Penhey (thumper)]

Simple fix to provide real subject lines to the emails that get sent out for the initial scan of a branch, and when revisions are removed off the mainline.

[Michael Hudson-Doyle (mwhudson)]

Makes sense to me.

[Michael Hudson-Doyle (mwhudson)]

review: Approve

=== modified file 'lib/lp/codehosting/scanner/email.py'
--- lib/lp/codehosting/scanner/email.py	2010-01-06 12:15:42 +0000
+++ lib/lp/codehosting/scanner/email.py	2010-02-22 19:58:16 +0000
@@ -38,15 +38,18 @@
     if number_removed == 0:
         return
     if number_removed == 1:
-        contents = '1 revision was removed from the branch.'
+        count = '1 revision'
+        contents = '%s was removed from the branch.' % count
     else:
-        contents = ('%d revisions were removed from the branch.'
-                    % number_removed)
+        count = '%d revisions' % number_removed
+        contents = '%s were removed from the branch.' % count
     # No diff is associated with the removed email.
+    subject = "[Branch %s] %s removed" % (
+        revisions_removed.db_branch.unique_name, count)
     getUtility(IRevisionMailJobSource).create(
         revisions_removed.db_branch, revno='removed',
         from_address=config.canonical.noreply_from_address,
-        body=contents, perform_diff=False, subject=None)
+        body=contents, perform_diff=False, subject=subject)
 
 
 @adapter(events.TipChanged)
@@ -62,9 +65,11 @@
         message = ('First scan of the branch detected %s'
                    ' in the revision history of the branch.' %
                    revisions)
+        subject = "[Branch %s] %s" % (
+            tip_changed.db_branch.unique_name, revisions)
         getUtility(IRevisionMailJobSource).create(
             tip_changed.db_branch, 'initial',
-            config.canonical.noreply_from_address, message, False, None)
+            config.canonical.noreply_from_address, message, False, subject)
     else:
         getUtility(IRevisionsAddedJobSource).create(
             tip_changed.db_branch, tip_changed.db_branch.last_scanned_id,

=== modified file 'lib/lp/codehosting/scanner/tests/test_email.py'
--- lib/lp/codehosting/scanner/tests/test_email.py	2009-07-17 00:26:05 +0000
+++ lib/lp/codehosting/scanner/tests/test_email.py	2010-02-22 19:58:16 +0000
@@ -63,8 +63,12 @@
         self.assertEqual(len(stub.test_emails), 1)
         [initial_email] = stub.test_emails
         expected = 'First scan of the branch detected 0 revisions'
-        email_body = email.message_from_string(initial_email[2]).get_payload()
+        message = email.message_from_string(initial_email[2])
+        email_body = message.get_payload()
         self.assertTextIn(expected, email_body)
+        self.assertEqual(
+            '[Branch %s] 0 revisions' % self.db_branch.unique_name,
+            message['Subject'])
 
     def test_import_revision(self):
         self.commitRevision()
@@ -74,8 +78,12 @@
         [initial_email] = stub.test_emails
         expected = ('First scan of the branch detected 1 revision'
                     ' in the revision history of the=\n branch.')
-        email_body = email.message_from_string(initial_email[2]).get_payload()
+        message = email.message_from_string(initial_email[2])
+        email_body = message.get_payload()
         self.assertTextIn(expected, email_body)
+        self.assertEqual(
+            '[Branch %s] 1 revision' % self.db_branch.unique_name,
+            message['Subject'])
 
     def test_import_uncommit(self):
         self.commitRevision()
@@ -88,9 +96,12 @@
         self.assertEqual(len(stub.test_emails), 1)
         [uncommit_email] = stub.test_emails
         expected = '1 revision was removed from the branch.'
-        email_body = email.message_from_string(
-            uncommit_email[2]).get_payload()
+        message = email.message_from_string(uncommit_email[2])
+        email_body = message.get_payload()
         self.assertTextIn(expected, email_body)
+        self.assertEqual(
+            '[Branch %s] 1 revision removed' % self.db_branch.unique_name,
+            message['Subject'])
 
     def test_import_recommit(self):
         # When scanning the uncommit and new commit there should be an email