1
# Copyright (C) 2006, 2007 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# Author: Aaron Bentley <aaron.bentley@utoronto.ca>
19
"""Black-box tests for bzr merge.
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, pathjoin
29
from bzrlib.tests.blackbox import ExternalBase
30
import bzrlib.urlutils as urlutils
31
from bzrlib.workingtree import WorkingTree
34
class TestMerge(ExternalBase):
36
def example_branch(self, path='.'):
37
tree = self.make_branch_and_tree(path)
38
self.build_tree_contents([
39
(pathjoin(path, 'hello'), 'foo'),
40
(pathjoin(path, 'goodbye'), 'baz')])
42
tree.commit(message='setup')
44
tree.commit(message='setup')
47
def test_merge_reprocess(self):
48
d = BzrDir.create_standalone_workingtree('.')
50
self.run_bzr('merge . --reprocess --merge-type weave')
53
from bzrlib.branch import Branch
55
a_tree = self.example_branch('a')
56
ancestor = a_tree.branch.revno()
57
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
58
self.build_tree_contents([('b/goodbye', 'quux')])
59
b_tree.commit(message="more u's are always good")
61
self.build_tree_contents([('a/hello', 'quuux')])
62
# We can't merge when there are in-tree changes
64
self.run_bzr('merge ../b', retcode=3)
65
a = WorkingTree.open('.')
66
a_tip = a.commit("Like an epidemic of u's")
67
self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
69
self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
70
a_tree.revert(backups=False)
71
self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
72
a_tree.revert(backups=False)
73
self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
74
a_tree.revert(backups=False)
75
self.run_bzr_error(['Show-base is not supported for this merge type'],
76
'merge ../b -r last:1..last:1 --merge-type weave'
78
a_tree.revert(backups=False)
79
self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
80
a_tree.revert(backups=False)
81
self.run_bzr('merge ../b -r last:1')
82
self.check_file_contents('goodbye', 'quux')
83
# Merging a branch pulls its revision into the tree
84
b = Branch.open('../b')
85
b_tip = b.last_revision()
86
self.failUnless(a.branch.repository.has_revision(b_tip))
87
self.assertEqual([a_tip, b_tip], a.get_parent_ids())
88
a_tree.revert(backups=False)
89
out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
90
self.assertTrue("Not a branch" in err)
91
self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
92
%(ancestor,b.revno()))
93
self.assertEquals(a.get_parent_ids(),
94
[a.branch.last_revision(), b.last_revision()])
95
self.check_file_contents('goodbye', 'quux')
96
a_tree.revert(backups=False)
97
self.run_bzr('merge -r revno:%d:../b'%b.revno())
98
self.assertEquals(a.get_parent_ids(),
99
[a.branch.last_revision(), b.last_revision()])
100
a_tip = a.commit('merged')
101
self.run_bzr('merge ../b -r last:1')
102
self.assertEqual([a_tip], a.get_parent_ids())
104
def test_merge_with_missing_file(self):
105
"""Merge handles missing file conflicts"""
106
self.build_tree_contents([
109
('a/sub/a.txt', 'hello\n'),
110
('a/b.txt', 'hello\n'),
111
('a/sub/c.txt', 'hello\n')])
112
a_tree = self.make_branch_and_tree('a')
113
a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
114
a_tree.commit(message='added a')
115
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
116
self.build_tree_contents([
117
('a/sub/a.txt', 'hello\nthere\n'),
118
('a/b.txt', 'hello\nthere\n'),
119
('a/sub/c.txt', 'hello\nthere\n')])
120
a_tree.commit(message='Added there')
121
os.remove('a/sub/a.txt')
122
os.remove('a/sub/c.txt')
125
a_tree.commit(message='Removed a.txt')
126
self.build_tree_contents([
127
('b/sub/a.txt', 'hello\nsomething\n'),
128
('b/b.txt', 'hello\nsomething\n'),
129
('b/sub/c.txt', 'hello\nsomething\n')])
130
b_tree.commit(message='Modified a.txt')
132
self.run_bzr('merge ../a/', retcode=1)
133
self.failUnlessExists('sub/a.txt.THIS')
134
self.failUnlessExists('sub/a.txt.BASE')
136
self.run_bzr('merge ../b/', retcode=1)
137
self.failUnlessExists('sub/a.txt.OTHER')
138
self.failUnlessExists('sub/a.txt.BASE')
140
def test_merge_remember(self):
141
"""Merge changes from one branch to another and test parent location."""
142
tree_a = self.make_branch_and_tree('branch_a')
143
branch_a = tree_a.branch
144
self.build_tree(['branch_a/a'])
146
tree_a.commit('commit a')
147
branch_b = branch_a.bzrdir.sprout('branch_b').open_branch()
148
tree_b = branch_b.bzrdir.open_workingtree()
149
branch_c = branch_a.bzrdir.sprout('branch_c').open_branch()
150
tree_c = branch_c.bzrdir.open_workingtree()
151
self.build_tree(['branch_a/b'])
153
tree_a.commit('commit b')
154
self.build_tree(['branch_c/c'])
156
tree_c.commit('commit c')
158
parent = branch_b.get_parent()
159
branch_b.set_parent(None)
160
self.assertEqual(None, branch_b.get_parent())
161
# test merge for failure without parent set
163
out = self.run_bzr('merge', retcode=3)
164
self.assertEquals(out,
165
('','bzr: ERROR: No location specified or remembered\n'))
166
# test implicit --remember when no parent set, this merge conflicts
167
self.build_tree(['d'])
169
self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
171
self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
172
# test implicit --remember after resolving conflict
173
tree_b.commit('commit d')
174
out, err = self.run_bzr('merge')
176
base = urlutils.local_path_from_url(branch_a.base)
177
self.assertEquals(out, 'Merging from remembered location %s\n' % (base,))
178
self.assertEquals(err, '+N b\nAll changes applied successfully.\n')
179
self.assertEquals(abspath(branch_b.get_parent()), abspath(parent))
180
# re-open tree as external run_bzr modified it
181
tree_b = branch_b.bzrdir.open_workingtree()
182
tree_b.commit('merge branch_a')
183
# test explicit --remember
184
out, err = self.run_bzr('merge ../branch_c --remember')
185
self.assertEquals(out, '')
186
self.assertEquals(err, '+N c\nAll changes applied successfully.\n')
187
self.assertEquals(abspath(branch_b.get_parent()),
188
abspath(branch_c.bzrdir.root_transport.base))
189
# re-open tree as external run_bzr modified it
190
tree_b = branch_b.bzrdir.open_workingtree()
191
tree_b.commit('merge branch_c')
193
def test_merge_bundle(self):
194
from bzrlib.testament import Testament
195
tree_a = self.make_branch_and_tree('branch_a')
196
self.build_tree_contents([('branch_a/a', 'hello')])
198
tree_a.commit('message')
200
tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
201
self.build_tree_contents([('branch_a/a', 'hey there')])
202
tree_a.commit('message')
204
self.build_tree_contents([('branch_b/a', 'goodbye')])
205
tree_b.commit('message')
207
self.run_bzr('bundle ../branch_a -o ../bundle')
208
os.chdir('../branch_a')
209
self.run_bzr('merge ../bundle', retcode=1)
210
testament_a = Testament.from_revision(tree_a.branch.repository,
211
tree_b.get_parent_ids()[0])
212
testament_b = Testament.from_revision(tree_b.branch.repository,
213
tree_b.get_parent_ids()[0])
214
self.assertEqualDiff(testament_a.as_text(),
215
testament_b.as_text())
216
tree_a.set_conflicts(ConflictList())
217
tree_a.commit('message')
218
# it is legal to attempt to merge an already-merged bundle
219
output = self.run_bzr('merge ../bundle')[1]
220
# but it does nothing
221
self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
222
self.assertEqual('Nothing to do.\n', output)
224
def test_merge_uncommitted(self):
225
"""Check that merge --uncommitted behaves properly"""
226
tree_a = self.make_branch_and_tree('a')
227
self.build_tree(['a/file_1', 'a/file_2'])
228
tree_a.add(['file_1', 'file_2'])
229
tree_a.commit('commit 1')
230
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
231
self.failUnlessExists('b/file_1')
232
tree_a.rename_one('file_1', 'file_i')
233
tree_a.commit('commit 2')
234
tree_a.rename_one('file_2', 'file_ii')
236
self.run_bzr('merge a --uncommitted -d b')
237
self.failUnlessExists('b/file_1')
238
self.failUnlessExists('b/file_ii')
240
self.run_bzr_error(('Cannot use --uncommitted and --revision',),
241
'merge /a --uncommitted -r1 -d b')
243
def test_merge_uncommitted_file(self):
244
"""It should be possible to merge changes from a single file."""
245
tree_a = self.make_branch_and_tree('tree_a')
246
tree_a.commit('initial commit')
247
tree_a.bzrdir.sprout('tree_b')
248
self.build_tree(['tree_a/file1', 'tree_a/file2'])
249
tree_a.add(['file1', 'file2'])
251
self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
252
self.failUnlessExists('file1')
253
self.failIfExists('file2')
255
def pullable_branch(self):
256
tree_a = self.make_branch_and_tree('a')
257
self.build_tree(['a/file'])
259
self.id1 = tree_a.commit('commit 1')
261
tree_b = self.make_branch_and_tree('b')
262
tree_b.pull(tree_a.branch)
263
file('b/file', 'wb').write('foo')
264
self.id2 = tree_b.commit('commit 2')
266
def test_merge_pull(self):
267
self.pullable_branch()
269
(out, err) = self.run_bzr('merge --pull ../b')
270
self.assertContainsRe(out, 'Now on revision 2\\.')
271
tree_a = WorkingTree.open('.')
272
self.assertEqual([self.id2], tree_a.get_parent_ids())
274
def test_merge_kind_change(self):
275
tree_a = self.make_branch_and_tree('tree_a')
276
self.build_tree_contents([('tree_a/file', 'content_1')])
277
tree_a.add('file', 'file-id')
278
tree_a.commit('added file')
279
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
280
os.unlink('tree_a/file')
281
self.build_tree(['tree_a/file/'])
282
tree_a.commit('changed file to directory')
284
self.run_bzr('merge ../tree_a')
285
self.assertEqual('directory', file_kind('file'))
287
self.assertEqual('file', file_kind('file'))
288
self.build_tree_contents([('file', 'content_2')])
289
tree_b.commit('content change')
290
self.run_bzr('merge ../tree_a', retcode=1)
291
self.assertEqual(tree_b.conflicts(),
292
[ContentsConflict('file', file_id='file-id')])
294
def test_directive_cherrypick(self):
295
source = self.make_branch_and_tree('source')
296
self.build_tree(['source/a'])
298
source.commit('Added a', rev_id='rev1')
299
self.build_tree(['source/b'])
301
source.commit('Added b', rev_id='rev2')
302
target = self.make_branch_and_tree('target')
303
target.commit('empty commit')
304
self.write_directive('directive', source.branch, 'target', 'rev2',
306
out, err = self.run_bzr('merge -d target directive')
307
self.failIfExists('target/a')
308
self.failUnlessExists('target/b')
309
self.assertContainsRe(err, 'Performing cherrypick')
311
def write_directive(self, filename, source, target, revision_id,
312
base_revision_id=None, mangle_patch=False):
313
md = merge_directive.MergeDirective2.from_objects(
314
source.repository, revision_id, 0, 0, target,
315
base_revision_id=base_revision_id)
318
self.build_tree_contents([(filename, ''.join(md.to_lines()))])
320
def test_directive_verify_warning(self):
321
source = self.make_branch_and_tree('source')
322
self.build_tree(['source/a'])
324
source.commit('Added a', rev_id='rev1')
325
target = self.make_branch_and_tree('target')
326
target.commit('empty commit')
327
self.write_directive('directive', source.branch, 'target', 'rev1')
328
err = self.run_bzr('merge -d target directive')[1]
329
self.assertNotContainsRe(err, 'Preview patch does not match changes')
331
self.write_directive('directive', source.branch, 'target', 'rev1',
333
err = self.run_bzr('merge -d target directive')[1]
334
self.assertContainsRe(err, 'Preview patch does not match changes')
336
def test_merge_arbitrary(self):
337
target = self.make_branch_and_tree('target')
338
target.commit('empty')
339
# We need a revision that has no integer revno
340
branch_a = target.bzrdir.sprout('branch_a').open_workingtree()
341
self.build_tree(['branch_a/file1'])
342
branch_a.add('file1')
343
branch_a.commit('added file1', rev_id='rev2a')
344
branch_b = target.bzrdir.sprout('branch_b').open_workingtree()
345
self.build_tree(['branch_b/file2'])
346
branch_b.add('file2')
347
branch_b.commit('added file2', rev_id='rev2b')
348
branch_b.merge_from_branch(branch_a.branch)
349
self.failUnlessExists('branch_b/file1')
350
branch_b.commit('merged branch_a', rev_id='rev3b')
352
# It works if the revid has an interger revno
353
self.run_bzr('merge -d target -r revid:rev2a branch_a')
354
self.failUnlessExists('target/file1')
355
self.failIfExists('target/file2')
358
# It should work if the revid has no integer revno
359
self.run_bzr('merge -d target -r revid:rev2a branch_b')
360
self.failUnlessExists('target/file1')
361
self.failIfExists('target/file2')
363
def assertDirectoryContent(self, directory, entries, message=''):
364
"""Assert whether entries (file or directories) exist in a directory.
366
It also checks that there are no extra entries.
368
ondisk = os.listdir(directory)
369
if set(ondisk) == set(entries):
373
raise AssertionError(
374
'%s"%s" directory content is different:\na = %s\nb = %s\n'
375
% (message, directory, sorted(entries), sorted(ondisk)))
377
def test_cherrypicking_merge(self):
379
source = self.make_branch_and_tree('source')
380
for f in ('a', 'b', 'c', 'd'):
381
self.build_tree(['source/'+f])
383
source.commit('added '+f, rev_id='rev_'+f)
385
target = source.bzrdir.sprout('target', 'rev_a').open_workingtree()
386
self.assertDirectoryContent('target', ['.bzr', 'a'])
388
self.run_bzr('merge -d target -r revid:rev_b..revid:rev_c source')
389
self.assertDirectoryContent('target', ['.bzr', 'a', 'c'])
392
self.run_bzr('merge -d target -r revid:rev_b..revid:rev_d source')
393
self.assertDirectoryContent('target', ['.bzr', 'a', 'c', 'd'])
395
# pick 1 revision with option --changes
396
self.run_bzr('merge -d target -c revid:rev_d source')
397
self.assertDirectoryContent('target', ['.bzr', 'a', 'd'])
399
def test_merge_criss_cross(self):
400
tree_a = self.make_branch_and_tree('a')
401
tree_a.commit('', rev_id='rev1')
402
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
403
tree_a.commit('', rev_id='rev2a')
404
tree_b.commit('', rev_id='rev2b')
405
tree_a.merge_from_branch(tree_b.branch)
406
tree_b.merge_from_branch(tree_a.branch)
407
tree_a.commit('', rev_id='rev3a')
408
tree_b.commit('', rev_id='rev3b')
409
graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
410
out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
411
self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
413
def test_weave_cherrypick(self):
414
this_tree = self.make_branch_and_tree('this')
415
self.build_tree_contents([('this/file', "a\n")])
416
this_tree.add('file')
417
this_tree.commit('rev1')
418
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
419
self.build_tree_contents([('other/file', "a\nb\n")])
420
other_tree.commit('rev2b')
421
self.build_tree_contents([('other/file', "c\na\nb\n")])
422
other_tree.commit('rev3b')
423
self.run_bzr('merge --weave -d this other -r -2..-1')
424
self.assertFileEqual('c\na\n', 'this/file')
426
def test_lca_merge_criss_cross(self):
427
tree_a = self.make_branch_and_tree('a')
428
self.build_tree_contents([('a/file', 'base-contents\n')])
430
tree_a.commit('', rev_id='rev1')
431
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
432
self.build_tree_contents([('a/file',
433
'base-contents\nthis-contents\n')])
434
tree_a.commit('', rev_id='rev2a')
435
self.build_tree_contents([('b/file',
436
'base-contents\nother-contents\n')])
437
tree_b.commit('', rev_id='rev2b')
438
tree_a.merge_from_branch(tree_b.branch)
439
self.build_tree_contents([('a/file',
440
'base-contents\nthis-contents\n')])
441
tree_a.set_conflicts(ConflictList())
442
tree_b.merge_from_branch(tree_a.branch)
443
self.build_tree_contents([('b/file',
444
'base-contents\nother-contents\n')])
445
tree_b.set_conflicts(ConflictList())
446
tree_a.commit('', rev_id='rev3a')
447
tree_b.commit('', rev_id='rev3b')
448
out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
449
self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
450
'=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
added
removed
bzrlib/tests/blackbox/test_merge.py
