← 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: Alexander Belchenko
  • Date: 2007-01-04 23:36:44 UTC
  • mfrom: (2224 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2225.
  • Revision ID: bialix@ukr.net-20070104233644-7znkxoj9b0y7ev28
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
28
        try:
34
30
        except:
35
31
            raise os.getcwd()
36
32
        os.chdir('a')
37
 
        self.run_bzr('init')
 
33
        self.runbzr('init')
38
34
        file('myfile', 'wb').write('contentsa\n')
39
35
        file('my_other_file', 'wb').write('contentsa\n')
40
36
        os.mkdir('mydir')
41
 
        self.run_bzr('add')
42
 
        self.run_bzr('commit -m new')
 
37
        self.runbzr('add')
 
38
        self.runbzr('commit -m new')
43
39
        os.chdir('..')
44
 
        self.run_bzr('branch a b')
 
40
        self.runbzr('branch a b')
45
41
        os.chdir('b')
46
42
        file('myfile', 'wb').write('contentsb\n')
47
43
        file('my_other_file', 'wb').write('contentsb\n')
48
 
        self.run_bzr('mv mydir mydir2')
49
 
        self.run_bzr('commit -m change')
 
44
        self.runbzr('mv mydir mydir2')
 
45
        self.runbzr('commit -m change')
50
46
        os.chdir('../a')
51
47
        file('myfile', 'wb').write('contentsa2\n')
52
48
        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)
 
49
        self.runbzr('mv mydir mydir3')
 
50
        self.runbzr('commit -m change')
 
51
        self.runbzr('merge ../b', retcode=1)
56
52
 
57
53
    def test_conflicts(self):
58
 
        conflicts, errs = self.run_bzr('conflicts')
 
54
        conflicts = self.runbzr('conflicts', backtick=True)
59
55
        self.assertEqual(3, len(conflicts.splitlines()))
60
56
 
61
57
    def test_conflicts_text(self):
62
 
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
 
58
        conflicts = self.run_bzr('conflicts', '--text')[0].splitlines()
63
59
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
64
60
 
65
61
    def test_resolve(self):
66
 
        self.run_bzr('resolve myfile')
67
 
        conflicts, errs = self.run_bzr('conflicts')
 
62
        self.runbzr('resolve', retcode=3)
 
63
        self.runbzr('resolve myfile')
 
64
        conflicts = self.runbzr('conflicts', backtick=True)
68
65
        self.assertEqual(2, len(conflicts.splitlines()))
69
 
        self.run_bzr('resolve my_other_file')
70
 
        self.run_bzr('resolve mydir2')
71
 
        conflicts, errs = self.run_bzr('conflicts')
 
66
        self.runbzr('resolve my_other_file')
 
67
        self.runbzr('resolve mydir2')
 
68
        conflicts = self.runbzr('conflicts', backtick=True)
72
69
        self.assertEqual(len(conflicts.splitlines()), 0)
73
70
 
74
71
    def test_resolve_all(self):
75
 
        self.run_bzr('resolve --all')
76
 
        conflicts, errs = self.run_bzr('conflicts')
 
72
        self.runbzr('resolve --all')
 
73
        conflicts = self.runbzr('conflicts', backtick=True)
77
74
        self.assertEqual(len(conflicts.splitlines()), 0)
78
75
 
79
76
    def test_resolve_in_subdir(self):
82
79
        try:
83
80
            os.mkdir("subdir")
84
81
            os.chdir("subdir")
85
 
            self.run_bzr("resolve ../myfile")
 
82
            self.runbzr("resolve ../myfile")
86
83
            os.chdir("../../b")
87
 
            self.run_bzr("resolve ../a/myfile")
 
84
            self.runbzr("resolve ../a/myfile")
88
85
            wt = WorkingTree.open_containing('.')[0]
89
86
            conflicts = wt.conflicts()
90
87
            if not conflicts.is_empty():
91
88
                self.fail("tree still contains conflicts: %r" % conflicts)
92
89
        finally:
93
90
            os.chdir(orig_dir)
94
 
 
95
 
    def test_auto_resolve(self):
96
 
        """Text conflicts can be resolved automatically"""
97
 
        tree = self.make_branch_and_tree('tree')
98
 
        self.build_tree_contents([('tree/file',
99
 
            '<<<<<<<\na\n=======\n>>>>>>>\n')])
100
 
        tree.add('file', 'file_id')
101
 
        self.assertEqual(tree.kind('file_id'), 'file')
102
 
        file_conflict = conflicts.TextConflict('file', file_id='file_id')
103
 
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
104
 
        os.chdir('tree')
105
 
        note = self.run_bzr('resolve', retcode=1)[1]
106
 
        self.assertContainsRe(note, '0 conflict\\(s\\) auto-resolved.')
107
 
        self.assertContainsRe(note,
108
 
            'Remaining conflicts:\nText conflict in file')
109
 
        self.build_tree_contents([('file', 'a\n')])
110
 
        note = self.run_bzr('resolve')[1]
111
 
        self.assertContainsRe(note, 'All conflicts resolved.')