← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-30 18:28:17 UTC
  • mfrom: (5967.10.2 test-cat)
  • Revision ID: pqm@pqm.ubuntu.com-20110630182817-83a5q9r9rxfkdn8r
(mbp) don't use subprocesses for testing cat (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006-2012 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
26
26
 
27
27
from bzrlib import (
28
28
    branch,
 
29
    bzrdir,
29
30
    conflicts,
30
 
    controldir,
31
31
    merge_directive,
32
32
    osutils,
33
33
    tests,
75
75
        return tree, other
76
76
 
77
77
    def test_merge_reprocess(self):
78
 
        d = controldir.ControlDir.create_standalone_workingtree('.')
 
78
        d = bzrdir.BzrDir.create_standalone_workingtree('.')
79
79
        d.commit('h')
80
80
        self.run_bzr('merge . --reprocess --merge-type weave')
81
81
 
88
88
 
89
89
        self.build_tree_contents([('a/hello', 'quuux')])
90
90
        # We can't merge when there are in-tree changes
91
 
        self.run_bzr('merge ../b', retcode=3, working_dir='a')
92
 
        a = workingtree.WorkingTree.open('a')
 
91
        os.chdir('a')
 
92
        self.run_bzr('merge ../b', retcode=3)
 
93
        a = workingtree.WorkingTree.open('.')
93
94
        a_tip = a.commit("Like an epidemic of u's")
94
 
 
95
 
        def run_merge_then_revert(args, retcode=None, working_dir='a'):
96
 
            self.run_bzr(['merge', '../b', '-r', 'last:1..last:1'] + args,
97
 
                         retcode=retcode, working_dir=working_dir)
98
 
            if retcode != 3:
99
 
                a_tree.revert(backups=False)
100
 
 
101
 
        run_merge_then_revert(['--merge-type', 'bloof'], retcode=3)
102
 
        run_merge_then_revert(['--merge-type', 'merge3'])
103
 
        run_merge_then_revert(['--merge-type', 'weave'])
104
 
        run_merge_then_revert(['--merge-type', 'lca'])
 
95
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
 
96
                    retcode=3)
 
97
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
 
98
        a_tree.revert(backups=False)
 
99
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
 
100
        a_tree.revert(backups=False)
 
101
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
102
        a_tree.revert(backups=False)
105
103
        self.run_bzr_error(['Show-base is not supported for this merge type'],
106
104
                           'merge ../b -r last:1..last:1 --merge-type weave'
107
 
                           ' --show-base', working_dir='a')
108
 
        a_tree.revert(backups=False)
109
 
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess',
110
 
                     working_dir='a')
111
 
        a_tree.revert(backups=False)
112
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
113
 
        self.check_file_contents('a/goodbye', 'quux')
 
105
                           ' --show-base')
 
106
        a_tree.revert(backups=False)
 
107
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
 
108
        a_tree.revert(backups=False)
 
109
        self.run_bzr('merge ../b -r last:1')
 
110
        self.check_file_contents('goodbye', 'quux')
114
111
        # Merging a branch pulls its revision into the tree
115
 
        b = branch.Branch.open('b')
 
112
        b = branch.Branch.open('../b')
116
113
        b_tip = b.last_revision()
117
114
        self.assertTrue(a.branch.repository.has_revision(b_tip))
118
115
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
119
116
        a_tree.revert(backups=False)
120
 
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3,
121
 
                                working_dir='a')
 
117
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
122
118
        self.assertTrue("Not a branch" in err)
123
119
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
124
 
                    %(ancestor,b.revno()), working_dir='a')
 
120
                    %(ancestor,b.revno()))
125
121
        self.assertEquals(a.get_parent_ids(),
126
122
                          [a.branch.last_revision(), b.last_revision()])
127
 
        self.check_file_contents('a/goodbye', 'quux')
 
123
        self.check_file_contents('goodbye', 'quux')
128
124
        a_tree.revert(backups=False)
129
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')
 
125
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
130
126
        self.assertEquals(a.get_parent_ids(),
131
127
                          [a.branch.last_revision(), b.last_revision()])
132
128
        a_tip = a.commit('merged')
133
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
 
129
        self.run_bzr('merge ../b -r last:1')
134
130
        self.assertEqual([a_tip], a.get_parent_ids())
135
131
 
136
132
    def test_merge_defaults_to_reprocess(self):
215
211
            ('b/b.txt', 'hello\nsomething\n'),
216
212
            ('b/sub/c.txt', 'hello\nsomething\n')])
217
213
        b_tree.commit(message='Modified a.txt')
218
 
 
219
 
        self.run_bzr('merge ../a/', retcode=1, working_dir='b')
220
 
        self.assertPathExists('b/sub/a.txt.THIS')
221
 
        self.assertPathExists('b/sub/a.txt.BASE')
222
 
 
223
 
        self.run_bzr('merge ../b/', retcode=1, working_dir='a')
224
 
        self.assertPathExists('a/sub/a.txt.OTHER')
225
 
        self.assertPathExists('a/sub/a.txt.BASE')
 
214
        os.chdir('b')
 
215
        self.run_bzr('merge ../a/', retcode=1)
 
216
        self.assertPathExists('sub/a.txt.THIS')
 
217
        self.assertPathExists('sub/a.txt.BASE')
 
218
        os.chdir('../a')
 
219
        self.run_bzr('merge ../b/', retcode=1)
 
220
        self.assertPathExists('sub/a.txt.OTHER')
 
221
        self.assertPathExists('sub/a.txt.BASE')
226
222
 
227
223
    def test_conflict_leaves_base_this_other_files(self):
228
224
        tree, other = self.create_conflicting_branches()
262
258
        branch_b.set_parent(None)
263
259
        self.assertEqual(None, branch_b.get_parent())
264
260
        # test merge for failure without parent set
265
 
        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
 
261
        os.chdir('branch_b')
 
262
        out = self.run_bzr('merge', retcode=3)
266
263
        self.assertEquals(out,
267
264
                ('','bzr: ERROR: No location specified or remembered\n'))
268
265
 
269
266
        # test uncommitted changes
270
 
        self.build_tree(['branch_b/d'])
 
267
        self.build_tree(['d'])
271
268
        tree_b.add('d')
272
269
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
273
 
                           'merge', working_dir='branch_b')
 
270
                           'merge')
274
271
 
275
272
        # merge should now pass and implicitly remember merge location
276
273
        tree_b.commit('commit d')
277
 
        out, err = self.run_bzr('merge ../branch_a', working_dir='branch_b')
 
274
        out, err = self.run_bzr('merge ../branch_a')
278
275
 
279
276
        base = urlutils.local_path_from_url(branch_a.base)
280
277
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
281
 
        # re-open branch as external run_bzr modified it
282
 
        branch_b = branch_b.bzrdir.open_branch()
283
278
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
284
279
                          osutils.abspath(parent))
285
280
        # test implicit --remember when committing new file
286
 
        self.build_tree(['branch_b/e'])
 
281
        self.build_tree(['e'])
287
282
        tree_b.add('e')
288
283
        tree_b.commit('commit e')
289
 
        out, err = self.run_bzr('merge', working_dir='branch_b')
290
 
        self.assertStartsWith(
291
 
            err, 'Merging from remembered submit location %s\n' % (base,))
 
284
        out, err = self.run_bzr('merge')
 
285
        self.assertStartsWith(err,
 
286
                          'Merging from remembered submit location %s\n' % (base,))
292
287
        # re-open tree as external run_bzr modified it
293
288
        tree_b = branch_b.bzrdir.open_workingtree()
294
289
        tree_b.commit('merge branch_a')
295
290
        # test explicit --remember
296
 
        out, err = self.run_bzr('merge ../branch_c --remember',
297
 
                                working_dir='branch_b')
 
291
        out, err = self.run_bzr('merge ../branch_c --remember')
298
292
        self.assertEquals(out, '')
299
293
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
300
 
        # re-open branch as external run_bzr modified it
301
 
        branch_b = branch_b.bzrdir.open_branch()
302
294
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
303
295
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
304
296
        # re-open tree as external run_bzr modified it
318
310
 
319
311
        self.build_tree_contents([('branch_b/a', 'goodbye')])
320
312
        tree_b.commit('message')
321
 
        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
322
 
        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
 
313
        os.chdir('branch_b')
 
314
        self.run_bzr('bundle ../branch_a -o ../bundle')
 
315
        os.chdir('../branch_a')
 
316
        self.run_bzr('merge ../bundle', retcode=1)
323
317
        testament_a = Testament.from_revision(tree_a.branch.repository,
324
318
                                              tree_b.get_parent_ids()[0])
325
319
        testament_b = Testament.from_revision(tree_b.branch.repository,
329
323
        tree_a.set_conflicts(conflicts.ConflictList())
330
324
        tree_a.commit('message')
331
325
        # it is legal to attempt to merge an already-merged bundle
332
 
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
 
326
        output = self.run_bzr('merge ../bundle')[1]
333
327
        # but it does nothing
334
328
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
335
 
        self.assertEqual('Nothing to do.\n', err)
 
329
        self.assertEqual('Nothing to do.\n', output)
336
330
 
337
331
    def test_merge_uncommitted(self):
338
332
        """Check that merge --uncommitted behaves properly"""
345
339
        tree_a.rename_one('file_1', 'file_i')
346
340
        tree_a.commit('commit 2')
347
341
        tree_a.rename_one('file_2', 'file_ii')
 
342
        ## os.chdir('b')
348
343
        self.run_bzr('merge a --uncommitted -d b')
349
344
        self.assertPathExists('b/file_1')
350
345
        self.assertPathExists('b/file_ii')
359
354
        tree_a.bzrdir.sprout('tree_b')
360
355
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
361
356
        tree_a.add(['file1', 'file2'])
362
 
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'],
363
 
                     working_dir='tree_b')
364
 
        self.assertPathExists('tree_b/file1')
365
 
        self.assertPathDoesNotExist('tree_b/file2')
 
357
        os.chdir('tree_b')
 
358
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
359
        self.assertPathExists('file1')
 
360
        self.assertPathDoesNotExist('file2')
366
361
 
367
362
    def test_merge_nonexistent_file(self):
368
363
        """It should not be possible to merge changes from a file which
371
366
        self.build_tree_contents([('tree_a/file', 'bar\n')])
372
367
        tree_a.add(['file'])
373
368
        tree_a.commit('commit 1')
 
369
        os.chdir('tree_a')
374
370
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
375
 
                           ['merge', 'non/existing'], working_dir='tree_a')
 
371
                           ['merge', 'non/existing'])
376
372
 
377
373
    def pullable_branch(self):
378
374
        tree_a = self.make_branch_and_tree('a')
387
383
 
388
384
    def test_merge_pull(self):
389
385
        self.pullable_branch()
390
 
        (out, err) = self.run_bzr('merge --pull ../b', working_dir='a')
 
386
        os.chdir('a')
 
387
        (out, err) = self.run_bzr('merge --pull ../b')
391
388
        self.assertContainsRe(out, 'Now on revision 2\\.')
392
 
        tree_a = workingtree.WorkingTree.open('a')
 
389
        tree_a = workingtree.WorkingTree.open('.')
393
390
        self.assertEqual([self.id2], tree_a.get_parent_ids())
394
391
 
395
392
    def test_merge_pull_preview(self):
416
413
        os.unlink('tree_a/file')
417
414
        self.build_tree(['tree_a/file/'])
418
415
        tree_a.commit('changed file to directory')
419
 
        self.run_bzr('merge ../tree_a', working_dir='tree_b')
420
 
        self.assertEqual('directory', osutils.file_kind('tree_b/file'))
 
416
        os.chdir('tree_b')
 
417
        self.run_bzr('merge ../tree_a')
 
418
        self.assertEqual('directory', osutils.file_kind('file'))
421
419
        tree_b.revert()
422
 
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
423
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
420
        self.assertEqual('file', osutils.file_kind('file'))
 
421
        self.build_tree_contents([('file', 'content_2')])
424
422
        tree_b.commit('content change')
425
 
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
 
423
        self.run_bzr('merge ../tree_a', retcode=1)
426
424
        self.assertEqual(tree_b.conflicts(),
427
425
                         [conflicts.ContentsConflict('file',
428
426
                                                     file_id='file-id')])
557
555
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
558
556
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
559
557
        out, err = self.run_bzr(['merge', '-d', 'c'])
560
 
        self.assertContainsRe(err,
561
 
                              'Merging from remembered parent location .*a\/')
562
 
        tree_c.branch.lock_write()
563
 
        try:
564
 
            tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
565
 
        finally:
566
 
            tree_c.branch.unlock()
 
558
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
 
559
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
567
560
        out, err = self.run_bzr(['merge', '-d', 'c'])
568
 
        self.assertContainsRe(err,
569
 
                              'Merging from remembered submit location .*b\/')
 
561
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
570
562
 
571
563
    def test_remember_sets_submit(self):
572
564
        tree_a = self.make_branch_and_tree('a')
576
568
 
577
569
        # Remember should not happen if using default from parent
578
570
        out, err = self.run_bzr(['merge', '-d', 'b'])
579
 
        refreshed = workingtree.WorkingTree.open('b')
580
 
        self.assertIs(refreshed.branch.get_submit_branch(), None)
 
571
        self.assertIs(tree_b.branch.get_submit_branch(), None)
581
572
 
582
573
        # Remember should happen if user supplies location
583
574
        out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
584
 
        refreshed = workingtree.WorkingTree.open('b')
585
 
        self.assertEqual(refreshed.branch.get_submit_branch(),
 
575
        self.assertEqual(tree_b.branch.get_submit_branch(),
586
576
                         tree_a.bzrdir.root_transport.base)
587
577
 
588
578
    def test_no_remember_dont_set_submit(self):
691
681
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
692
682
        source.tags.set_tag('tag-a', 'rev-2a')
693
683
        source.set_last_revision_info(1, 'rev-1')
694
 
        source.get_config_stack().set('branch.fetch_tags', True)
695
684
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
696
685
        # Merge from source
697
686
        self.run_bzr('merge -d target source')