Merge lp:~rockstar/launchpad/pedantry-round3 into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi there-

  This branch fixes bug #442386 - Junk branches don't support merge proposals.
The idea is that if you need to use merge proposals, create a project. Since
they don't support merge proposals, the "Branch Merges" section is no longer
shown on junk branches. This was just an oversight in the 3.0 conversion and
should have been taken care of a long time ago.

Cheers,
Paul

[Edwin Grubbs (edwin-grubbs)]

Hi Paul,

This change looks good. I just have a comment on the test.

merge-conditional

-Edwin

>=== modified file 'lib/lp/code/stories/branches/xx-junk-branches.txt'
>--- lib/lp/code/stories/branches/xx-junk-branches.txt 2009-07-24 02:25:27 +0000
>+++ lib/lp/code/stories/branches/xx-junk-branches.txt 2010-01-20 00:48:20 +0000
>@@ -30,7 +31,14 @@
> Nearby
> Other branches owned by Eric
>
>-== Team Junk Branches ==
>+Junk branches do not support merge proposals, so the "Branch Merges" section of
>+the page should not be shown.
>+
>+ >>> assert find_tag_by_id(browser.contents, 'branch-merges') is None

If this fails, we would like to know what it found, so doctests should
match the return value like this:
    >>> print find_tag_by_id(browser.contents, 'branch-merges')
    None

>+
>+
>+Team Junk Branches
>+==================
>
> Junk branches can also be associated with a team.
>

review: Approve (code)

=== modified file 'lib/lp/code/stories/branches/xx-junk-branches.txt'
--- lib/lp/code/stories/branches/xx-junk-branches.txt	2009-07-24 02:25:27 +0000
+++ lib/lp/code/stories/branches/xx-junk-branches.txt	2010-01-21 08:46:14 +0000
@@ -1,4 +1,5 @@
-= Junk Branches =
+Junk Branches
+=============
 
 Create a person and team.
 
@@ -30,7 +31,15 @@
     Nearby
     Other branches owned by Eric
 
-== Team Junk Branches ==
+Junk branches do not support merge proposals, so the "Branch Merges" section of
+the page should not be shown.
+
+    >>> print find_tag_by_id(browser.contents, 'branch-merges')
+    None
+
+
+Team Junk Branches
+==================
 
 Junk branches can also be associated with a team.
 

=== modified file 'lib/lp/code/templates/branch-index.pt'
--- lib/lp/code/templates/branch-index.pt	2010-01-13 22:25:01 +0000
+++ lib/lp/code/templates/branch-index.pt	2010-01-21 08:46:14 +0000
@@ -114,7 +114,7 @@
     </div>
   </div>
 
-  <div class="yui-g">
+  <div class="yui-g" tal:condition="view/show_merge_links">
 
     <div class="portlet" id="branch-merges">
       <h2>Branch merges</h2>