/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2020-04-05 19:11:34 UTC
  • mto: (7490.7.16 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200405191134-0aebh8ikiwygxma5
Populate the .gitignore file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_conflicts.py
 
1
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
2
#
 
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.
 
7
#
 
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.
 
12
#
 
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
from breezy import (
 
18
    conflicts,
 
19
    tests,
 
20
    workingtree,
 
21
    )
 
22
from breezy.sixish import PY3
 
23
from breezy.tests import script, features
 
24
 
 
25
 
 
26
def make_tree_with_conflicts(test, this_path='this', other_path='other',
 
27
                             prefix='my'):
 
28
    this_tree = test.make_branch_and_tree(this_path)
 
29
    test.build_tree_contents([
 
30
        ('%s/%sfile' % (this_path, prefix), b'this content\n'),
 
31
        ('%s/%s_other_file' % (this_path, prefix), b'this content\n'),
 
32
        ('%s/%sdir/' % (this_path, prefix),),
 
33
        ])
 
34
    this_tree.add(prefix + 'file')
 
35
    this_tree.add(prefix + '_other_file')
 
36
    this_tree.add(prefix + 'dir')
 
37
    this_tree.commit(message="new")
 
38
    other_tree = this_tree.controldir.sprout(other_path).open_workingtree()
 
39
    test.build_tree_contents([
 
40
        ('%s/%sfile' % (other_path, prefix), b'contentsb\n'),
 
41
        ('%s/%s_other_file' % (other_path, prefix), b'contentsb\n'),
 
42
        ])
 
43
    other_tree.rename_one(prefix + 'dir', prefix + 'dir2')
 
44
    other_tree.commit(message="change")
 
45
    test.build_tree_contents([
 
46
        ('%s/%sfile' % (this_path, prefix), b'contentsa2\n'),
 
47
        ('%s/%s_other_file' % (this_path, prefix), b'contentsa2\n'),
 
48
        ])
 
49
    this_tree.rename_one(prefix + 'dir', prefix + 'dir3')
 
50
    this_tree.commit(message='change')
 
51
    this_tree.merge_from_branch(other_tree.branch)
 
52
    return this_tree, other_tree
 
53
 
 
54
 
 
55
class TestConflicts(script.TestCaseWithTransportAndScript):
 
56
 
 
57
    def setUp(self):
 
58
        super(TestConflicts, self).setUp()
 
59
        make_tree_with_conflicts(self, 'branch', 'other')
 
60
 
 
61
    def test_conflicts(self):
 
62
        self.run_script("""\
 
63
$ cd branch
 
64
$ brz conflicts
 
65
Text conflict in my_other_file
 
66
Path conflict: mydir3 / mydir2
 
67
Text conflict in myfile
 
68
""")
 
69
 
 
70
    def test_conflicts_text(self):
 
71
        self.run_script("""\
 
72
$ cd branch
 
73
$ brz conflicts --text
 
74
my_other_file
 
75
myfile
 
76
""")
 
77
 
 
78
    def test_conflicts_directory(self):
 
79
        self.run_script("""\
 
80
$ brz conflicts  -d branch
 
81
Text conflict in my_other_file
 
82
Path conflict: mydir3 / mydir2
 
83
Text conflict in myfile
 
84
""")
 
85
 
 
86
 
 
87
class TestUnicodePaths(tests.TestCaseWithTransport):
 
88
    """Unicode characters in conflicts should be displayed properly"""
 
89
 
 
90
    _test_needs_features = [features.UnicodeFilenameFeature]
 
91
    encoding = "UTF-8"
 
92
 
 
93
    def _as_output(self, text):
 
94
        return text
 
95
 
 
96
    def test_messages(self):
 
97
        """Conflict messages involving non-ascii paths are displayed okay"""
 
98
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
 
99
        out, err = self.run_bzr(["conflicts", "-d", "branch"],
 
100
                                encoding=self.encoding)
 
101
        self.assertEqual(out if PY3 else out.decode(self.encoding),
 
102
                         u"Text conflict in \xA7_other_file\n"
 
103
                         u"Path conflict: \xA7dir3 / \xA7dir2\n"
 
104
                         u"Text conflict in \xA7file\n")
 
105
        self.assertEqual(err, "")
 
106
 
 
107
    def test_text_conflict_paths(self):
 
108
        """Text conflicts on non-ascii paths are displayed okay"""
 
109
        make_tree_with_conflicts(self, "branch", prefix=u"\xA7")
 
110
        out, err = self.run_bzr(["conflicts", "-d", "branch", "--text"],
 
111
                                encoding=self.encoding)
 
112
        self.assertEqual(out if PY3 else out.decode(self.encoding),
 
113
                         u"\xA7_other_file\n"
 
114
                         u"\xA7file\n")
 
115
        self.assertEqual(err, "")
 
116
 
 
117
 
 
118
class TestUnicodePathsOnAsciiTerminal(TestUnicodePaths):
 
119
    """Undisplayable unicode characters in conflicts should be escaped"""
 
120
 
 
121
    encoding = "ascii"
 
122
 
 
123
    def setUp(self):
 
124
        self.skipTest("Need to decide if replacing is the desired behaviour")
 
125
 
 
126
    def _as_output(self, text):
 
127
        return text.encode(self.encoding, "replace")