Merge lp:~brian-murray/launchpad/text-interface-patch into lp:launchpad

[Brian Murray]

The +text interface of a bug report currently displays all attachments to a bug report and makes no distinction between those attachments that are patches and those that are not. This branch separates attachments that are patches out into their own section.

Some discussion relating to this appears in bug 344054.

The test modified is:
lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt

[Deryck Hodge (deryck)]

Looks good. Feel free to land this once PQM reopens.

Cheers,
deryck

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2010-05-16 23:56:51 +0000
+++ lib/lp/bugs/browser/bug.py	2010-06-03 22:07:26 +0000
@@ -791,7 +791,13 @@
 
         text.append('attachments: ')
         for attachment in bug.attachments:
-            text.append(' %s' % self.attachment_text(attachment))
+            if attachment.type != BugAttachmentType.PATCH:
+                text.append(' %s' % self.attachment_text(attachment))
+
+        text.append('patches: ')
+        for attachment in bug.attachments:
+            if attachment.type == BugAttachmentType.PATCH:
+                text.append(' %s' % self.attachment_text(attachment))
 
         text.append('tags: %s' % ' '.join(bug.tags))
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt	2010-05-21 12:57:42 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt	2010-06-03 22:07:26 +0000
@@ -23,6 +23,10 @@
     >>> a2 = bug.addAttachment(mark, content, "comment for file with space",
     ...     "file with space.txt",
     ...     content_type='text/plain;\n  name="file with space.txt"')
+    >>> content = StringIO.StringIO("Yes we can!")
+    >>> a3 = bug.addAttachment(mark, content, "comment for patch",
+    ...      "bug-patch.diff", is_patch=True, content_type='text/plain',
+    ...      description="a patch")
 
 Next, we'll cycle through all statuses so the dates are present:
 
@@ -68,6 +72,8 @@
     attachments:
         http://.../file_a.txt text/html
         http://.../file%20with%20space.txt text/plain; name="file with space.txt"
+    patches:
+        http://.../bug-patch.diff text/plain
     tags: 
     subscribers: 
         Steve Alexander (stevea)
@@ -292,6 +298,7 @@
     private: yes
     security: yes
     attachments:
+    patches:
     tags: lunch-money
     subscribers:
         Karl Tilbury (karl)