19
19
"""Tests for the update command of bzr."""
23
from bzrlib import branch, bzrdir
22
from bzrlib.tests import TestSkipped
24
23
from bzrlib.tests.blackbox import ExternalBase
25
from bzrlib.workingtree import WorkingTree
28
26
class TestUpdate(ExternalBase):
30
28
def test_update_standalone_trivial(self):
31
self.make_branch_and_tree('.')
32
out, err = self.run_bzr('update')
33
self.assertEqual('Tree is up to date at revision 0.\n', err)
34
self.assertEqual('', out)
36
def test_update_standalone_trivial_with_alias_up(self):
37
self.make_branch_and_tree('.')
38
out, err = self.run_bzr('up')
39
self.assertEqual('Tree is up to date at revision 0.\n', err)
40
self.assertEqual('', out)
42
def test_update_up_to_date_light_checkout(self):
43
self.make_branch_and_tree('branch')
44
self.run_bzr('checkout --lightweight branch checkout')
45
out, err = self.run_bzr('update checkout')
46
self.assertEqual('Tree is up to date at revision 0.\n', err)
30
out, err = self.runbzr('update')
31
self.assertEqual('Tree is up to date.\n', err)
47
32
self.assertEqual('', out)
49
34
def test_update_up_to_date_checkout(self):
50
35
self.make_branch_and_tree('branch')
51
self.run_bzr('checkout branch checkout')
52
out, err = self.run_bzr('update checkout')
53
self.assertEqual('Tree is up to date at revision 0.\n', err)
36
self.runbzr('checkout branch checkout')
37
out, err = self.runbzr('update checkout')
38
self.assertEqual('Tree is up to date.\n', err)
54
39
self.assertEqual('', out)
56
41
def test_update_out_of_date_standalone_tree(self):
57
42
# FIXME the default format has to change for this to pass
58
43
# because it currently uses the branch last-revision marker.
44
raise TestSkipped('default format too old')
59
45
self.make_branch_and_tree('branch')
61
self.run_bzr('checkout --lightweight branch checkout')
47
self.runbzr('checkout branch checkout')
62
48
self.build_tree(['checkout/file'])
63
self.run_bzr('add checkout/file')
64
self.run_bzr('commit -m add-file checkout')
49
self.runbzr('add checkout/file')
50
self.runbzr('commit -m add-file checkout')
65
51
# now branch should be out of date
66
out,err = self.run_bzr('update branch')
67
self.assertEqual('', out)
68
self.assertContainsRe(err, '\+N file')
69
self.assertEndsWith(err, 'All changes applied successfully.\n'
70
'Updated to revision 1.\n')
52
out,err = self.runbzr('update branch')
53
self.assertEqual('Updated to revision 1.\n', out)
54
self.assertEqual('', err)
71
55
self.failUnlessExists('branch/file')
73
def test_update_out_of_date_light_checkout(self):
57
def test_update_out_of_date_checkout(self):
74
58
self.make_branch_and_tree('branch')
75
59
# make two checkouts
76
self.run_bzr('checkout --lightweight branch checkout')
77
self.run_bzr('checkout --lightweight branch checkout2')
60
self.runbzr('checkout branch checkout')
61
self.runbzr('checkout branch checkout2')
78
62
self.build_tree(['checkout/file'])
79
self.run_bzr('add checkout/file')
80
self.run_bzr('commit -m add-file checkout')
63
self.runbzr('add checkout/file')
64
self.runbzr('commit -m add-file checkout')
81
65
# now checkout2 should be out of date
82
out,err = self.run_bzr('update checkout2')
83
self.assertContainsRe(err, '\+N file')
84
self.assertEndsWith(err, 'All changes applied successfully.\n'
85
'Updated to revision 1.\n')
66
out,err = self.runbzr('update checkout2')
67
self.assertEqual('All changes applied successfully.\n'
68
'Updated to revision 1.\n',
86
70
self.assertEqual('', out)
88
72
def test_update_conflicts_returns_2(self):
89
73
self.make_branch_and_tree('branch')
90
74
# make two checkouts
91
self.run_bzr('checkout --lightweight branch checkout')
75
self.runbzr('checkout branch checkout')
92
76
self.build_tree(['checkout/file'])
93
self.run_bzr('add checkout/file')
94
self.run_bzr('commit -m add-file checkout')
95
self.run_bzr('checkout --lightweight branch checkout2')
77
self.runbzr('add checkout/file')
78
self.runbzr('commit -m add-file checkout')
79
self.runbzr('checkout branch checkout2')
96
80
# now alter file in checkout
97
81
a_file = file('checkout/file', 'wt')
98
82
a_file.write('Foo')
100
self.run_bzr('commit -m checnge-file checkout')
84
self.runbzr('commit -m checnge-file checkout')
101
85
# now checkout2 should be out of date
102
86
# make a local change to file
103
87
a_file = file('checkout2/file', 'wt')
104
88
a_file.write('Bar')
106
out,err = self.run_bzr('update checkout2', retcode=1)
107
self.assertContainsRe(err, 'M file')
90
out,err = self.runbzr('update checkout2', retcode=1)
108
91
self.assertEqual(['1 conflicts encountered.',
109
92
'Updated to revision 2.'],
110
err.split('\n')[-3:-1])
111
94
self.assertContainsRe(err, 'Text conflict in file\n')
112
95
self.assertEqual('', out)
114
def test_smoke_update_checkout_bound_branch_local_commits(self):
115
# smoke test for doing an update of a checkout of a bound
116
# branch with local commits.
117
master = self.make_branch_and_tree('master')
118
# make a bound branch
119
self.run_bzr('checkout master child')
120
# get an object form of child
121
child = WorkingTree.open('child')
123
self.run_bzr('checkout --lightweight child checkout')
124
# get an object form of the checkout to manipulate
125
wt = WorkingTree.open('checkout')
127
a_file = file('master/file', 'wt')
131
master_tip = master.commit('add file')
133
a_file = file('child/file_b', 'wt')
136
child.add(['file_b'])
137
child_tip = child.commit('add file_b', local=True)
139
a_file = file('checkout/file_c', 'wt')
144
# now, update checkout ->
145
# get all three files and a pending merge.
146
out, err = self.run_bzr('update checkout')
147
self.assertEqual('', out)
148
self.assertContainsRe(err, '\+N file')
149
self.assertContainsRe(err, '\+N file_b')
150
self.assertContainsRe(err, 'Updated to revision 1.\n'
151
'Your local commits will now show as'
153
self.assertEqual([master_tip, child_tip], wt.get_parent_ids())
154
self.failUnlessExists('checkout/file')
155
self.failUnlessExists('checkout/file_b')
156
self.failUnlessExists('checkout/file_c')
157
self.assertTrue(wt.has_filename('file_c'))
159
def test_update_with_merges(self):
160
# Test that 'bzr update' works correctly when you have
161
# an update in the master tree, and a lightweight checkout
162
# which has merged another branch
163
master = self.make_branch_and_tree('master')
164
self.build_tree(['master/file'])
166
master.commit('one', rev_id='m1')
168
self.build_tree(['checkout1/'])
169
checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
170
branch.BranchReferenceFormat().initialize(checkout_dir, master.branch)
171
checkout1 = checkout_dir.create_workingtree('m1')
173
# Create a second branch, with an extra commit
174
other = master.bzrdir.sprout('other').open_workingtree()
175
self.build_tree(['other/file2'])
177
other.commit('other2', rev_id='o2')
179
# Create a new commit in the master branch
180
self.build_tree(['master/file3'])
181
master.add(['file3'])
182
master.commit('f3', rev_id='m2')
184
# Merge the other branch into checkout
185
os.chdir('checkout1')
186
self.run_bzr('merge ../other')
188
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
190
# At this point, 'commit' should fail, because we are out of date
191
self.run_bzr_error(["please run 'bzr update'"],
194
# This should not report about local commits being pending
195
# merges, because they were real merges
196
out, err = self.run_bzr('update')
197
self.assertEqual('', out)
198
self.assertEndsWith(err, 'All changes applied successfully.\n'
199
'Updated to revision 2.\n')
200
self.assertContainsRe(err, r'\+N file3')
201
# The pending merges should still be there
202
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
204
def test_readonly_lightweight_update(self):
205
"""Update a light checkout of a readonly branch"""
206
tree = self.make_branch_and_tree('branch')
207
readonly_branch = branch.Branch.open(self.get_readonly_url('branch'))
208
checkout = readonly_branch.create_checkout('checkout',
210
tree.commit('empty commit')
211
self.run_bzr('update checkout')
added
removed
bzrlib/tests/blackbox/test_update.py
