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
1=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
2--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-02-23 21:48:53 +0000
3+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt 2010-03-15 20:34:25 +0000
4@@ -80,13 +80,16 @@
5 ... print extract_text(find_tag_by_id(
6 ... browser.contents, 'proposal-summary'))
7 >>> print_summary(nopriv_browser)
8- Status:...
9+ Status:
10+ ...
11 Proposed branch:
12 lp://dev/~name12/gnome-terminal/klingon
13 Merge into:
14 lp://dev/~name12/gnome-terminal/main
15 Prerequisite:
16 lp://dev/~name12/gnome-terminal/pushed
17+ To merge this branch:
18+ bzr merge lp://dev/~name12/gnome-terminal/klingon
19
20
21 Editing a commit message
22
23=== modified file 'lib/lp/code/stories/branches/xx-propose-for-merging.txt'
24--- lib/lp/code/stories/branches/xx-propose-for-merging.txt 2010-01-14 04:32:38 +0000
25+++ lib/lp/code/stories/branches/xx-propose-for-merging.txt 2010-03-15 20:34:25 +0000
26@@ -35,6 +35,7 @@
27 Status: Needs review
28 Proposed branch: ...
29 Merge into: lp://dev/fooix
30+ To merge this branch: bzr merge ...
31
32
33 Work in progress
34@@ -57,3 +58,4 @@
35 Status: Work in progress
36 Proposed branch: ...
37 Merge into: lp://dev/fooix
38+ To merge this branch: bzr merge ...
39
40=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
41--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt 2010-02-24 08:05:27 +0000
42+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt 2010-03-15 20:34:25 +0000
43@@ -131,5 +131,9 @@
44 tal:content="context/preview_diff/conflicts"/>
45 </td>
46 </tr>
47+ <tr id="summary-row-merge-instruction">
48+ <th>To merge this branch:</th>
49+ <td>bzr merge <span class="branch-url" tal:content="context/source_branch/bzr_identity" /></td>
50+ </tr>
51 </tbody>
52 </table>