← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-27 20:08:36 UTC
  • mfrom: (5447.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20100927200836-asjq41qt5fol30df
(vila) Merge lp:bzr/2.2 into trunk including fixes for #644855,
        #646133, #632387 (Vincent Ladeuil)

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 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 bzrlib import (
 
18
    conflicts,
 
19
    tests,
 
20
    workingtree,
 
21
    )
 
22
 
 
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.
 
25
 
 
26
class TestConflictsBase(tests.TestCaseWithTransport):
 
27
 
 
28
    def setUp(self):
 
29
        super(TestConflictsBase, self).setUp()
 
30
        self.make_tree_with_conflicts()
 
31
 
 
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'),
 
37
            ('a/mydir/',),
 
38
            ])
 
39
        a_tree.add('myfile')
 
40
        a_tree.add('my_other_file')
 
41
        a_tree.add('mydir')
 
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'),
 
47
            ])
 
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'),
 
53
            ])
 
54
        a_tree.rename_one('mydir', 'mydir3')
 
55
        a_tree.commit(message='change')
 
56
        a_tree.merge_from_branch(b_tree.branch)
 
57
 
 
58
    def run_bzr(self, cmd, working_dir='a', **kwargs):
 
59
        return super(TestConflictsBase, self).run_bzr(
 
60
            cmd, working_dir=working_dir, **kwargs)
 
61
 
 
62
 
 
63
class TestConflicts(TestConflictsBase):
 
64
 
 
65
    def test_conflicts(self):
 
66
        out, err = self.run_bzr('conflicts')
 
67
        self.assertEqual(3, len(out.splitlines()))
 
68
 
 
69
    def test_conflicts_text(self):
 
70
        out, err = self.run_bzr('conflicts --text')
 
71
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
 
72
 
 
73
    def test_conflicts_directory(self):
 
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)
 
78
 
 
79
 
 
80
class TestResolve(TestConflictsBase):
 
81
 
 
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()))
 
90
 
 
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()))
 
95
 
 
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)
 
105
 
 
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.')
 
122
 
 
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()))