Merge lp:~cjohnston/launchpad/640882 into lp:launchpad

[Chris Johnston]

Add link to MP when sending out diff error emails

Add link to MP when sending out diff error emails

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py	2013-08-07 04:55:57 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py	2014-05-28 14:48:38 +0000
@@ -21,7 +21,6 @@
     'UpdatePreviewDiffJob',
     ]
 
-import contextlib
 from datetime import (
     datetime,
     timedelta,
@@ -101,8 +100,7 @@
     BaseRunnableJobSource,
     )
 from lp.services.mail.sendmail import format_address_for_person
-from lp.services.webapp import errorlog
-
+from lp.services.webapp import canonical_url
 
 class BranchMergeProposalJobType(DBEnumeratedType):
     """Values that ICodeImportJob.state can take."""
@@ -351,15 +349,16 @@
     def checkReady(self):
         """Is this job ready to run?"""
         bmp = self.branch_merge_proposal
+        url = canonical_url(bmp)
         if bmp.source_branch.last_scanned_id is None:
             raise UpdatePreviewDiffNotReady(
-                'The source branch has no revisions.')
+                'The source branch of %s has no revisions.' % url)
         if bmp.target_branch.last_scanned_id is None:
             raise UpdatePreviewDiffNotReady(
-                'The target branch has no revisions.')
+                'The target branch of %s has no revisions.' % url)
         if bmp.source_branch.pending_writes:
             raise BranchHasPendingWrites(
-                'The source branch has pending writes.')
+                'The source branch of %s has pending writes.' % url)
 
     def acquireLease(self, duration=600):
         return self.job.acquireLease(duration)

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2013-08-07 04:55:57 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2014-05-28 14:48:38 +0000
@@ -260,7 +260,9 @@
         self.assertEqual(
             'Launchpad encountered an error during the following operation: '
             'generating the diff for a merge proposal.  '
-            'The source branch has no revisions.',
+            'The source branch of http://code.launchpad.dev/~person-name-'
+            '100011/product-name-100002/branch-100009/+merge/1 has no '
+            'revisions.',
             email.get_payload(decode=True))
 
     def test_run_branches_pending_writes(self):

=== modified file 'lib/lp/soyuz/model/initializedistroseriesjob.py'
--- lib/lp/soyuz/model/initializedistroseriesjob.py	2013-07-04 08:32:03 +0000
+++ lib/lp/soyuz/model/initializedistroseriesjob.py	2014-05-28 14:48:38 +0000
@@ -141,7 +141,7 @@
         parts += ",".join(parents)
         pkgsets = [
             IStore(Packageset).get(Packageset, int(pkgsetid)).name
-            for pkgsetid in  self.packagesets]
+            for pkgsetid in self.packagesets]
         parts += ", architectures: %s" % (self.arches,)
         parts += ", archindep_archtag: %s" % self.archindep_archtag
         parts += ", packagesets: %s" % pkgsets
@@ -209,7 +209,7 @@
         ids.initialize()
 
     def notifyUserError(self, error):
-        """Calls up and slso saves the error text in this job's metadata.
+        """Calls up and also saves the error text in this job's metadata.
 
         See `BaseRunnableJob`.
         """