← 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 Ferlito
  • Date: 2009-09-02 04:31:45 UTC
  • mto: (4665.7.1 serve-init)
  • mto: This revision was merged to the branch mainline in revision 4913.
  • Revision ID: johnf@inodes.org-20090902043145-gxdsfw03ilcwbyn5
Add a debian init script for bzr --serve

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
 
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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
import os
 
18
 
17
19
from bzrlib import (
18
 
    conflicts,
19
 
    tests,
20
 
    workingtree,
 
20
    conflicts
21
21
    )
22
 
from bzrlib.tests import script
23
 
 
24
 
def make_tree_with_conflicts(test, this_path='this', other_path='other'):
25
 
    this_tree = test.make_branch_and_tree(this_path)
26
 
    test.build_tree_contents([
27
 
        ('%s/myfile' % (this_path,), 'this content\n'),
28
 
        ('%s/my_other_file' % (this_path,), 'this content\n'),
29
 
        ('%s/mydir/' % (this_path,),),
30
 
        ])
31
 
    this_tree.add('myfile')
32
 
    this_tree.add('my_other_file')
33
 
    this_tree.add('mydir')
34
 
    this_tree.commit(message="new")
35
 
    other_tree = this_tree.bzrdir.sprout(other_path).open_workingtree()
36
 
    test.build_tree_contents([
37
 
        ('%s/myfile' % (other_path,), 'contentsb\n'),
38
 
        ('%s/my_other_file' % (other_path,), 'contentsb\n'),
39
 
        ])
40
 
    other_tree.rename_one('mydir', 'mydir2')
41
 
    other_tree.commit(message="change")
42
 
    test.build_tree_contents([
43
 
        ('%s/myfile' % (this_path,), 'contentsa2\n'),
44
 
        ('%s/my_other_file' % (this_path,), 'contentsa2\n'),
45
 
        ])
46
 
    this_tree.rename_one('mydir', 'mydir3')
47
 
    this_tree.commit(message='change')
48
 
    this_tree.merge_from_branch(other_tree.branch)
49
 
    return this_tree, other_tree
50
 
 
51
 
 
52
 
class TestConflicts(script.TestCaseWithTransportAndScript):
 
22
from bzrlib.workingtree import WorkingTree
 
23
from bzrlib.tests.blackbox import ExternalBase
 
24
 
 
25
# FIXME: These don't really look at the output of the conflict commands, just
 
26
# the number of lines - there should be more examination.
 
27
 
 
28
class TestConflicts(ExternalBase):
53
29
 
54
30
    def setUp(self):
55
 
        super(TestConflicts, self).setUp()
56
 
        make_tree_with_conflicts(self, 'branch', 'other')
 
31
        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)
 
56
        os.chdir('a')
57
57
 
58
58
    def test_conflicts(self):
59
 
        self.run_script("""\
60
 
$ cd branch
61
 
$ bzr conflicts
62
 
Text conflict in my_other_file
63
 
Path conflict: mydir3 / mydir2
64
 
Text conflict in myfile
65
 
""")
 
59
        conflicts, errs = self.run_bzr('conflicts')
 
60
        self.assertEqual(3, len(conflicts.splitlines()))
66
61
 
67
62
    def test_conflicts_text(self):
68
 
        self.run_script("""\
69
 
$ cd branch
70
 
$ bzr conflicts --text
71
 
my_other_file
72
 
myfile
73
 
""")
74
 
 
75
 
    def test_conflicts_directory(self):
76
 
        self.run_script("""\
77
 
$ bzr conflicts  -d branch
78
 
Text conflict in my_other_file
79
 
Path conflict: mydir3 / mydir2
80
 
Text conflict in myfile
81
 
""")
 
63
        conflicts = self.run_bzr('conflicts --text')[0].splitlines()
 
64
        self.assertEqual(['my_other_file', 'myfile'], conflicts)
 
65
 
 
66
    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')
 
73
        self.assertEqual(len(conflicts.splitlines()), 0)
 
74
 
 
75
    def test_resolve_all(self):
 
76
        self.run_bzr('resolve --all')
 
77
        conflicts, errs = self.run_bzr('conflicts')
 
78
        self.assertEqual(len(conflicts.splitlines()), 0)
 
79
 
 
80
    def test_resolve_in_subdir(self):
 
81
        """resolve when run from subdirectory should handle relative paths"""
 
82
        orig_dir = os.getcwdu()
 
83
        try:
 
84
            os.mkdir("subdir")
 
85
            os.chdir("subdir")
 
86
            self.run_bzr("resolve ../myfile")
 
87
            os.chdir("../../b")
 
88
            self.run_bzr("resolve ../a/myfile")
 
89
            wt = WorkingTree.open_containing('.')[0]
 
90
            conflicts = wt.conflicts()
 
91
            if not conflicts.is_empty():
 
92
                self.fail("tree still contains conflicts: %r" % conflicts)
 
93
        finally:
 
94
            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.')