1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
# Copyright (C) 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for bzrlib.switch."""
import os
from bzrlib import branch, errors, switch, tests
class TestSwitch(tests.TestCaseWithTransport):
def _setup_tree(self):
tree = self.make_branch_and_tree('branch-1')
self.build_tree(['branch-1/file-1'])
tree.add('file-1')
tree.commit('rev1')
return tree
def test_switch_updates(self):
"""Test switch updates tree and keeps uncommitted changes."""
tree = self._setup_tree()
to_branch = tree.bzrdir.sprout('branch-2').open_branch()
self.build_tree(['branch-1/file-2'])
tree.add('file-2')
tree.remove('file-1')
tree.commit('rev2')
checkout = tree.branch.create_checkout('checkout', lightweight=True)
self.build_tree(['checkout/file-3'])
checkout.add('file-3')
self.failIfExists('checkout/file-1')
self.failUnlessExists('checkout/file-2')
switch.switch(checkout.bzrdir, to_branch)
self.failUnlessExists('checkout/file-1')
self.failIfExists('checkout/file-2')
self.failUnlessExists('checkout/file-3')
def test_switch_after_branch_moved(self):
"""Test switch after the branch is moved."""
tree = self._setup_tree()
checkout = tree.branch.create_checkout('checkout', lightweight=True)
self.build_tree(['branch-1/file-2'])
tree.add('file-2')
tree.remove('file-1')
tree.commit('rev2')
self.build_tree(['checkout/file-3'])
checkout.add('file-3')
checkout_dir = checkout.bzrdir
# rename the branch on disk, the checkout object is now invalid.
os.rename('branch-1', 'branch-2')
to_branch = branch.Branch.open('branch-2')
switch.switch(checkout.bzrdir, to_branch)
self.failIfExists('checkout/file-1')
self.failUnlessExists('checkout/file-2')
self.failUnlessExists('checkout/file-3')
def test_switch_on_heavy_checkout(self):
"""Test graceful failure on heavyweight checkouts."""
tree = self._setup_tree()
checkout = tree.branch.create_checkout('checkout-1', lightweight=False)
branch2 = self.make_branch('branch-2')
err = self.assertRaises(errors.BzrCommandError,
switch.switch, checkout.bzrdir, branch2)
self.assertContainsRe(str(err),
"The switch command can only be used on a lightweight checkout")
def test_switch_when_pending_merges(self):
"""Test graceful failure if pending merges are outstanding."""
# Create 2 branches and a checkout
tree = self._setup_tree()
tree2 = tree.bzrdir.sprout('branch-2').open_workingtree()
checkout = tree.branch.create_checkout('checkout', lightweight=True)
# Change tree2 and merge it into the checkout without committing
self.build_tree(['branch-2/file-2'])
tree2.add('file-2')
tree2.commit('rev2')
checkout.merge_from_branch(tree2.branch)
# Check the error reporting is as expected
err = self.assertRaises(errors.BzrCommandError,
switch.switch, checkout.bzrdir, tree2.branch)
self.assertContainsRe(str(err),
"Pending merges must be committed or reverted before using switch")
|