1
# Copyright (C) 2006-2010 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Tests for the update command of bzr."""
31
from bzrlib.tests.script import ScriptRunner
34
class TestUpdate(tests.TestCaseWithTransport):
36
def test_update_standalone_trivial(self):
37
self.make_branch_and_tree('.')
38
out, err = self.run_bzr('update')
40
'Tree is up to date at revision 0 of branch %s\n' % self.test_dir,
42
self.assertEqual('', out)
44
def test_update_quiet(self):
45
self.make_branch_and_tree('.')
46
out, err = self.run_bzr('update --quiet')
47
self.assertEqual('', err)
48
self.assertEqual('', out)
50
def test_update_standalone_trivial_with_alias_up(self):
51
self.make_branch_and_tree('.')
52
out, err = self.run_bzr('up')
53
self.assertEqual('Tree is up to date at revision 0 of branch %s\n'
56
self.assertEqual('', out)
58
def test_update_up_to_date_light_checkout(self):
59
self.make_branch_and_tree('branch')
60
self.run_bzr('checkout --lightweight branch checkout')
61
out, err = self.run_bzr('update checkout')
62
self.assertEqual('Tree is up to date at revision 0 of branch %s\n'
63
% osutils.pathjoin(self.test_dir, 'branch'),
65
self.assertEqual('', out)
67
def test_update_up_to_date_checkout(self):
68
self.make_branch_and_tree('branch')
69
self.run_bzr('checkout branch checkout')
71
sr.run_script(self, '''
73
2>Tree is up to date at revision 0 of branch .../branch
76
def test_update_out_of_date_standalone_tree(self):
77
# FIXME the default format has to change for this to pass
78
# because it currently uses the branch last-revision marker.
79
self.make_branch_and_tree('branch')
81
self.run_bzr('checkout --lightweight branch checkout')
82
self.build_tree(['checkout/file'])
83
self.run_bzr('add checkout/file')
84
self.run_bzr('commit -m add-file checkout')
85
# now branch should be out of date
86
out,err = self.run_bzr('update branch')
87
self.assertEqual('', out)
88
self.assertEqualDiff("""+N file
89
All changes applied successfully.
90
Updated to revision 1 of branch %s
91
""" % osutils.pathjoin(self.test_dir, 'branch',),
93
self.assertPathExists('branch/file')
95
def test_update_out_of_date_light_checkout(self):
96
self.make_branch_and_tree('branch')
98
self.run_bzr('checkout --lightweight branch checkout')
99
self.run_bzr('checkout --lightweight branch checkout2')
100
self.build_tree(['checkout/file'])
101
self.run_bzr('add checkout/file')
102
self.run_bzr('commit -m add-file checkout')
103
# now checkout2 should be out of date
104
out,err = self.run_bzr('update checkout2')
105
self.assertEqualDiff('''+N file
106
All changes applied successfully.
107
Updated to revision 1 of branch %s
108
''' % osutils.pathjoin(self.test_dir, 'branch',),
110
self.assertEqual('', out)
112
def test_update_conflicts_returns_2(self):
113
self.make_branch_and_tree('branch')
115
self.run_bzr('checkout --lightweight branch checkout')
116
self.build_tree(['checkout/file'])
117
self.run_bzr('add checkout/file')
118
self.run_bzr('commit -m add-file checkout')
119
self.run_bzr('checkout --lightweight branch checkout2')
120
# now alter file in checkout
121
a_file = file('checkout/file', 'wt')
124
self.run_bzr('commit -m checnge-file checkout')
125
# now checkout2 should be out of date
126
# make a local change to file
127
a_file = file('checkout2/file', 'wt')
130
out,err = self.run_bzr('update checkout2', retcode=1)
131
self.assertEqualDiff(''' M file
132
Text conflict in file
133
1 conflicts encountered.
134
Updated to revision 2 of branch %s
135
''' % osutils.pathjoin(self.test_dir, 'branch',),
137
self.assertEqual('', out)
139
def test_smoke_update_checkout_bound_branch_local_commits(self):
140
# smoke test for doing an update of a checkout of a bound
141
# branch with local commits.
142
master = self.make_branch_and_tree('master')
143
master.commit('first commit')
144
# make a bound branch
145
self.run_bzr('checkout master child')
147
self.run_bzr('checkout --lightweight child checkout')
148
# get an object form of the checkout to manipulate
149
wt = workingtree.WorkingTree.open('checkout')
151
a_file = file('master/file', 'wt')
155
master_tip = master.commit('add file')
157
a_file = file('child/file_b', 'wt')
160
# get an object form of child
161
child = workingtree.WorkingTree.open('child')
162
child.add(['file_b'])
163
child_tip = child.commit('add file_b', local=True)
165
a_file = file('checkout/file_c', 'wt')
170
# now, update checkout ->
171
# get all three files and a pending merge.
172
out, err = self.run_bzr('update checkout')
173
self.assertEqual('', out)
174
self.assertEqualDiff("""+N file_b
175
All changes applied successfully.
177
All changes applied successfully.
178
Updated to revision 2 of branch %s
179
Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'.
180
""" % osutils.pathjoin(self.test_dir, 'master',),
182
self.assertEqual([master_tip, child_tip], wt.get_parent_ids())
183
self.assertPathExists('checkout/file')
184
self.assertPathExists('checkout/file_b')
185
self.assertPathExists('checkout/file_c')
186
self.assertTrue(wt.has_filename('file_c'))
188
def test_update_with_merges(self):
189
# Test that 'bzr update' works correctly when you have
190
# an update in the master tree, and a lightweight checkout
191
# which has merged another branch
192
master = self.make_branch_and_tree('master')
193
self.build_tree(['master/file'])
195
master.commit('one', rev_id='m1')
197
self.build_tree(['checkout1/'])
198
checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
199
branch.BranchReferenceFormat().initialize(checkout_dir,
200
target_branch=master.branch)
201
checkout1 = checkout_dir.create_workingtree('m1')
203
# Create a second branch, with an extra commit
204
other = master.bzrdir.sprout('other').open_workingtree()
205
self.build_tree(['other/file2'])
207
other.commit('other2', rev_id='o2')
209
# Create a new commit in the master branch
210
self.build_tree(['master/file3'])
211
master.add(['file3'])
212
master.commit('f3', rev_id='m2')
214
# Merge the other branch into checkout
215
os.chdir('checkout1')
216
self.run_bzr('merge ../other')
218
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
220
# At this point, 'commit' should fail, because we are out of date
221
self.run_bzr_error(["please run 'bzr update'"],
224
# This should not report about local commits being pending
225
# merges, because they were real merges
226
out, err = self.run_bzr('update')
227
self.assertEqual('', out)
228
self.assertEqualDiff('''+N file3
229
All changes applied successfully.
230
Updated to revision 2 of branch %s
231
''' % osutils.pathjoin(self.test_dir, 'master',),
233
# The pending merges should still be there
234
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
236
def test_readonly_lightweight_update(self):
237
"""Update a light checkout of a readonly branch"""
238
tree = self.make_branch_and_tree('branch')
239
readonly_branch = branch.Branch.open(self.get_readonly_url('branch'))
240
checkout = readonly_branch.create_checkout('checkout',
242
tree.commit('empty commit')
243
self.run_bzr('update checkout')
245
def test_update_with_merge_merged_to_master(self):
246
# Test that 'bzr update' works correctly when you have
247
# an update in the master tree, and a [lightweight or otherwise]
248
# checkout which has merge a revision merged to master already.
249
master = self.make_branch_and_tree('master')
250
self.build_tree(['master/file'])
252
master.commit('one', rev_id='m1')
254
self.build_tree(['checkout1/'])
255
checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
256
branch.BranchReferenceFormat().initialize(checkout_dir,
257
target_branch=master.branch)
258
checkout1 = checkout_dir.create_workingtree('m1')
260
# Create a second branch, with an extra commit
261
other = master.bzrdir.sprout('other').open_workingtree()
262
self.build_tree(['other/file2'])
264
other.commit('other2', rev_id='o2')
266
# Merge the other branch into checkout - 'start reviewing a patch'
267
checkout1.merge_from_branch(other.branch)
268
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
270
# Create a new commit in the master branch - 'someone else lands its'
271
master.merge_from_branch(other.branch)
272
master.commit('f3', rev_id='m2')
274
# This should not report about local commits being pending
275
# merges, because they were real merges (but are now gone).
276
# It should perhaps report on them.
277
out, err = self.run_bzr('update', working_dir='checkout1')
278
self.assertEqual('', out)
279
self.assertEqualDiff('''All changes applied successfully.
280
Updated to revision 2 of branch %s
281
''' % osutils.pathjoin(self.test_dir, 'master',),
283
# The pending merges should still be there
284
self.assertEqual([], checkout1.get_parent_ids()[1:])
286
def test_update_dash_r(self):
287
master = self.make_branch_and_tree('master')
289
self.build_tree(['./file1'])
290
master.add(['file1'])
291
master.commit('one', rev_id='m1')
292
self.build_tree(['./file2'])
293
master.add(['file2'])
294
master.commit('two', rev_id='m2')
297
sr.run_script(self, '''
300
2>All changes applied successfully.
301
2>Updated to revision 1 of .../master
303
self.assertPathExists('./file1')
304
self.assertPathDoesNotExist('./file2')
305
self.assertEquals(['m1'], master.get_parent_ids())
307
def test_update_dash_r_outside_history(self):
308
"""Ensure that we can update -r to dotted revisions.
310
master = self.make_branch_and_tree('master')
311
self.build_tree(['master/file1'])
312
master.add(['file1'])
313
master.commit('one', rev_id='m1')
315
# Create a second branch, with extra commits
316
other = master.bzrdir.sprout('other').open_workingtree()
317
self.build_tree(['other/file2', 'other/file3'])
319
other.commit('other2', rev_id='o2')
321
other.commit('other3', rev_id='o3')
324
self.run_bzr('merge ../other')
325
master.commit('merge', rev_id='merge')
327
# Switch to o2. file3 was added only in o3 and should be deleted.
328
out, err = self.run_bzr('update -r revid:o2')
329
self.assertContainsRe(err, '-D\s+file3')
330
self.assertContainsRe(err, 'All changes applied successfully\.')
331
self.assertContainsRe(err, 'Updated to revision 1.1.1 of branch .*')
333
# Switch back to latest
334
out, err = self.run_bzr('update')
335
self.assertContainsRe(err, '\+N\s+file3')
336
self.assertContainsRe(err, 'All changes applied successfully\.')
337
self.assertContainsRe(err, 'Updated to revision 2 of branch .*')
339
def test_update_dash_r_in_master(self):
340
# Test that 'bzr update' works correctly when you have
341
# an update in the master tree,
342
master = self.make_branch_and_tree('master')
343
self.build_tree(['master/file1'])
344
master.add(['file1'])
345
master.commit('one', rev_id='m1')
347
self.run_bzr('checkout master checkout')
349
# add a revision in the master.
350
self.build_tree(['master/file2'])
351
master.add(['file2'])
352
master.commit('two', rev_id='m2')
356
sr.run_script(self, '''
357
$ bzr update -r revid:m2
359
2>All changes applied successfully.
360
2>Updated to revision 2 of branch .../master
363
def test_update_show_base(self):
364
"""bzr update support --show-base
366
see https://bugs.launchpad.net/bzr/+bug/202374"""
368
tree=self.make_branch_and_tree('.')
370
f = open('hello','wt')
376
f = open('hello','wt')
381
#tree.update() gives no such revision, so ...
382
self.run_bzr(['update','-r1'])
385
f = open('hello','wt')
389
out, err = self.run_bzr(['update','--show-base'],retcode=1)
391
# check for conflict notification
392
self.assertContainsString(err,
393
' M hello\nText conflict in hello\n1 conflicts encountered.\n')
395
self.assertEqualDiff('<<<<<<< TREE\n'
396
'fie||||||| BASE-REVISION\n'
398
'fee>>>>>>> MERGE-SOURCE\n',
399
open('hello').read())
401
def test_update_checkout_prevent_double_merge(self):
402
""""Launchpad bug 113809 in bzr "update performs two merges"
403
https://launchpad.net/bugs/113809"""
404
master = self.make_branch_and_tree('master')
405
self.build_tree_contents([('master/file', 'initial contents\n')])
407
master.commit('one', rev_id='m1')
409
checkout = master.branch.create_checkout('checkout')
410
lightweight = checkout.branch.create_checkout('lightweight',
413
# time to create a mess
414
# add a commit to the master
415
self.build_tree_contents([('master/file', 'master\n')])
416
master.commit('two', rev_id='m2')
417
self.build_tree_contents([('master/file', 'master local changes\n')])
419
# local commit on the checkout
420
self.build_tree_contents([('checkout/file', 'checkout\n')])
421
checkout.commit('tree', rev_id='c2', local=True)
422
self.build_tree_contents([('checkout/file',
423
'checkout local changes\n')])
426
self.build_tree_contents([('lightweight/file',
427
'lightweight local changes\n')])
429
# now update (and get conflicts)
430
out, err = self.run_bzr('update lightweight', retcode=1)
431
self.assertEqual('', out)
432
# NB: these conflicts are actually in the source code
433
self.assertFileEqual('''\
435
lightweight local changes
443
self.build_tree_contents([('lightweight/file',
444
'lightweight+checkout\n')])
445
self.run_bzr('resolve lightweight/file')
447
# check we get the second conflict
448
out, err = self.run_bzr('update lightweight', retcode=1)
449
self.assertEqual('', out)
450
# NB: these conflicts are actually in the source code
451
self.assertFileEqual('''\
added
removed
bzrlib/tests/blackbox/test_update.py
