22
from bzrlib.tests import script
24
def make_tree_with_conflicts(test, this_path='this', other_path='other'):
25
this_tree = test.make_branch_and_tree(this_path)
26
test.build_tree_contents([
27
('%s/myfile' % (this_path,), 'this content\n'),
28
('%s/my_other_file' % (this_path,), 'this content\n'),
29
('%s/mydir/' % (this_path,),),
31
this_tree.add('myfile')
32
this_tree.add('my_other_file')
33
this_tree.add('mydir')
34
this_tree.commit(message="new")
35
other_tree = this_tree.bzrdir.sprout(other_path).open_workingtree()
36
test.build_tree_contents([
37
('%s/myfile' % (other_path,), 'contentsb\n'),
38
('%s/my_other_file' % (other_path,), 'contentsb\n'),
40
other_tree.rename_one('mydir', 'mydir2')
41
other_tree.commit(message="change")
42
test.build_tree_contents([
43
('%s/myfile' % (this_path,), 'contentsa2\n'),
44
('%s/my_other_file' % (this_path,), 'contentsa2\n'),
46
this_tree.rename_one('mydir', 'mydir3')
47
this_tree.commit(message='change')
48
this_tree.merge_from_branch(other_tree.branch)
49
return this_tree, other_tree
52
class TestConflicts(script.TestCaseWithTransportAndScript):
23
# FIXME: These don't really look at the output of the conflict commands, just
24
# the number of lines - there should be more examination.
26
class TestConflictsBase(tests.TestCaseWithTransport):
55
super(TestConflicts, self).setUp()
56
make_tree_with_conflicts(self, 'branch', 'other')
29
super(TestConflictsBase, self).setUp()
30
self.make_tree_with_conflicts()
32
def make_tree_with_conflicts(self):
33
a_tree = self.make_branch_and_tree('a')
34
self.build_tree_contents([
35
('a/myfile', 'contentsa\n'),
36
('a/my_other_file', 'contentsa\n'),
40
a_tree.add('my_other_file')
42
a_tree.commit(message="new")
43
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
44
self.build_tree_contents([
45
('b/myfile', 'contentsb\n'),
46
('b/my_other_file', 'contentsb\n'),
48
b_tree.rename_one('mydir', 'mydir2')
49
b_tree.commit(message="change")
50
self.build_tree_contents([
51
('a/myfile', 'contentsa2\n'),
52
('a/my_other_file', 'contentsa2\n'),
54
a_tree.rename_one('mydir', 'mydir3')
55
a_tree.commit(message='change')
56
a_tree.merge_from_branch(b_tree.branch)
58
def run_bzr(self, cmd, working_dir='a', **kwargs):
59
return super(TestConflictsBase, self).run_bzr(
60
cmd, working_dir=working_dir, **kwargs)
63
class TestConflicts(TestConflictsBase):
58
65
def test_conflicts(self):
62
Text conflict in my_other_file
63
Path conflict: mydir3 / mydir2
64
Text conflict in myfile
66
out, err = self.run_bzr('conflicts')
67
self.assertEqual(3, len(out.splitlines()))
67
69
def test_conflicts_text(self):
70
$ bzr conflicts --text
70
out, err = self.run_bzr('conflicts --text')
71
self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
75
73
def test_conflicts_directory(self):
77
$ bzr conflicts -d branch
78
Text conflict in my_other_file
79
Path conflict: mydir3 / mydir2
80
Text conflict in myfile
74
"""Test --directory option"""
75
out, err = self.run_bzr('conflicts --directory a', working_dir='.')
76
self.assertEqual(3, len(out.splitlines()))
77
self.assertEqual('', err)
80
class TestResolve(TestConflictsBase):
82
def test_resolve(self):
83
self.run_bzr('resolve myfile')
84
out, err = self.run_bzr('conflicts')
85
self.assertEqual(2, len(out.splitlines()))
86
self.run_bzr('resolve my_other_file')
87
self.run_bzr('resolve mydir2')
88
out, err = self.run_bzr('conflicts')
89
self.assertEqual(0, len(out.splitlines()))
91
def test_resolve_all(self):
92
self.run_bzr('resolve --all')
93
out, err = self.run_bzr('conflicts')
94
self.assertEqual(0, len(out.splitlines()))
96
def test_resolve_in_subdir(self):
97
"""resolve when run from subdirectory should handle relative paths"""
98
self.build_tree(["a/subdir/"])
99
self.run_bzr("resolve ../myfile", working_dir='a/subdir')
100
self.run_bzr("resolve ../a/myfile", working_dir='b')
101
wt = workingtree.WorkingTree.open_containing('b')[0]
102
conflicts = wt.conflicts()
103
self.assertEqual(True, conflicts.is_empty(),
104
"tree still contains conflicts: %r" % conflicts)
106
def test_auto_resolve(self):
107
"""Text conflicts can be resolved automatically"""
108
tree = self.make_branch_and_tree('tree')
109
self.build_tree_contents([('tree/file',
110
'<<<<<<<\na\n=======\n>>>>>>>\n')])
111
tree.add('file', 'file_id')
112
self.assertEqual(tree.kind('file_id'), 'file')
113
file_conflict = conflicts.TextConflict('file', file_id='file_id')
114
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
115
note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
116
self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
117
self.assertContainsRe(note,
118
'Remaining conflicts:\nText conflict in file')
119
self.build_tree_contents([('tree/file', 'a\n')])
120
note = self.run_bzr('resolve', working_dir='tree')[1]
121
self.assertContainsRe(note, 'All conflicts resolved.')
123
def test_resolve_all_directory(self):
124
"""Test --directory option"""
125
out, err = self.run_bzr('resolve --all -d a', working_dir='.')
126
self.assertEqual('', err)
127
out, err = self.run_bzr('conflicts')
128
self.assertEqual(0, len(out.splitlines()))
added
removed
bzrlib/tests/blackbox/test_conflicts.py
