Launchpad itself

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

  1. pedantry-round3
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Approved by: Edwin Grubbs
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~rockstar/launchpad/pedantry-round3
Merge into: lp://staging/launchpad
Prerequisite: lp://staging/~rockstar/launchpad/pedantry-round2
Diff against target: 40 lines (+12/-3)
2 files modified
lib/lp/code/stories/branches/xx-junk-branches.txt (+11/-2)
lib/lp/code/templates/branch-index.pt (+1/-1)
To merge this branch: bzr merge lp://staging/~rockstar/launchpad/pedantry-round3
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) code Approve
Review via email: mp+17706@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Hummer (rockstar) wrote :

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

Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/stories/branches/xx-junk-branches.txt'
2--- lib/lp/code/stories/branches/xx-junk-branches.txt 2009-07-24 02:25:27 +0000
3+++ lib/lp/code/stories/branches/xx-junk-branches.txt 2010-01-21 08:46:14 +0000
4@@ -1,4 +1,5 @@
5-= Junk Branches =
6+Junk Branches
7+=============
8
9 Create a person and team.
10
11@@ -30,7 +31,15 @@
12 Nearby
13 Other branches owned by Eric
14
15-== Team Junk Branches ==
16+Junk branches do not support merge proposals, so the "Branch Merges" section of
17+the page should not be shown.
18+
19+ >>> print find_tag_by_id(browser.contents, 'branch-merges')
20+ None
21+
22+
23+Team Junk Branches
24+==================
25
26 Junk branches can also be associated with a team.
27
28
29=== modified file 'lib/lp/code/templates/branch-index.pt'
30--- lib/lp/code/templates/branch-index.pt 2010-01-13 22:25:01 +0000
31+++ lib/lp/code/templates/branch-index.pt 2010-01-21 08:46:14 +0000
32@@ -114,7 +114,7 @@
33 </div>
34 </div>
35
36- <div class="yui-g">
37+ <div class="yui-g" tal:condition="view/show_merge_links">
38
39 <div class="portlet" id="branch-merges">
40 <h2>Branch merges</h2>