29
29
class TestRemoveBranch(TestCaseWithTransport):
31
def example_branch(self, path='.', format=None):
31
def example_tree(self, path='.', format=None):
32
32
tree = self.make_branch_and_tree(path, format=format)
33
33
self.build_tree_contents([(path + '/hello', 'foo')])
41
41
def test_remove_local(self):
42
42
# Remove a local branch.
43
self.example_branch('a')
44
self.run_bzr('rmbranch a')
43
tree = self.example_tree('a')
44
self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
46
self.run_bzr('rmbranch --force a')
45
47
dir = bzrdir.BzrDir.open('a')
46
48
self.assertFalse(dir.has_branch())
47
49
self.assertPathExists('a/hello')
48
50
self.assertPathExists('a/goodbye')
50
52
def test_no_branch(self):
51
# No branch in the current directory.
53
# No branch in the current directory.
52
54
self.make_repository('a')
53
55
self.run_bzr_error(['Not a branch'],
58
def test_no_tree(self):
59
# removing the active branch is possible if there is no tree
60
tree = self.example_tree('a')
61
tree.bzrdir.destroy_workingtree()
62
self.run_bzr('rmbranch', working_dir='a')
63
dir = bzrdir.BzrDir.open('a')
64
self.assertFalse(dir.has_branch())
56
66
def test_no_arg(self):
57
67
# location argument defaults to current directory
58
self.example_branch('a')
59
self.run_bzr('rmbranch', working_dir='a')
68
self.example_tree('a')
69
self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
71
self.run_bzr('rmbranch --force', working_dir='a')
60
72
dir = bzrdir.BzrDir.open('a')
61
73
self.assertFalse(dir.has_branch())
63
75
def test_remove_colo(self):
64
76
# Remove a colocated branch.
65
tree = self.example_branch('a', format='development-colo')
77
tree = self.example_tree('a')
66
78
tree.bzrdir.create_branch(name="otherbranch")
67
79
self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
68
80
self.run_bzr('rmbranch %s,branch=otherbranch' % tree.bzrdir.user_url)
70
82
self.assertFalse(dir.has_branch('otherbranch'))
71
83
self.assertTrue(dir.has_branch())
85
def test_remove_colo_directory(self):
86
# Remove a colocated branch.
87
tree = self.example_tree('a')
88
tree.bzrdir.create_branch(name="otherbranch")
89
self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
90
self.run_bzr('rmbranch otherbranch -d %s' % tree.bzrdir.user_url)
91
dir = bzrdir.BzrDir.open('a')
92
self.assertFalse(dir.has_branch('otherbranch'))
93
self.assertTrue(dir.has_branch())
95
def test_remove_active_colo_branch(self):
96
# Remove a colocated branch.
97
dir = self.make_repository('a').bzrdir
98
branch = dir.create_branch('otherbranch')
99
branch.create_checkout('a')
100
self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
101
'rmbranch otherbranch -d %s' % branch.bzrdir.user_url)
102
self.assertTrue(dir.has_branch('otherbranch'))
103
self.run_bzr('rmbranch --force otherbranch -d %s' % branch.bzrdir.user_url)
104
self.assertFalse(dir.has_branch('otherbranch'))
74
107
class TestSmartServerRemoveBranch(TestCaseWithTransport):
83
116
# being too low. If rpc_count increases, more network roundtrips have
84
117
# become necessary for this use case. Please do not adjust this number
85
118
# upwards without agreement from bzr's network support maintainers.
86
self.assertLength(2, self.hpss_calls)
119
self.assertLength(5, self.hpss_calls)
87
120
self.assertLength(1, self.hpss_connections)
88
121
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)