/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Aaron Bentley
  • Date: 2007-07-23 14:27:42 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2649.
  • Revision ID: abentley@panoramicfeedback.com-20070723142742-98ye8w4au9bjg5q0
https://launchpad.net/bugs/127606
Status honours selected paths for conflicts (#127606)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
 
1
# Copyright (C) 2005 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
import os
 
19
 
 
20
from bzrlib import bzrdir
 
21
from bzrlib.tests import TestCaseWithTransport, TestCase
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.conflicts import (MissingParent, ContentsConflict, TextConflict,
 
24
        PathConflict, DuplicateID, DuplicateEntry, ParentLoop, UnversionedParent,
 
25
        ConflictList, 
 
26
        restore)
 
27
from bzrlib.errors import NotConflicted
 
28
 
 
29
 
 
30
# TODO: Test commit with some added, and added-but-missing files
 
31
# RBC 20060124 is that not tested in test_commit.py ?
 
32
 
 
33
# The order of 'path' here is important - do not let it
 
34
# be a sorted list.
 
35
# u'\xe5' == a with circle
 
36
# '\xc3\xae' == u'\xee' == i with hat
 
37
# So these are u'pathg' and 'idg' only with a circle and a hat. (shappo?)
 
38
example_conflicts = ConflictList([ 
 
39
    MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
 
40
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'), 
 
41
    TextConflict(u'p\xe5tha'),
 
42
    PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
 
43
    DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2',
 
44
                '\xc3\xaedc', '\xc3\xaedc'),
 
45
    DuplicateEntry('Moved existing file to',  u'p\xe5thdd.moved', u'p\xe5thd',
 
46
                   '\xc3\xaedd', None),
 
47
    ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
 
48
               None, '\xc3\xaed2e'),
 
49
    UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'),
 
50
])
 
51
 
 
52
 
 
53
class TestConflicts(TestCaseWithTransport):
 
54
 
 
55
    def test_conflicts(self):
 
56
        """Conflicts are detected properly"""
 
57
        tree = self.make_branch_and_tree('.',
 
58
            format=bzrdir.BzrDirFormat6())
 
59
        b = tree.branch
 
60
        file('hello', 'w').write('hello world4')
 
61
        file('hello.THIS', 'w').write('hello world2')
 
62
        file('hello.BASE', 'w').write('hello world1')
 
63
        file('hello.OTHER', 'w').write('hello world3')
 
64
        file('hello.sploo.BASE', 'w').write('yellow world')
 
65
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
66
        tree.lock_read()
 
67
        self.assertEqual(len(list(tree.list_files())), 6)
 
68
        tree.unlock()
 
69
        conflicts = tree.conflicts()
 
70
        self.assertEqual(len(conflicts), 2)
 
71
        self.assert_('hello' in conflicts[0].path)
 
72
        self.assert_('hello.sploo' in conflicts[1].path)
 
73
        restore('hello')
 
74
        restore('hello.sploo')
 
75
        self.assertEqual(len(tree.conflicts()), 0)
 
76
        self.assertFileEqual('hello world2', 'hello')
 
77
        assert not os.path.lexists('hello.sploo')
 
78
        self.assertRaises(NotConflicted, restore, 'hello')
 
79
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
 
80
 
 
81
    def test_resolve_conflict_dir(self):
 
82
        tree = self.make_branch_and_tree('.')
 
83
        b = tree.branch
 
84
        file('hello', 'w').write('hello world4')
 
85
        tree.add('hello', 'q')
 
86
        file('hello.THIS', 'w').write('hello world2')
 
87
        file('hello.BASE', 'w').write('hello world1')
 
88
        os.mkdir('hello.OTHER')
 
89
        l = ConflictList([TextConflict('hello')])
 
90
        l.remove_files(tree)
 
91
 
 
92
    def test_select_conflicts(self):
 
93
        tree = self.make_branch_and_tree('.')
 
94
        tree_conflicts = ConflictList([ContentsConflict('foo'),
 
95
                                       ContentsConflict('bar')])
 
96
        self.assertEqual((ConflictList([ContentsConflict('bar')]),
 
97
                          ConflictList([ContentsConflict('foo')])),
 
98
                         tree_conflicts.select_conflicts(tree, ['foo']))
 
99
        self.assertEqual((ConflictList(), tree_conflicts),
 
100
                         tree_conflicts.select_conflicts(tree, [''],
 
101
                         ignore_misses=True, recurse=True))
 
102
        tree_conflicts = ConflictList([ContentsConflict('foo/baz'),
 
103
                                       ContentsConflict('bar')])
 
104
        self.assertEqual((ConflictList([ContentsConflict('bar')]),
 
105
                          ConflictList([ContentsConflict('foo/baz')])),
 
106
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
107
                                                         recurse=True,
 
108
                                                         ignore_misses=True))
 
109
        tree_conflicts = ConflictList([PathConflict('qux', 'foo/baz')])
 
110
        self.assertEqual((ConflictList(), tree_conflicts),
 
111
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
112
                                                         recurse=True,
 
113
                                                         ignore_misses=True))
 
114
 
 
115
 
 
116
class TestConflictStanzas(TestCase):
 
117
 
 
118
    def test_stanza_roundtrip(self):
 
119
        # write and read our example stanza.
 
120
        stanza_iter = example_conflicts.to_stanzas()
 
121
        processed = ConflictList.from_stanzas(stanza_iter)
 
122
        for o, p in zip(processed, example_conflicts):
 
123
            self.assertEqual(o, p)
 
124
 
 
125
            self.assertIsInstance(o.path, unicode)
 
126
 
 
127
            if o.file_id is not None:
 
128
                self.assertIsInstance(o.file_id, str)
 
129
 
 
130
            conflict_path = getattr(o, 'conflict_path', None)
 
131
            if conflict_path is not None:
 
132
                self.assertIsInstance(conflict_path, unicode)
 
133
 
 
134
            conflict_file_id = getattr(o, 'conflict_file_id', None)
 
135
            if conflict_file_id is not None:
 
136
                self.assertIsInstance(conflict_file_id, str)
 
137
 
 
138
    def test_stanzification(self):
 
139
        for stanza in example_conflicts.to_stanzas():
 
140
            if 'file_id' in stanza:
 
141
                # In Stanza form, the file_id has to be unicode.
 
142
                self.assertStartsWith(stanza['file_id'], u'\xeed')
 
143
            self.assertStartsWith(stanza['path'], u'p\xe5th')
 
144
            if 'conflict_path' in stanza:
 
145
                self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
 
146
            if 'conflict_file_id' in stanza:
 
147
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')