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
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
# Copyright (C) 2007 Canonical Ltd
# -*- coding: utf-8 -*-
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for the switch command of bzr."""
import os
from bzrlib.workingtree import WorkingTree
from bzrlib.tests.blackbox import ExternalBase
class TestSwitch(ExternalBase):
def test_switch_up_to_date_light_checkout(self):
self.make_branch_and_tree('branch')
self.run_bzr('branch branch branch2')
self.run_bzr('checkout --lightweight branch checkout')
os.chdir('checkout')
out, err = self.run_bzr('switch ../branch2')
self.assertContainsRe(err, 'Tree is up to date at revision 0.\n')
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
self.assertEqual('', out)
def test_switch_out_of_date_light_checkout(self):
self.make_branch_and_tree('branch')
self.run_bzr('branch branch branch2')
self.build_tree(['branch2/file'])
self.run_bzr('add branch2/file')
self.run_bzr('commit -m add-file branch2')
self.run_bzr('checkout --lightweight branch checkout')
os.chdir('checkout')
out, err = self.run_bzr('switch ../branch2')
#self.assertContainsRe(err, '\+N file')
self.assertContainsRe(err, 'Updated to revision 1.\n')
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
self.assertEqual('', out)
def _test_switch_nick(self, lightweight):
"""Check that the nick gets switched too."""
tree1 = self.make_branch_and_tree('branch1')
tree2 = self.make_branch_and_tree('branch2')
tree2.pull(tree1.branch)
checkout = tree1.branch.create_checkout('checkout',
lightweight=lightweight)
self.assertEqual(checkout.branch.nick, tree1.branch.nick)
self.assertEqual(checkout.branch.get_config().has_explicit_nickname(),
False)
self.run_bzr('switch branch2', working_dir='checkout')
# we need to get the tree again, otherwise we don't get the new branch
checkout = WorkingTree.open('checkout')
self.assertEqual(checkout.branch.nick, tree2.branch.nick)
self.assertEqual(checkout.branch.get_config().has_explicit_nickname(),
False)
def test_switch_nick(self):
self._test_switch_nick(lightweight=False)
def test_switch_nick_lightweight(self):
self._test_switch_nick(lightweight=True)
def _test_switch_explicit_nick(self, lightweight):
"""Check that the nick gets switched too."""
tree1 = self.make_branch_and_tree('branch1')
tree2 = self.make_branch_and_tree('branch2')
tree2.pull(tree1.branch)
checkout = tree1.branch.create_checkout('checkout',
lightweight=lightweight)
self.assertEqual(checkout.branch.nick, tree1.branch.nick)
checkout.branch.nick = "explicit_nick"
self.assertEqual(checkout.branch.nick, "explicit_nick")
self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(),
"explicit_nick")
self.run_bzr('switch branch2', working_dir='checkout')
# we need to get the tree again, otherwise we don't get the new branch
checkout = WorkingTree.open('checkout')
self.assertEqual(checkout.branch.nick, tree2.branch.nick)
self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(),
tree2.branch.nick)
def test_switch_explicit_nick(self):
self._test_switch_explicit_nick(lightweight=False)
def test_switch_explicit_nick_lightweight(self):
self._test_switch_explicit_nick(lightweight=True)
def test_switch_finds_relative_branch(self):
"""Switch will find 'foo' relative to the branch the checkout is of."""
self.build_tree(['repo/'])
tree1 = self.make_branch_and_tree('repo/brancha')
tree1.commit('foo')
tree2 = self.make_branch_and_tree('repo/branchb')
tree2.pull(tree1.branch)
branchb_id = tree2.commit('bar')
checkout = tree1.branch.create_checkout('checkout', lightweight=True)
self.run_bzr(['switch', 'branchb'], working_dir='checkout')
self.assertEqual(branchb_id, checkout.last_revision())
checkout = checkout.bzrdir.open_workingtree()
self.assertEqual(tree2.branch.base, checkout.branch.base)
def test_switch_finds_relative_bound_branch(self):
"""Using switch on a heavy checkout should find master sibling
The behaviour of lighweight and heavy checkouts should be
consistentwhen using the convenient "switch to sibling" feature
Both should switch to a sibling of the branch
they are bound to, and not a sibling of themself"""
self.build_tree(['repo/',
'heavyco/'])
tree1 = self.make_branch_and_tree('repo/brancha')
tree1.commit('foo')
tree2 = self.make_branch_and_tree('repo/branchb')
tree2.pull(tree1.branch)
branchb_id = tree2.commit('bar')
checkout = tree1.branch.create_checkout('heavyco/a', lightweight=False)
self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
self.assertEqual(branchb_id, checkout.last_revision())
self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
def prepare_lightweight_switch(self):
branch = self.make_branch('branch')
branch.create_checkout('tree', lightweight=True)
os.rename('branch', 'branch1')
def test_switch_lightweight_after_branch_moved(self):
self.prepare_lightweight_switch()
self.run_bzr('switch --force ../branch1', working_dir='tree')
branch_location = WorkingTree.open('tree').branch.base
self.assertEndsWith(branch_location, 'branch1/')
def test_switch_lightweight_after_branch_moved_relative(self):
self.prepare_lightweight_switch()
self.run_bzr('switch --force branch1', working_dir='tree')
branch_location = WorkingTree.open('tree').branch.base
self.assertEndsWith(branch_location, 'branch1/')
|