/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_update.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
1
 
# Copyright (C) 2006 Canonical Ltd
2
 
# -*- coding: utf-8 -*-
 
1
# Copyright (C) 2006-2010 Canonical Ltd
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
29
28
    urlutils,
30
29
    workingtree,
31
30
    )
 
31
from bzrlib.tests.script import ScriptRunner
32
32
 
33
33
 
34
34
class TestUpdate(tests.TestCaseWithTransport):
67
67
    def test_update_up_to_date_checkout(self):
68
68
        self.make_branch_and_tree('branch')
69
69
        self.run_bzr('checkout branch checkout')
70
 
        out, err = self.run_bzr('update checkout')
71
 
        self.assertEqual('Tree is up to date at revision 0 of branch %s\n'
72
 
                         % osutils.pathjoin(self.test_dir, 'branch'),
73
 
                         err)
74
 
        self.assertEqual('', out)
 
70
        sr = ScriptRunner()
 
71
        sr.run_script(self, '''
 
72
$ bzr update checkout
 
73
2>Tree is up to date at revision 0 of branch .../branch
 
74
''')
75
75
 
76
76
    def test_update_out_of_date_standalone_tree(self):
77
77
        # FIXME the default format has to change for this to pass
170
170
        # get all three files and a pending merge.
171
171
        out, err = self.run_bzr('update checkout')
172
172
        self.assertEqual('', out)
173
 
        self.assertEqualDiff("""+N  file
 
173
        self.assertEqualDiff("""+N  file_b
174
174
All changes applied successfully.
175
 
+N  file_b
 
175
+N  file
176
176
All changes applied successfully.
177
177
Updated to revision 1 of branch %s
178
178
Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'.
195
195
 
196
196
        self.build_tree(['checkout1/'])
197
197
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
198
 
        branch.BranchReferenceFormat().initialize(checkout_dir, master.branch)
 
198
        branch.BranchReferenceFormat().initialize(checkout_dir,
 
199
            target_branch=master.branch)
199
200
        checkout1 = checkout_dir.create_workingtree('m1')
200
201
 
201
202
        # Create a second branch, with an extra commit
239
240
                                                   lightweight=True)
240
241
        tree.commit('empty commit')
241
242
        self.run_bzr('update checkout')
 
243
 
 
244
    def test_update_dash_r(self):
 
245
        master = self.make_branch_and_tree('master')
 
246
        os.chdir('master')
 
247
        self.build_tree(['./file1'])
 
248
        master.add(['file1'])
 
249
        master.commit('one', rev_id='m1')
 
250
        self.build_tree(['./file2'])
 
251
        master.add(['file2'])
 
252
        master.commit('two', rev_id='m2')
 
253
 
 
254
        sr = ScriptRunner()
 
255
        sr.run_script(self, '''
 
256
$ bzr update -r 1
 
257
2>-D  file2
 
258
2>All changes applied successfully.
 
259
2>Updated to revision 1 of .../master
 
260
''')
 
261
        self.failUnlessExists('./file1')
 
262
        self.failIfExists('./file2')
 
263
        self.assertEquals(['m1'], master.get_parent_ids())
 
264
 
 
265
    def test_update_dash_r_outside_history(self):
 
266
        master = self.make_branch_and_tree('master')
 
267
        self.build_tree(['master/file1'])
 
268
        master.add(['file1'])
 
269
        master.commit('one', rev_id='m1')
 
270
 
 
271
        # Create a second branch, with an extra commit
 
272
        other = master.bzrdir.sprout('other').open_workingtree()
 
273
        self.build_tree(['other/file2'])
 
274
        other.add(['file2'])
 
275
        other.commit('other2', rev_id='o2')
 
276
 
 
277
        os.chdir('master')
 
278
        self.run_bzr('merge ../other')
 
279
        master.commit('merge', rev_id='merge')
 
280
 
 
281
        out, err = self.run_bzr('update -r revid:o2',
 
282
                                retcode=3)
 
283
        self.assertEqual('', out)
 
284
        self.assertEqual('bzr: ERROR: branch has no revision o2\n'
 
285
                         'bzr update --revision only works'
 
286
                         ' for a revision in the branch history\n',
 
287
                         err)
 
288
 
 
289
    def test_update_dash_r_in_master(self):
 
290
        # Test that 'bzr update' works correctly when you have
 
291
        # an update in the master tree,
 
292
        master = self.make_branch_and_tree('master')
 
293
        self.build_tree(['master/file1'])
 
294
        master.add(['file1'])
 
295
        master.commit('one', rev_id='m1')
 
296
 
 
297
        self.run_bzr('checkout master checkout')
 
298
 
 
299
        # add a revision in the master.
 
300
        self.build_tree(['master/file2'])
 
301
        master.add(['file2'])
 
302
        master.commit('two', rev_id='m2')
 
303
 
 
304
        os.chdir('checkout')
 
305
        sr = ScriptRunner()
 
306
        sr.run_script(self, '''
 
307
$ bzr update -r revid:m2
 
308
2>+N  file2
 
309
2>All changes applied successfully.
 
310
2>Updated to revision 2 of branch .../master
 
311
''')
 
312
 
 
313
    def test_update_checkout_prevent_double_merge(self):
 
314
        """"Launchpad bug 113809 in bzr "update performs two merges"
 
315
        https://launchpad.net/bugs/113809"""
 
316
        master = self.make_branch_and_tree('master')
 
317
        self.build_tree_contents([('master/file', 'initial contents\n')])
 
318
        master.add(['file'])
 
319
        master.commit('one', rev_id='m1')
 
320
 
 
321
        checkout = master.branch.create_checkout('checkout')
 
322
        lightweight = checkout.branch.create_checkout('lightweight',
 
323
                                                      lightweight=True)
 
324
 
 
325
        # time to create a mess
 
326
        # add a commit to the master
 
327
        self.build_tree_contents([('master/file', 'master\n')])
 
328
        master.commit('two', rev_id='m2')
 
329
        self.build_tree_contents([('master/file', 'master local changes\n')])
 
330
 
 
331
        # local commit on the checkout
 
332
        self.build_tree_contents([('checkout/file', 'checkout\n')])
 
333
        checkout.commit('tree', rev_id='c2', local=True)
 
334
        self.build_tree_contents([('checkout/file',
 
335
                                   'checkout local changes\n')])
 
336
 
 
337
        # lightweight 
 
338
        self.build_tree_contents([('lightweight/file',
 
339
                                   'lightweight local changes\n')])
 
340
 
 
341
        # now update (and get conflicts)
 
342
        out, err = self.run_bzr('update lightweight', retcode=1)
 
343
        self.assertEqual('', out)
 
344
        # NB: these conflicts are actually in the source code
 
345
        self.assertFileEqual('''\
 
346
<<<<<<< TREE
 
347
lightweight local changes
 
348
=======
 
349
checkout
 
350
>>>>>>> MERGE-SOURCE
 
351
''',
 
352
                             'lightweight/file')
 
353
 
 
354
        # resolve it
 
355
        self.build_tree_contents([('lightweight/file',
 
356
                                   'lightweight+checkout\n')])
 
357
        self.run_bzr('resolve lightweight/file')
 
358
 
 
359
        # check we get the second conflict
 
360
        out, err = self.run_bzr('update lightweight', retcode=1)
 
361
        self.assertEqual('', out)
 
362
        # NB: these conflicts are actually in the source code
 
363
        self.assertFileEqual('''\
 
364
<<<<<<< TREE
 
365
lightweight+checkout
 
366
=======
 
367
master
 
368
>>>>>>> MERGE-SOURCE
 
369
''',
 
370
                             'lightweight/file')