← 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: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

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