← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jonathan Riddell
  • Date: 2011-05-16 11:27:37 UTC
  • mto: This revision was merged to the branch mainline in revision 5869.
  • Revision ID: jriddell@canonical.com-20110516112737-gep642p24rtzp3jt
user guide licence

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 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
19
19
    tests,
20
20
    workingtree,
21
21
    )
22
 
from bzrlib.tests import script, features
23
 
 
24
 
 
25
 
def make_tree_with_conflicts(test, this_path='this', other_path='other',
26
 
        prefix='my'):
 
22
from bzrlib.tests import script
 
23
 
 
24
def make_tree_with_conflicts(test, this_path='this', other_path='other'):
27
25
    this_tree = test.make_branch_and_tree(this_path)
28
26
    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),),
 
27
        ('%s/myfile' % (this_path,), 'this content\n'),
 
28
        ('%s/my_other_file' % (this_path,), 'this content\n'),
 
29
        ('%s/mydir/' % (this_path,),),
32
30
        ])
33
 
    this_tree.add(prefix+'file')
34
 
    this_tree.add(prefix+'_other_file')
35
 
    this_tree.add(prefix+'dir')
 
31
    this_tree.add('myfile')
 
32
    this_tree.add('my_other_file')
 
33
    this_tree.add('mydir')
36
34
    this_tree.commit(message="new")
37
35
    other_tree = this_tree.bzrdir.sprout(other_path).open_workingtree()
38
36
    test.build_tree_contents([
39
 
        ('%s/%sfile' % (other_path, prefix), 'contentsb\n'),
40
 
        ('%s/%s_other_file' % (other_path, prefix), 'contentsb\n'),
 
37
        ('%s/myfile' % (other_path,), 'contentsb\n'),
 
38
        ('%s/my_other_file' % (other_path,), 'contentsb\n'),
41
39
        ])
42
 
    other_tree.rename_one(prefix+'dir', prefix+'dir2')
 
40
    other_tree.rename_one('mydir', 'mydir2')
43
41
    other_tree.commit(message="change")
44
42
    test.build_tree_contents([
45
 
        ('%s/%sfile' % (this_path, prefix), 'contentsa2\n'),
46
 
        ('%s/%s_other_file' % (this_path, prefix), 'contentsa2\n'),
 
43
        ('%s/myfile' % (this_path,), 'contentsa2\n'),
 
44
        ('%s/my_other_file' % (this_path,), 'contentsa2\n'),
47
45
        ])
48
 
    this_tree.rename_one(prefix+'dir', prefix+'dir3')
 
46
    this_tree.rename_one('mydir', 'mydir3')
49
47
    this_tree.commit(message='change')
50
48
    this_tree.merge_from_branch(other_tree.branch)
51
49
    return this_tree, other_tree
81
79
Path conflict: mydir3 / mydir2
82
80
Text conflict in myfile
83
81
""")
84
 
 
85
 
 
86
 
class TestUnicodePaths(tests.TestCaseWithTransport):
87
 
    """Unicode characters in conflicts should be displayed properly"""
88
 
 
89
 
    _test_needs_features = [features.UnicodeFilenameFeature]
90
 
    encoding = "UTF-8"
91
 
 
92
 
    def _as_output(self, text):
93
 
        return text
94
 
 
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, "")
105
 
 
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),
112
 
            u"\xA7_other_file\n"
113
 
            u"\xA7file\n")
114
 
        self.assertEqual(err, "")
115
 
 
116
 
 
117
 
class TestUnicodePathsOnAsciiTerminal(TestUnicodePaths):
118
 
    """Undisplayable unicode characters in conflicts should be escaped"""
119
 
 
120
 
    encoding = "ascii"
121
 
 
122
 
    def setUp(self):
123
 
        self.skip("Need to decide if replacing is the desired behaviour")
124
 
 
125
 
    def _as_output(self, text):
126
 
        return text.encode(self.encoding, "replace")