Merge lp:~wallyworld/launchpad/delete-bugtask-show-in-comments-889195 into lp:launchpad

[Ian Booth]

[r=wgrant][bug=889195] Include delete bug task activities in the bug comments listing.

== Implementation ==

Simple change to regex used in BugTaskView._getInterestingActivity() to include delete bug task activities in the bug comments listing. Also update BugActivityItem to render the delete bug task activity text.

== Tests ==

Add extra doc test to xx-bug-activity.txt

== Lint ==

Linting changed files:
  lib/lp/bugs/browser/bugtask.py
  lib/lp/bugs/stories/bugs/xx-bug-activity.txt

[William Grant (wgrant)]

We don't use capitals in any of the other text around there, so I'd suggest s/No/no/.

bugtask_deleted_re should probably also be merged into bugtask_change_re, along with 'affects' which it is quite similar to.

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2011-11-16 00:09:49 +0000
+++ lib/lp/bugs/browser/bugtask.py	2011-11-17 05:55:28 +0000
@@ -776,7 +776,7 @@
             activity = self.context.bug.activity
         bug_change_re = (
             'affects|description|security vulnerability|'
-            'summary|tags|visibility')
+            'summary|tags|visibility|bug task deleted')
         bugtask_change_re = (
             '[a-z0-9][a-z0-9\+\.\-]+( \([A-Za-z0-9\s]+\))?: '
             '(assignee|importance|milestone|status)')
@@ -4361,6 +4361,9 @@
                 else:
                     return_dict[key] = cgi.escape(return_dict[key])
 
+        elif attribute == 'bug task deleted':
+            return 'no longer affects %s' % self.oldvalue
+
         else:
             # Our default state is to just return oldvalue and newvalue.
             # Since we don't necessarily know what they are, we escape

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2011-10-20 00:53:01 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2011-11-17 05:55:28 +0000
@@ -297,3 +297,18 @@
     affects:
     mozilla-firefox (Ubuntu) => linux-source-2.6.15 (Ubuntu)
     --------
+
+If a bug task is deleted the pillar no longer affected will be shown.
+
+    >>> admin_browser.open("http://bugs.launchpad.dev/firefox/+bug/6")
+    >>> admin_browser.getLink(url='+distrotask').click()
+    >>> admin_browser.getControl('Distribution').value = ['ubuntu']
+    >>> admin_browser.getControl('Continue').click()
+    >>> admin_browser.open("https://bugs.launchpad.dev/ubuntu/+bug/6/+delete")
+    >>> admin_browser.getControl('Delete').click()
+    >>> print_comments(admin_browser.contents)
+    Foo Bar (name16)
+    ... ago
+    bug task deleted:
+    no longer affects ubuntu
+    --------