← 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: 2007-07-04 09:04:28 UTC
  • mfrom: (2566.2.3 repository)
  • Revision ID: pqm@pqm.ubuntu.com-20070704090428-7up5xgpxdtt234u3
(robertc) status analysis documentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
1
 
# Copyright (C) 2006, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
import os
16
18
 
17
19
from bzrlib import (
18
 
    conflicts,
19
 
    tests,
20
 
    workingtree,
 
20
    conflicts
21
21
    )
 
22
from bzrlib.workingtree import WorkingTree
 
23
from bzrlib.tests.blackbox import ExternalBase
22
24
 
23
25
# FIXME: These don't really look at the output of the conflict commands, just
24
26
# the number of lines - there should be more examination.
25
27
 
26
 
class TestConflictsBase(tests.TestCaseWithTransport):
 
28
class TestConflicts(ExternalBase):
27
29
 
28
30
    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):
 
31
        super(ExternalBase, self).setUp()
 
32
        try:
 
33
            os.mkdir('a')
 
34
        except:
 
35
            raise os.getcwd()
 
36
        os.chdir('a')
 
37
        self.run_bzr('init')
 
38
        file('myfile', 'wb').write('contentsa\n')
 
39
        file('my_other_file', 'wb').write('contentsa\n')
 
40
        os.mkdir('mydir')
 
41
        self.run_bzr('add')
 
42
        self.run_bzr('commit -m new')
 
43
        os.chdir('..')
 
44
        self.run_bzr('branch a b')
 
45
        os.chdir('b')
 
46
        file('myfile', 'wb').write('contentsb\n')
 
47
        file('my_other_file', 'wb').write('contentsb\n')
 
48
        self.run_bzr('mv mydir mydir2')
 
49
        self.run_bzr('commit -m change')
 
50
        os.chdir('../a')
 
51
        file('myfile', 'wb').write('contentsa2\n')
 
52
        file('my_other_file', 'wb').write('contentsa2\n')
 
53
        self.run_bzr('mv mydir mydir3')
 
54
        self.run_bzr('commit -m change')
 
55
        self.run_bzr('merge ../b', retcode=1)
64
56
 
65
57
    def test_conflicts(self):
66
 
        out, err = self.run_bzr('conflicts')
67
 
        self.assertEqual(3, len(out.splitlines()))
 
58
        conflicts, errs = self.run_bzr(['conflicts'])
 
59
        self.assertEqual(3, len(conflicts.splitlines()))
68
60
 
69
61
    def test_conflicts_text(self):
70
 
        out, err = self.run_bzr('conflicts --text')
71
 
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
72
 
 
73
 
 
74
 
class TestResolve(TestConflictsBase):
 
62
        conflicts = self.run_bzr('conflicts', '--text')[0].splitlines()
 
63
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
75
64
 
76
65
    def test_resolve(self):
77
66
        self.run_bzr('resolve myfile')
78
 
        out, err = self.run_bzr('conflicts')
79
 
        self.assertEqual(2, len(out.splitlines()))
 
67
        conflicts, errs = self.run_bzr(['conflicts'])
 
68
        self.assertEqual(2, len(conflicts.splitlines()))
80
69
        self.run_bzr('resolve my_other_file')
81
70
        self.run_bzr('resolve mydir2')
82
 
        out, err = self.run_bzr('conflicts')
83
 
        self.assertEqual(0, len(out.splitlines()))
 
71
        conflicts, errs = self.run_bzr(['conflicts'])
 
72
        self.assertEqual(len(conflicts.splitlines()), 0)
84
73
 
85
74
    def test_resolve_all(self):
86
75
        self.run_bzr('resolve --all')
87
 
        out, err = self.run_bzr('conflicts')
88
 
        self.assertEqual(0, len(out.splitlines()))
 
76
        conflicts, errs = self.run_bzr(['conflicts'])
 
77
        self.assertEqual(len(conflicts.splitlines()), 0)
89
78
 
90
79
    def test_resolve_in_subdir(self):
91
80
        """resolve when run from subdirectory should handle relative paths"""
92
 
        self.build_tree(["a/subdir/"])
93
 
        self.run_bzr("resolve ../myfile", working_dir='a/subdir')
94
 
        self.run_bzr("resolve ../a/myfile", working_dir='b')
95
 
        wt = workingtree.WorkingTree.open_containing('b')[0]
96
 
        conflicts = wt.conflicts()
97
 
        self.assertEqual(True, conflicts.is_empty(),
98
 
                         "tree still contains conflicts: %r" % conflicts)
 
81
        orig_dir = os.getcwdu()
 
82
        try:
 
83
            os.mkdir("subdir")
 
84
            os.chdir("subdir")
 
85
            self.run_bzr("resolve ../myfile")
 
86
            os.chdir("../../b")
 
87
            self.run_bzr("resolve ../a/myfile")
 
88
            wt = WorkingTree.open_containing('.')[0]
 
89
            conflicts = wt.conflicts()
 
90
            if not conflicts.is_empty():
 
91
                self.fail("tree still contains conflicts: %r" % conflicts)
 
92
        finally:
 
93
            os.chdir(orig_dir)
99
94
 
100
95
    def test_auto_resolve(self):
101
96
        """Text conflicts can be resolved automatically"""
106
101
        self.assertEqual(tree.kind('file_id'), 'file')
107
102
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
108
103
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
109
 
        note = self.run_bzr('resolve', retcode=1, working_dir='tree')[1]
 
104
        os.chdir('tree')
 
105
        note = self.run_bzr('resolve', retcode=1)[1]
110
106
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
111
107
        self.assertContainsRe(note,
112
108
            'Remaining conflicts:\nText conflict in file')
113
 
        self.build_tree_contents([('tree/file', 'a\n')])
114
 
        note = self.run_bzr('resolve', working_dir='tree')[1]
 
109
        self.build_tree_contents([('file', 'a\n')])
 
110
        note = self.run_bzr('resolve')[1]
115
111
        self.assertContainsRe(note, 'All conflicts resolved.')