← 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: John Arbash Meinel
  • Date: 2006-10-16 01:25:46 UTC
  • mfrom: (2071 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061016012546-d01a0740671b4d73
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import (
20
 
    conflicts
21
 
    )
22
19
from bzrlib.workingtree import WorkingTree
23
20
from bzrlib.tests.blackbox import ExternalBase
24
21
 
26
23
# the number of lines - there should be more examination.
27
24
 
28
25
class TestConflicts(ExternalBase):
29
 
 
30
26
    def setUp(self):
31
27
        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'),
36
 
            ('a/mydir/',),
37
 
            ])
38
 
        a_tree.add('myfile')
39
 
        a_tree.add('my_other_file')
40
 
        a_tree.add('mydir')
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'),
46
 
            ])
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'),
52
 
            ])
53
 
        a_tree.rename_one('mydir', 'mydir3')
54
 
        a_tree.commit(message='change')
55
 
        a_tree.merge_from_branch(b_tree.branch)
 
28
        try:
 
29
            os.mkdir('a')
 
30
        except:
 
31
            raise os.getcwd()
56
32
        os.chdir('a')
 
33
        self.runbzr('init')
 
34
        file('myfile', 'wb').write('contentsa\n')
 
35
        file('my_other_file', 'wb').write('contentsa\n')
 
36
        self.runbzr('add')
 
37
        self.runbzr('commit -m new')
 
38
        os.chdir('..')
 
39
        self.runbzr('branch a b')
 
40
        os.chdir('b')
 
41
        file('myfile', 'wb').write('contentsb\n')
 
42
        file('my_other_file', 'wb').write('contentsb\n')
 
43
        self.runbzr('commit -m change')
 
44
        os.chdir('../a')
 
45
        file('myfile', 'wb').write('contentsa2\n')
 
46
        file('my_other_file', 'wb').write('contentsa2\n')
 
47
        self.runbzr('commit -m change')
 
48
        self.runbzr('merge ../b', retcode=1)
57
49
 
58
50
    def test_conflicts(self):
59
 
        conflicts, errs = self.run_bzr('conflicts')
60
 
        self.assertEqual(3, len(conflicts.splitlines()))
61
 
 
62
 
    def test_conflicts_text(self):
63
 
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
64
 
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
 
51
        conflicts = self.runbzr('conflicts', backtick=True)
 
52
        self.assertEqual(len(conflicts.splitlines()), 2)
65
53
 
66
54
    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')
 
55
        self.runbzr('resolve', retcode=3)
 
56
        self.runbzr('resolve myfile')
 
57
        conflicts = self.runbzr('conflicts', backtick=True)
 
58
        self.assertEqual(len(conflicts.splitlines()), 1)
 
59
        self.runbzr('resolve my_other_file')
 
60
        conflicts = self.runbzr('conflicts', backtick=True)
73
61
        self.assertEqual(len(conflicts.splitlines()), 0)
74
62
 
75
63
    def test_resolve_all(self):
76
 
        self.run_bzr('resolve --all')
77
 
        conflicts, errs = self.run_bzr('conflicts')
 
64
        self.runbzr('resolve --all')
 
65
        conflicts = self.runbzr('conflicts', backtick=True)
78
66
        self.assertEqual(len(conflicts.splitlines()), 0)
79
67
 
80
68
    def test_resolve_in_subdir(self):
83
71
        try:
84
72
            os.mkdir("subdir")
85
73
            os.chdir("subdir")
86
 
            self.run_bzr("resolve ../myfile")
 
74
            self.runbzr("resolve ../myfile")
87
75
            os.chdir("../../b")
88
 
            self.run_bzr("resolve ../a/myfile")
 
76
            self.runbzr("resolve ../a/myfile")
89
77
            wt = WorkingTree.open_containing('.')[0]
90
78
            conflicts = wt.conflicts()
91
79
            if not conflicts.is_empty():
92
80
                self.fail("tree still contains conflicts: %r" % conflicts)
93
81
        finally:
94
82
            os.chdir(orig_dir)
95
 
 
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]))
105
 
        os.chdir('tree')
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.')