← 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: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
#
17
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
18
18
 
21
21
 
22
22
import os
23
23
 
24
 
from bzrlib import merge_directive
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.bzrdir import BzrDir
27
 
from bzrlib.conflicts import ConflictList, ContentsConflict
28
 
from bzrlib.osutils import abspath, file_kind
29
 
from bzrlib.tests.blackbox import ExternalBase
30
 
import bzrlib.urlutils as urlutils
31
 
from bzrlib.workingtree import WorkingTree
32
 
 
33
 
 
34
 
class TestMerge(ExternalBase):
35
 
 
36
 
    def example_branch(test):
37
 
        test.run_bzr('init')
38
 
        file('hello', 'wt').write('foo')
39
 
        test.run_bzr('add hello')
40
 
        test.run_bzr('commit -m setup hello')
41
 
        file('goodbye', 'wt').write('baz')
42
 
        test.run_bzr('add goodbye')
43
 
        test.run_bzr('commit -m setup goodbye')
 
24
from bzrlib import (
 
25
    branch,
 
26
    bzrdir,
 
27
    conflicts,
 
28
    errors,
 
29
    merge_directive,
 
30
    osutils,
 
31
    tests,
 
32
    urlutils,
 
33
    workingtree,
 
34
    )
 
35
 
 
36
 
 
37
class TestMerge(tests.TestCaseWithTransport):
 
38
 
 
39
    def example_branch(self, path='.'):
 
40
        tree = self.make_branch_and_tree(path)
 
41
        self.build_tree_contents([
 
42
            (osutils.pathjoin(path, 'hello'), 'foo'),
 
43
            (osutils.pathjoin(path, 'goodbye'), 'baz')])
 
44
        tree.add('hello')
 
45
        tree.commit(message='setup')
 
46
        tree.add('goodbye')
 
47
        tree.commit(message='setup')
 
48
        return tree
 
49
 
 
50
    def create_conflicting_branches(self):
 
51
        """Create two branches which have overlapping modifications.
 
52
 
 
53
        :return: (tree, other_branch) Where merging other_branch causes a file
 
54
            conflict.
 
55
        """
 
56
        builder = self.make_branch_builder('branch')
 
57
        builder.build_snapshot('rev1', None,
 
58
            [('add', ('', 'root-id', 'directory', None)),
 
59
             ('add', ('fname', 'f-id', 'file', 'a\nb\nc\n'))])
 
60
        builder.build_snapshot('rev2other', ['rev1'],
 
61
            [('modify', ('f-id', 'a\nB\nD\n'))])
 
62
        other = builder.get_branch().bzrdir.sprout('other').open_branch()
 
63
        builder.build_snapshot('rev2this', ['rev1'],
 
64
            [('modify', ('f-id', 'a\nB\nC\n'))])
 
65
        tree = builder.get_branch().create_checkout('tree', lightweight=True)
 
66
        return tree, other
44
67
 
45
68
    def test_merge_reprocess(self):
46
 
        d = BzrDir.create_standalone_workingtree('.')
 
69
        d = bzrdir.BzrDir.create_standalone_workingtree('.')
47
70
        d.commit('h')
48
71
        self.run_bzr('merge . --reprocess --merge-type weave')
49
72
 
50
73
    def test_merge(self):
51
 
        from bzrlib.branch import Branch
52
 
        
53
 
        os.mkdir('a')
54
 
        os.chdir('a')
55
 
        self.example_branch()
56
 
        ancestor = Branch.open('.').revno()
57
 
        os.chdir('..')
58
 
        self.run_bzr('branch a b')
59
 
        os.chdir('b')
60
 
        file('goodbye', 'wt').write('quux')
61
 
        self.run_bzr(['commit',  '-m',  "more u's are always good"])
 
74
        a_tree = self.example_branch('a')
 
75
        ancestor = a_tree.branch.revno()
 
76
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
77
        self.build_tree_contents([('b/goodbye', 'quux')])
 
78
        b_tree.commit(message="more u's are always good")
62
79
 
63
 
        os.chdir('../a')
64
 
        file('hello', 'wt').write('quuux')
 
80
        self.build_tree_contents([('a/hello', 'quuux')])
65
81
        # We can't merge when there are in-tree changes
 
82
        os.chdir('a')
66
83
        self.run_bzr('merge ../b', retcode=3)
67
 
        a = WorkingTree.open('.')
 
84
        a = workingtree.WorkingTree.open('.')
68
85
        a_tip = a.commit("Like an epidemic of u's")
69
86
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
70
87
                    retcode=3)
71
88
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
72
 
        self.run_bzr('revert --no-backup')
 
89
        a_tree.revert(backups=False)
73
90
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
74
 
        self.run_bzr('revert --no-backup')
 
91
        a_tree.revert(backups=False)
 
92
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
93
        a_tree.revert(backups=False)
75
94
        self.run_bzr_error(['Show-base is not supported for this merge type'],
76
95
                           'merge ../b -r last:1..last:1 --merge-type weave'
77
96
                           ' --show-base')
78
 
        self.run_bzr('revert --no-backup')
 
97
        a_tree.revert(backups=False)
79
98
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
80
 
        self.run_bzr('revert --no-backup')
 
99
        a_tree.revert(backups=False)
81
100
        self.run_bzr('merge ../b -r last:1')
82
101
        self.check_file_contents('goodbye', 'quux')
83
102
        # Merging a branch pulls its revision into the tree
84
 
        b = Branch.open('../b')
 
103
        b = branch.Branch.open('../b')
85
104
        b_tip = b.last_revision()
86
105
        self.failUnless(a.branch.repository.has_revision(b_tip))
87
106
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
88
 
        self.run_bzr('revert --no-backup')
 
107
        a_tree.revert(backups=False)
89
108
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
90
109
        self.assertTrue("Not a branch" in err)
91
110
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
92
111
                    %(ancestor,b.revno()))
93
 
        self.assertEquals(a.get_parent_ids(), 
 
112
        self.assertEquals(a.get_parent_ids(),
94
113
                          [a.branch.last_revision(), b.last_revision()])
95
114
        self.check_file_contents('goodbye', 'quux')
96
 
        self.run_bzr('revert --no-backup')
 
115
        a_tree.revert(backups=False)
97
116
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
98
117
        self.assertEquals(a.get_parent_ids(),
99
118
                          [a.branch.last_revision(), b.last_revision()])
101
120
        self.run_bzr('merge ../b -r last:1')
102
121
        self.assertEqual([a_tip], a.get_parent_ids())
103
122
 
 
123
    def test_merge_defaults_to_reprocess(self):
 
124
        tree, other = self.create_conflicting_branches()
 
125
        # The default merge algorithm should enable 'reprocess' because
 
126
        # 'show-base' is not set
 
127
        self.run_bzr('merge ../other', working_dir='tree',
 
128
                     retcode=1)
 
129
        self.assertEqualDiff('a\n'
 
130
                             'B\n'
 
131
                             '<<<<<<< TREE\n'
 
132
                             'C\n'
 
133
                             '=======\n'
 
134
                             'D\n'
 
135
                             '>>>>>>> MERGE-SOURCE\n',
 
136
                             tree.get_file_text('f-id'))
 
137
 
 
138
    def test_merge_explicit_reprocess_show_base(self):
 
139
        tree, other = self.create_conflicting_branches()
 
140
        # Explicitly setting --reprocess, and --show-base is an error
 
141
        self.run_bzr_error(['Cannot do conflict reduction and show base'],
 
142
                           'merge ../other --reprocess --show-base',
 
143
                           working_dir='tree')
 
144
 
 
145
    def test_merge_override_reprocess(self):
 
146
        tree, other = self.create_conflicting_branches()
 
147
        # Explicitly disable reprocess
 
148
        self.run_bzr('merge ../other --no-reprocess', working_dir='tree',
 
149
                     retcode=1)
 
150
        self.assertEqualDiff('a\n'
 
151
                             '<<<<<<< TREE\n'
 
152
                             'B\n'
 
153
                             'C\n'
 
154
                             '=======\n'
 
155
                             'B\n'
 
156
                             'D\n'
 
157
                             '>>>>>>> MERGE-SOURCE\n',
 
158
                             tree.get_file_text('f-id'))
 
159
 
 
160
    def test_merge_override_show_base(self):
 
161
        tree, other = self.create_conflicting_branches()
 
162
        # Setting '--show-base' will auto-disable '--reprocess'
 
163
        self.run_bzr('merge ../other --show-base', working_dir='tree',
 
164
                     retcode=1)
 
165
        self.assertEqualDiff('a\n'
 
166
                             '<<<<<<< TREE\n'
 
167
                             'B\n'
 
168
                             'C\n'
 
169
                             '||||||| BASE-REVISION\n'
 
170
                             'b\n'
 
171
                             'c\n'
 
172
                             '=======\n'
 
173
                             'B\n'
 
174
                             'D\n'
 
175
                             '>>>>>>> MERGE-SOURCE\n',
 
176
                             tree.get_file_text('f-id'))
 
177
 
104
178
    def test_merge_with_missing_file(self):
105
179
        """Merge handles missing file conflicts"""
106
 
        os.mkdir('a')
107
 
        os.chdir('a')
108
 
        os.mkdir('sub')
109
 
        print >> file('sub/a.txt', 'wb'), "hello"
110
 
        print >> file('b.txt', 'wb'), "hello"
111
 
        print >> file('sub/c.txt', 'wb'), "hello"
112
 
        self.run_bzr('init')
113
 
        self.run_bzr('add')
114
 
        self.run_bzr(['commit', '-m', 'added a'])
115
 
        self.run_bzr('branch . ../b')
116
 
        print >> file('sub/a.txt', 'ab'), "there"
117
 
        print >> file('b.txt', 'ab'), "there"
118
 
        print >> file('sub/c.txt', 'ab'), "there"
119
 
        self.run_bzr(['commit', '-m', 'Added there'])
120
 
        os.unlink('sub/a.txt')
121
 
        os.unlink('sub/c.txt')
122
 
        os.rmdir('sub')
123
 
        os.unlink('b.txt')
124
 
        self.run_bzr(['commit', '-m', 'Removed a.txt'])
125
 
        os.chdir('../b')
126
 
        print >> file('sub/a.txt', 'ab'), "something"
127
 
        print >> file('b.txt', 'ab'), "something"
128
 
        print >> file('sub/c.txt', 'ab'), "something"
129
 
        self.run_bzr(['commit', '-m', 'Modified a.txt'])
 
180
        self.build_tree_contents([
 
181
            ('a/',),
 
182
            ('a/sub/',),
 
183
            ('a/sub/a.txt', 'hello\n'),
 
184
            ('a/b.txt', 'hello\n'),
 
185
            ('a/sub/c.txt', 'hello\n')])
 
186
        a_tree = self.make_branch_and_tree('a')
 
187
        a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
 
188
        a_tree.commit(message='added a')
 
189
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
 
190
        self.build_tree_contents([
 
191
            ('a/sub/a.txt', 'hello\nthere\n'),
 
192
            ('a/b.txt', 'hello\nthere\n'),
 
193
            ('a/sub/c.txt', 'hello\nthere\n')])
 
194
        a_tree.commit(message='Added there')
 
195
        os.remove('a/sub/a.txt')
 
196
        os.remove('a/sub/c.txt')
 
197
        os.rmdir('a/sub')
 
198
        os.remove('a/b.txt')
 
199
        a_tree.commit(message='Removed a.txt')
 
200
        self.build_tree_contents([
 
201
            ('b/sub/a.txt', 'hello\nsomething\n'),
 
202
            ('b/b.txt', 'hello\nsomething\n'),
 
203
            ('b/sub/c.txt', 'hello\nsomething\n')])
 
204
        b_tree.commit(message='Modified a.txt')
 
205
        os.chdir('b')
130
206
        self.run_bzr('merge ../a/', retcode=1)
131
 
        self.assert_(os.path.exists('sub/a.txt.THIS'))
132
 
        self.assert_(os.path.exists('sub/a.txt.BASE'))
 
207
        self.failUnlessExists('sub/a.txt.THIS')
 
208
        self.failUnlessExists('sub/a.txt.BASE')
133
209
        os.chdir('../a')
134
210
        self.run_bzr('merge ../b/', retcode=1)
135
 
        self.assert_(os.path.exists('sub/a.txt.OTHER'))
136
 
        self.assert_(os.path.exists('sub/a.txt.BASE'))
 
211
        self.failUnlessExists('sub/a.txt.OTHER')
 
212
        self.failUnlessExists('sub/a.txt.BASE')
 
213
 
 
214
    def test_conflict_leaves_base_this_other_files(self):
 
215
        tree, other = self.create_conflicting_branches()
 
216
        self.run_bzr('merge ../other', working_dir='tree',
 
217
                     retcode=1)
 
218
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
 
219
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
 
220
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
221
 
 
222
    def test_weave_conflict_leaves_base_this_other_files(self):
 
223
        tree, other = self.create_conflicting_branches()
 
224
        self.run_bzr('merge ../other --weave', working_dir='tree',
 
225
                     retcode=1)
 
226
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
 
227
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
 
228
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
137
229
 
138
230
    def test_merge_remember(self):
139
 
        """Merge changes from one branch to another and test parent location."""
 
231
        """Merge changes from one branch to another, test submit location."""
140
232
        tree_a = self.make_branch_and_tree('branch_a')
141
233
        branch_a = tree_a.branch
142
234
        self.build_tree(['branch_a/a'])
161
253
        out = self.run_bzr('merge', retcode=3)
162
254
        self.assertEquals(out,
163
255
                ('','bzr: ERROR: No location specified or remembered\n'))
164
 
        # test implicit --remember when no parent set, this merge conflicts
 
256
 
 
257
        # test uncommitted changes
165
258
        self.build_tree(['d'])
166
259
        tree_b.add('d')
167
 
        out = self.run_bzr('merge ../branch_a', retcode=3)
168
 
        self.assertEquals(out,
169
 
                ('','bzr: ERROR: Working tree has uncommitted changes.\n'))
170
 
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
171
 
        # test implicit --remember after resolving conflict
 
260
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
 
261
                           'merge')
 
262
 
 
263
        # merge should now pass and implicitly remember merge location
172
264
        tree_b.commit('commit d')
 
265
        out, err = self.run_bzr('merge ../branch_a')
 
266
 
 
267
        base = urlutils.local_path_from_url(branch_a.base)
 
268
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
 
269
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
 
270
                          osutils.abspath(parent))
 
271
        # test implicit --remember when committing new file
 
272
        self.build_tree(['e'])
 
273
        tree_b.add('e')
 
274
        tree_b.commit('commit e')
173
275
        out, err = self.run_bzr('merge')
174
 
        
175
 
        base = urlutils.local_path_from_url(branch_a.base)
176
 
        self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
177
 
        self.assertEquals(err, '+N  b\nAll changes applied successfully.\n')
178
 
        self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
 
276
        self.assertStartsWith(err,
 
277
                          'Merging from remembered submit location %s\n' % (base,))
179
278
        # re-open tree as external run_bzr modified it
180
279
        tree_b = branch_b.bzrdir.open_workingtree()
181
280
        tree_b.commit('merge branch_a')
183
282
        out, err = self.run_bzr('merge ../branch_c --remember')
184
283
        self.assertEquals(out, '')
185
284
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
186
 
        self.assertEquals(abspath(branch_b.get_parent()),
187
 
                          abspath(branch_c.bzrdir.root_transport.base))
 
285
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
 
286
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
188
287
        # re-open tree as external run_bzr modified it
189
288
        tree_b = branch_b.bzrdir.open_workingtree()
190
289
        tree_b.commit('merge branch_c')
192
291
    def test_merge_bundle(self):
193
292
        from bzrlib.testament import Testament
194
293
        tree_a = self.make_branch_and_tree('branch_a')
195
 
        f = file('branch_a/a', 'wb')
196
 
        f.write('hello')
197
 
        f.close()
 
294
        self.build_tree_contents([('branch_a/a', 'hello')])
198
295
        tree_a.add('a')
199
296
        tree_a.commit('message')
200
297
 
201
298
        tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
202
 
        f = file('branch_a/a', 'wb')
203
 
        f.write('hey there')
204
 
        f.close()
 
299
        self.build_tree_contents([('branch_a/a', 'hey there')])
205
300
        tree_a.commit('message')
206
301
 
207
 
        f = file('branch_b/a', 'wb')
208
 
        f.write('goodbye')
209
 
        f.close()
 
302
        self.build_tree_contents([('branch_b/a', 'goodbye')])
210
303
        tree_b.commit('message')
211
304
        os.chdir('branch_b')
212
305
        self.run_bzr('bundle ../branch_a -o ../bundle')
218
311
                                              tree_b.get_parent_ids()[0])
219
312
        self.assertEqualDiff(testament_a.as_text(),
220
313
                         testament_b.as_text())
221
 
        tree_a.set_conflicts(ConflictList())
 
314
        tree_a.set_conflicts(conflicts.ConflictList())
222
315
        tree_a.commit('message')
223
316
        # it is legal to attempt to merge an already-merged bundle
224
317
        output = self.run_bzr('merge ../bundle')[1]
241
334
        self.run_bzr('merge a --uncommitted -d b')
242
335
        self.failUnlessExists('b/file_1')
243
336
        self.failUnlessExists('b/file_ii')
244
 
        tree_b.revert([])
 
337
        tree_b.revert()
245
338
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
246
339
                           'merge /a --uncommitted -r1 -d b')
247
340
 
248
 
    def pullable_branch(self):
249
 
        os.mkdir('a')
250
 
        os.chdir('a')
251
 
        self.example_branch()
252
 
        os.chdir('..')
253
 
        self.run_bzr('branch a b')
254
 
        os.chdir('b')
255
 
        file('goodbye', 'wt').write('quux')
256
 
        self.run_bzr(['commit', '-m', "mode u's are always good"])
257
 
        os.chdir('../a')
 
341
    def test_merge_uncommitted_file(self):
 
342
        """It should be possible to merge changes from a single file."""
 
343
        tree_a = self.make_branch_and_tree('tree_a')
 
344
        tree_a.commit('initial commit')
 
345
        tree_a.bzrdir.sprout('tree_b')
 
346
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
 
347
        tree_a.add(['file1', 'file2'])
 
348
        os.chdir('tree_b')
 
349
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
350
        self.failUnlessExists('file1')
 
351
        self.failIfExists('file2')
258
352
 
259
353
    def pullable_branch(self):
260
354
        tree_a = self.make_branch_and_tree('a')
261
355
        self.build_tree(['a/file'])
262
356
        tree_a.add(['file'])
263
357
        self.id1 = tree_a.commit('commit 1')
264
 
        
 
358
 
265
359
        tree_b = self.make_branch_and_tree('b')
266
360
        tree_b.pull(tree_a.branch)
267
361
        file('b/file', 'wb').write('foo')
272
366
        os.chdir('a')
273
367
        (out, err) = self.run_bzr('merge --pull ../b')
274
368
        self.assertContainsRe(out, 'Now on revision 2\\.')
275
 
        tree_a = WorkingTree.open('.')
 
369
        tree_a = workingtree.WorkingTree.open('.')
276
370
        self.assertEqual([self.id2], tree_a.get_parent_ids())
277
371
 
278
372
    def test_merge_kind_change(self):
286
380
        tree_a.commit('changed file to directory')
287
381
        os.chdir('tree_b')
288
382
        self.run_bzr('merge ../tree_a')
289
 
        self.assertEqual('directory', file_kind('file'))
290
 
        tree_b.revert([])
291
 
        self.assertEqual('file', file_kind('file'))
 
383
        self.assertEqual('directory', osutils.file_kind('file'))
 
384
        tree_b.revert()
 
385
        self.assertEqual('file', osutils.file_kind('file'))
292
386
        self.build_tree_contents([('file', 'content_2')])
293
387
        tree_b.commit('content change')
294
388
        self.run_bzr('merge ../tree_a', retcode=1)
295
389
        self.assertEqual(tree_b.conflicts(),
296
 
                         [ContentsConflict('file', file_id='file-id')])
 
390
                         [conflicts.ContentsConflict('file',
 
391
                                                     file_id='file-id')])
297
392
 
298
393
    def test_directive_cherrypick(self):
299
394
        source = self.make_branch_and_tree('source')
 
395
        source.commit("nothing")
 
396
        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
 
397
        # cherrypick from one branch into another unrelated branch with a
 
398
        # different root id will give shape conflicts.  as a workaround we
 
399
        # make sure they share the same root id.
 
400
        target = source.bzrdir.sprout('target').open_workingtree()
300
401
        self.build_tree(['source/a'])
301
402
        source.add('a')
302
403
        source.commit('Added a', rev_id='rev1')
303
404
        self.build_tree(['source/b'])
304
405
        source.add('b')
305
406
        source.commit('Added b', rev_id='rev2')
306
 
        target = self.make_branch_and_tree('target')
307
407
        target.commit('empty commit')
308
408
        self.write_directive('directive', source.branch, 'target', 'rev2',
309
409
                             'rev1')
310
 
        self.run_bzr('merge -d target directive')
 
410
        out, err = self.run_bzr('merge -d target directive')
311
411
        self.failIfExists('target/a')
312
412
        self.failUnlessExists('target/b')
 
413
        self.assertContainsRe(err, 'Performing cherrypick')
313
414
 
314
415
    def write_directive(self, filename, source, target, revision_id,
315
416
                        base_revision_id=None, mangle_patch=False):
330
431
        self.write_directive('directive', source.branch, 'target', 'rev1')
331
432
        err = self.run_bzr('merge -d target directive')[1]
332
433
        self.assertNotContainsRe(err, 'Preview patch does not match changes')
333
 
        target.revert([])
 
434
        target.revert()
334
435
        self.write_directive('directive', source.branch, 'target', 'rev1',
335
436
                             mangle_patch=True)
336
437
        err = self.run_bzr('merge -d target directive')[1]
356
457
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
357
458
        self.failUnlessExists('target/file1')
358
459
        self.failIfExists('target/file2')
359
 
        target.revert([])
 
460
        target.revert()
360
461
 
361
462
        # It should work if the revid has no integer revno
362
463
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
363
464
        self.failUnlessExists('target/file1')
364
465
        self.failIfExists('target/file2')
 
466
 
 
467
    def assertDirectoryContent(self, directory, entries, message=''):
 
468
        """Assert whether entries (file or directories) exist in a directory.
 
469
 
 
470
        It also checks that there are no extra entries.
 
471
        """
 
472
        ondisk = os.listdir(directory)
 
473
        if set(ondisk) == set(entries):
 
474
            return
 
475
        if message:
 
476
            message += '\n'
 
477
        raise AssertionError(
 
478
            '%s"%s" directory content is different:\na = %s\nb = %s\n'
 
479
            % (message, directory, sorted(entries), sorted(ondisk)))
 
480
 
 
481
    def test_cherrypicking_merge(self):
 
482
        # make source branch
 
483
        source = self.make_branch_and_tree('source')
 
484
        for f in ('a', 'b', 'c', 'd'):
 
485
            self.build_tree(['source/'+f])
 
486
            source.add(f)
 
487
            source.commit('added '+f, rev_id='rev_'+f)
 
488
        # target branch
 
489
        target = source.bzrdir.sprout('target', 'rev_a').open_workingtree()
 
490
        self.assertDirectoryContent('target', ['.bzr', 'a'])
 
491
        # pick 1 revision
 
492
        self.run_bzr('merge -d target -r revid:rev_b..revid:rev_c source')
 
493
        self.assertDirectoryContent('target', ['.bzr', 'a', 'c'])
 
494
        target.revert()
 
495
        # pick 2 revisions
 
496
        self.run_bzr('merge -d target -r revid:rev_b..revid:rev_d source')
 
497
        self.assertDirectoryContent('target', ['.bzr', 'a', 'c', 'd'])
 
498
        target.revert()
 
499
        # pick 1 revision with option --changes
 
500
        self.run_bzr('merge -d target -c revid:rev_d source')
 
501
        self.assertDirectoryContent('target', ['.bzr', 'a', 'd'])
 
502
 
 
503
    def test_merge_criss_cross(self):
 
504
        tree_a = self.make_branch_and_tree('a')
 
505
        tree_a.commit('', rev_id='rev1')
 
506
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
507
        tree_a.commit('', rev_id='rev2a')
 
508
        tree_b.commit('', rev_id='rev2b')
 
509
        tree_a.merge_from_branch(tree_b.branch)
 
510
        tree_b.merge_from_branch(tree_a.branch)
 
511
        tree_a.commit('', rev_id='rev3a')
 
512
        tree_b.commit('', rev_id='rev3b')
 
513
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
 
514
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
 
515
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
 
516
 
 
517
    def test_merge_from_submit(self):
 
518
        tree_a = self.make_branch_and_tree('a')
 
519
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
520
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
 
521
        out, err = self.run_bzr(['merge', '-d', 'c'])
 
522
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
 
523
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
 
524
        out, err = self.run_bzr(['merge', '-d', 'c'])
 
525
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
 
526
 
 
527
    def test_remember_sets_submit(self):
 
528
        tree_a = self.make_branch_and_tree('a')
 
529
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
530
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
531
 
 
532
        # Remember should not happen if using default from parent
 
533
        out, err = self.run_bzr(['merge', '-d', 'b'])
 
534
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
535
 
 
536
        # Remember should happen if user supplies location
 
537
        out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
 
538
        self.assertEqual(tree_b.branch.get_submit_branch(),
 
539
                         tree_a.bzrdir.root_transport.base)
 
540
 
 
541
    def test_weave_cherrypick(self):
 
542
        this_tree = self.make_branch_and_tree('this')
 
543
        self.build_tree_contents([('this/file', "a\n")])
 
544
        this_tree.add('file')
 
545
        this_tree.commit('rev1')
 
546
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
547
        self.build_tree_contents([('other/file', "a\nb\n")])
 
548
        other_tree.commit('rev2b')
 
549
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
550
        other_tree.commit('rev3b')
 
551
        self.run_bzr('merge --weave -d this other -r -2..-1')
 
552
        self.assertFileEqual('c\na\n', 'this/file')
 
553
 
 
554
    def test_lca_merge_criss_cross(self):
 
555
        tree_a = self.make_branch_and_tree('a')
 
556
        self.build_tree_contents([('a/file', 'base-contents\n')])
 
557
        tree_a.add('file')
 
558
        tree_a.commit('', rev_id='rev1')
 
559
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
560
        self.build_tree_contents([('a/file',
 
561
                                   'base-contents\nthis-contents\n')])
 
562
        tree_a.commit('', rev_id='rev2a')
 
563
        self.build_tree_contents([('b/file',
 
564
                                   'base-contents\nother-contents\n')])
 
565
        tree_b.commit('', rev_id='rev2b')
 
566
        tree_a.merge_from_branch(tree_b.branch)
 
567
        self.build_tree_contents([('a/file',
 
568
                                   'base-contents\nthis-contents\n')])
 
569
        tree_a.set_conflicts(conflicts.ConflictList())
 
570
        tree_b.merge_from_branch(tree_a.branch)
 
571
        self.build_tree_contents([('b/file',
 
572
                                   'base-contents\nother-contents\n')])
 
573
        tree_b.set_conflicts(conflicts.ConflictList())
 
574
        tree_a.commit('', rev_id='rev3a')
 
575
        tree_b.commit('', rev_id='rev3b')
 
576
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
 
577
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
 
578
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
 
579
                             'a/file')
 
580
 
 
581
    def test_merge_preview(self):
 
582
        this_tree = self.make_branch_and_tree('this')
 
583
        this_tree.commit('rev1')
 
584
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
585
        self.build_tree_contents([('other/file', 'new line')])
 
586
        other_tree.add('file')
 
587
        other_tree.commit('rev2a')
 
588
        this_tree.commit('rev2b')
 
589
        out, err = self.run_bzr(['merge', '-d', 'this', 'other', '--preview'])
 
590
        self.assertContainsRe(out, '\+new line')
 
591
        self.assertNotContainsRe(err, '\+N  file\n')
 
592
        this_tree.lock_read()
 
593
        self.addCleanup(this_tree.unlock)
 
594
        self.assertEqual([],
 
595
                         list(this_tree.iter_changes(this_tree.basis_tree())))
 
596
 
 
597
    def test_merge_missing_second_revision_spec(self):
 
598
        """Merge uses branch basis when the second revision is unspecified."""
 
599
        this = self.make_branch_and_tree('this')
 
600
        this.commit('rev1')
 
601
        other = self.make_branch_and_tree('other')
 
602
        self.build_tree(['other/other_file'])
 
603
        other.add('other_file')
 
604
        other.commit('rev1b')
 
605
        self.run_bzr('merge -d this other -r0..')
 
606
        self.failUnlessExists('this/other_file')
 
607
 
 
608
    def test_merge_interactive_unlocks_branch(self):
 
609
        this = self.make_branch_and_tree('this')
 
610
        other = self.make_branch_and_tree('other')
 
611
        other.commit('empty commit')
 
612
        self.run_bzr('merge -i -d this other')
 
613
        this.lock_write()
 
614
        this.unlock()
 
615
 
 
616
    def test_merge_reversed_revision_range(self):
 
617
        tree = self.make_branch_and_tree(".")
 
618
        for f in ("a", "b"):
 
619
            self.build_tree([f])
 
620
            tree.add(f)
 
621
            tree.commit("added "+f)
 
622
        for context in (".", "", "a"):
 
623
            self.run_bzr("merge -r 1..0 " + context)
 
624
            self.failIfExists("a")
 
625
            tree.revert()
 
626
            self.failUnlessExists("a")
 
627
 
 
628
 
 
629
class TestMergeForce(tests.TestCaseWithTransport):
 
630
 
 
631
    def setUp(self):
 
632
        super(TestMergeForce, self).setUp()
 
633
        self.tree_a = self.make_branch_and_tree('a')
 
634
        self.build_tree(['a/foo'])
 
635
        self.tree_a.add(['foo'])
 
636
        self.tree_a.commit('add file')
 
637
        self.tree_b = self.tree_a.bzrdir.sprout('b').open_workingtree()
 
638
        self.build_tree_contents([('a/foo', 'change 1')])
 
639
        self.tree_a.commit('change file')
 
640
        self.tree_b.merge_from_branch(self.tree_a.branch)
 
641
 
 
642
    def test_merge_force(self):
 
643
        self.tree_a.commit('empty change to allow merge to run')
 
644
        # Second merge on top of the uncommitted one
 
645
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
 
646
 
 
647
 
 
648
    def test_merge_with_uncommitted_changes(self):
 
649
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
 
650
                           ['merge', '../a'], working_dir='b')
 
651
 
 
652
    def test_merge_with_pending_merges(self):
 
653
        # Revert the changes keeping the pending merge
 
654
        self.run_bzr(['revert', 'b'])
 
655
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
 
656
                           ['merge', '../a'], working_dir='b')