Launchpad itself

Merge lp:~smartboyhw/launchpad/bug-1137716-fix into lp:launchpad

  1. bug-1137716-fix
  2. Merge into devel
Proposed by Howard Chan
Status: Merged
Approved by: Colin Watson
Approved revision: no longer in the source branch.
Merged at revision: 16770
Proposed branch: lp:~smartboyhw/launchpad/bug-1137716-fix
Merge into: lp:launchpad
Diff against target: 58 lines (+6/-6)
3 files modified
lib/lp/code/browser/tests/test_branch.py (+3/-3)
lib/lp/code/stories/branches/xx-upload-directions.txt (+2/-2)
lib/lp/code/templates/branch-management.pt (+1/-1)
To merge this branch: bzr merge lp:~smartboyhw/launchpad/bug-1137716-fix
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+152557@code.launchpad.net

Commit message

Use correct --use-existing-dir flag for bzr branches.

Description of the change

To fix Bug 1137716.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Looks good to me, thanks. Sorry for the delay.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/browser/tests/test_branch.py'
2--- lib/lp/code/browser/tests/test_branch.py 2013-02-28 03:48:21 +0000
3+++ lib/lp/code/browser/tests/test_branch.py 2013-03-09 11:43:23 +0000
4@@ -228,16 +228,16 @@
5 self.assertFalse(view.is_empty_directory)
6
7 def test_empty_directories_use_existing(self):
8- # Push example should include --use-existing for empty directories.
9+ # Push example should include --use-existing-dir for empty directories.
10 branch = self.factory.makeBranch(owner=self.user)
11 text = self.getMainText(branch)
12- self.assertIn('push\n--use-existing', text)
13+ self.assertIn('push\n--use-existing-dir', text)
14 with person_logged_in(self.user):
15 # Make it look as though the branch has been pushed.
16 branch.branchChanged(
17 None, None, ControlFormat.BZR_METADIR_1, None, None)
18 text = self.getMainText(branch)
19- self.assertNotIn('push\n--use-existing', text)
20+ self.assertNotIn('push\n--use-existing-dir', text)
21
22 def test_user_can_upload(self):
23 # A user can upload if they have edit permissions.
24
25=== modified file 'lib/lp/code/stories/branches/xx-upload-directions.txt'
26--- lib/lp/code/stories/branches/xx-upload-directions.txt 2012-08-16 13:54:54 +0000
27+++ lib/lp/code/stories/branches/xx-upload-directions.txt 2013-03-09 11:43:23 +0000
28@@ -76,7 +76,7 @@
29 >>> instructions = find_tag_by_id(content, 'upload-directions')
30 >>> print extract_text(instructions)
31 Update this branch:
32- bzr push --use-existing lp://dev/~name12/gnome-terminal/pushed
33+ bzr push --use-existing-dir lp://dev/~name12/gnome-terminal/pushed
34
35
36 == SSH key directions ==
37@@ -183,7 +183,7 @@
38 >>> instructions = find_tag_by_id(content, 'upload-directions')
39 >>> print extract_text(instructions)
40 Update this branch:
41- bzr push --use-existing
42+ bzr push --use-existing-dir
43 lp://dev/~landscape-developers/gnome-terminal/pushed
44
45
46
47=== modified file 'lib/lp/code/templates/branch-management.pt'
48--- lib/lp/code/templates/branch-management.pt 2012-03-10 15:08:09 +0000
49+++ lib/lp/code/templates/branch-management.pt 2013-03-09 11:43:23 +0000
50@@ -48,7 +48,7 @@
51 <tt class="command">
52 bzr push
53 <tal:use-existing condition="view/is_empty_directory">
54- --use-existing
55+ --use-existing-dir
56 </tal:use-existing>
57 <span class="branch-url" tal:content="context/bzr_identity" />
58 </tt>