14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
19
from bzrlib import (
22
from bzrlib.tests import script, features
25
def make_tree_with_conflicts(test, this_path='this', other_path='other',
27
this_tree = test.make_branch_and_tree(this_path)
28
test.build_tree_contents([
29
('%s/%sfile' % (this_path, prefix), 'this content\n'),
30
('%s/%s_other_file' % (this_path, prefix), 'this content\n'),
31
('%s/%sdir/' % (this_path, prefix),),
33
this_tree.add(prefix+'file')
34
this_tree.add(prefix+'_other_file')
35
this_tree.add(prefix+'dir')
36
this_tree.commit(message="new")
37
other_tree = this_tree.bzrdir.sprout(other_path).open_workingtree()
38
test.build_tree_contents([
39
('%s/%sfile' % (other_path, prefix), 'contentsb\n'),
40
('%s/%s_other_file' % (other_path, prefix), 'contentsb\n'),
42
other_tree.rename_one(prefix+'dir', prefix+'dir2')
43
other_tree.commit(message="change")
44
test.build_tree_contents([
45
('%s/%sfile' % (this_path, prefix), 'contentsa2\n'),
46
('%s/%s_other_file' % (this_path, prefix), 'contentsa2\n'),
48
this_tree.rename_one(prefix+'dir', prefix+'dir3')
49
this_tree.commit(message='change')
50
this_tree.merge_from_branch(other_tree.branch)
51
return this_tree, other_tree
54
class TestConflicts(script.TestCaseWithTransportAndScript):
22
from bzrlib.workingtree import WorkingTree
23
from bzrlib.tests.blackbox import ExternalBase
25
# FIXME: These don't really look at the output of the conflict commands, just
26
# the number of lines - there should be more examination.
28
class TestConflicts(ExternalBase):
57
super(TestConflicts, self).setUp()
58
make_tree_with_conflicts(self, 'branch', 'other')
31
super(ExternalBase, self).setUp()
32
a_tree = self.make_branch_and_tree('a')
33
self.build_tree_contents([
34
('a/myfile', 'contentsa\n'),
35
('a/my_other_file', 'contentsa\n'),
39
a_tree.add('my_other_file')
41
a_tree.commit(message="new")
42
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
43
self.build_tree_contents([
44
('b/myfile', 'contentsb\n'),
45
('b/my_other_file', 'contentsb\n'),
47
b_tree.rename_one('mydir', 'mydir2')
48
b_tree.commit(message="change")
49
self.build_tree_contents([
50
('a/myfile', 'contentsa2\n'),
51
('a/my_other_file', 'contentsa2\n'),
53
a_tree.rename_one('mydir', 'mydir3')
54
a_tree.commit(message='change')
55
a_tree.merge_from_branch(b_tree.branch)
60
58
def test_conflicts(self):
64
Text conflict in my_other_file
65
Path conflict: mydir3 / mydir2
66
Text conflict in myfile
59
conflicts, errs = self.run_bzr('conflicts')
60
self.assertEqual(3, len(conflicts.splitlines()))
69
62
def test_conflicts_text(self):
72
$ bzr conflicts --text
77
def test_conflicts_directory(self):
79
$ bzr conflicts -d branch
80
Text conflict in my_other_file
81
Path conflict: mydir3 / mydir2
82
Text conflict in myfile
86
class TestUnicodePaths(tests.TestCaseWithTransport):
87
"""Unicode characters in conflicts should be displayed properly"""
89
_test_needs_features = [features.UnicodeFilenameFeature]
92
def _as_output(self, text):
95
def test_messages(self):
96
"""Conflict messages involving non-ascii paths are displayed okay"""
97
make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
98
out, err = self.run_bzr(["conflicts", "-d", "branch"],
99
encoding=self.encoding)
100
self.assertEqual(out.decode(self.encoding),
101
u"Text conflict in \xA7_other_file\n"
102
u"Path conflict: \xA7dir3 / \xA7dir2\n"
103
u"Text conflict in \xA7file\n")
104
self.assertEqual(err, "")
106
def test_text_conflict_paths(self):
107
"""Text conflicts on non-ascii paths are displayed okay"""
108
make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
109
out, err = self.run_bzr(["conflicts", "-d", "branch", "--text"],
110
encoding=self.encoding)
111
self.assertEqual(out.decode(self.encoding),
114
self.assertEqual(err, "")
117
class TestUnicodePathsOnAsciiTerminal(TestUnicodePaths):
118
"""Undisplayable unicode characters in conflicts should be escaped"""
123
self.skip("Need to decide if replacing is the desired behaviour")
125
def _as_output(self, text):
126
return text.encode(self.encoding, "replace")
63
conflicts = self.run_bzr('conflicts --text')[0].splitlines()
64
self.assertEqual(['my_other_file', 'myfile'], conflicts)
66
def test_resolve(self):
67
self.run_bzr('resolve myfile')
68
conflicts, errs = self.run_bzr('conflicts')
69
self.assertEqual(2, len(conflicts.splitlines()))
70
self.run_bzr('resolve my_other_file')
71
self.run_bzr('resolve mydir2')
72
conflicts, errs = self.run_bzr('conflicts')
73
self.assertEqual(len(conflicts.splitlines()), 0)
75
def test_resolve_all(self):
76
self.run_bzr('resolve --all')
77
conflicts, errs = self.run_bzr('conflicts')
78
self.assertEqual(len(conflicts.splitlines()), 0)
80
def test_resolve_in_subdir(self):
81
"""resolve when run from subdirectory should handle relative paths"""
82
orig_dir = os.getcwdu()
86
self.run_bzr("resolve ../myfile")
88
self.run_bzr("resolve ../a/myfile")
89
wt = WorkingTree.open_containing('.')[0]
90
conflicts = wt.conflicts()
91
if not conflicts.is_empty():
92
self.fail("tree still contains conflicts: %r" % conflicts)
96
def test_auto_resolve(self):
97
"""Text conflicts can be resolved automatically"""
98
tree = self.make_branch_and_tree('tree')
99
self.build_tree_contents([('tree/file',
100
'<<<<<<<\na\n=======\n>>>>>>>\n')])
101
tree.add('file', 'file_id')
102
self.assertEqual(tree.kind('file_id'), 'file')
103
file_conflict = conflicts.TextConflict('file', file_id='file_id')
104
tree.set_conflicts(conflicts.ConflictList([file_conflict]))
106
note = self.run_bzr('resolve', retcode=1)[1]
107
self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
108
self.assertContainsRe(note,
109
'Remaining conflicts:\nText conflict in file')
110
self.build_tree_contents([('file', 'a\n')])
111
note = self.run_bzr('resolve')[1]
112
self.assertContainsRe(note, 'All conflicts resolved.')
added
removed
bzrlib/tests/blackbox/test_conflicts.py
