Launchpad itself

Merge lp:~james-w/launchpad/merge-proposal-instructions into lp:launchpad

  1. merge-proposal-instructions
  2. Merge into devel
Proposed by James Westby
Status: Merged
Approved by: Paul Hummer
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~james-w/launchpad/merge-proposal-instructions
Merge into: lp:launchpad
Diff against target: 52 lines (+10/-1)
3 files modified
lib/lp/code/stories/branches/xx-branchmergeproposals.txt (+4/-1)
lib/lp/code/stories/branches/xx-propose-for-merging.txt (+2/-0)
lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt (+4/-0)
To merge this branch: bzr merge lp:~james-w/launchpad/merge-proposal-instructions
Reviewer Review Type Date Requested Status
Paul Hummer (community) code Approve
Review via email: mp+21401@code.launchpad.net

Commit message

Merge proposal pages now tell you the command line to merge the source branch

Description of the change

Hi,

This fixes a long-standing annoyance of mine, that there wasn't
an unliked lp: url for the source branch on the merge proposal
page that I could easily copy.

It also echoes the "bzr branch" link on the branch page itself.

There are two modified test cases you can see in the diff.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Paul Hummer (rockstar) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-02-23 21:48:53 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-03-15 20:34:25 +0000
@@ -80,13 +80,16 @@
80 ... print extract_text(find_tag_by_id(80 ... print extract_text(find_tag_by_id(
81 ... browser.contents, 'proposal-summary'))81 ... browser.contents, 'proposal-summary'))
82 >>> print_summary(nopriv_browser)82 >>> print_summary(nopriv_browser)
83 Status:...83 Status:
84 ...
84 Proposed branch:85 Proposed branch:
85 lp://dev/~name12/gnome-terminal/klingon86 lp://dev/~name12/gnome-terminal/klingon
86 Merge into:87 Merge into:
87 lp://dev/~name12/gnome-terminal/main88 lp://dev/~name12/gnome-terminal/main
88 Prerequisite:89 Prerequisite:
89 lp://dev/~name12/gnome-terminal/pushed90 lp://dev/~name12/gnome-terminal/pushed
91 To merge this branch:
92 bzr merge lp://dev/~name12/gnome-terminal/klingon
9093
9194
92Editing a commit message95Editing a commit message
9396
=== modified file 'lib/lp/code/stories/branches/xx-propose-for-merging.txt'
--- lib/lp/code/stories/branches/xx-propose-for-merging.txt 2010-01-14 04:32:38 +0000
+++ lib/lp/code/stories/branches/xx-propose-for-merging.txt 2010-03-15 20:34:25 +0000
@@ -35,6 +35,7 @@
35 Status: Needs review35 Status: Needs review
36 Proposed branch: ...36 Proposed branch: ...
37 Merge into: lp://dev/fooix37 Merge into: lp://dev/fooix
38 To merge this branch: bzr merge ...
3839
3940
40Work in progress41Work in progress
@@ -57,3 +58,4 @@
57 Status: Work in progress58 Status: Work in progress
58 Proposed branch: ...59 Proposed branch: ...
59 Merge into: lp://dev/fooix60 Merge into: lp://dev/fooix
61 To merge this branch: bzr merge ...
6062
=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt 2010-02-24 08:05:27 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt 2010-03-15 20:34:25 +0000
@@ -131,5 +131,9 @@
131 tal:content="context/preview_diff/conflicts"/>131 tal:content="context/preview_diff/conflicts"/>
132 </td>132 </td>
133 </tr>133 </tr>
134 <tr id="summary-row-merge-instruction">
135 <th>To merge this branch:</th>
136 <td>bzr merge <span class="branch-url" tal:content="context/source_branch/bzr_identity" /></td>
137 </tr>
134 </tbody>138 </tbody>
135</table>139</table>