← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

Merged bzr.dev and updated NEWS with a better description of changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005 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
32
32
 
33
33
# The order of 'path' here is important - do not let it
34
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?)
35
38
example_conflicts = ConflictList([ 
36
 
    MissingParent('Not deleting', 'pathg', 'idg'),
37
 
    ContentsConflict('patha', 'ida'), 
38
 
    TextConflict('patha'),
39
 
    PathConflict('pathb', 'pathc', 'idb'),
40
 
    DuplicateID('Unversioned existing file', 'pathc', 'pathc2', 'idc', 'idc'),
41
 
    DuplicateEntry('Moved existing file to',  'pathdd.moved', 'pathd', 'idd', 
42
 
                   None),
43
 
    ParentLoop('Cancelled move', 'pathe', 'path2e', None, 'id2e'),
44
 
    UnversionedParent('Versioned directory', 'pathf', 'idf'),
 
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'),
45
50
])
46
51
 
47
52
 
58
63
        file('hello.OTHER', 'w').write('hello world3')
59
64
        file('hello.sploo.BASE', 'w').write('yellow world')
60
65
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
66
        tree.lock_read()
61
67
        self.assertEqual(len(list(tree.list_files())), 6)
 
68
        tree.unlock()
62
69
        conflicts = tree.conflicts()
63
70
        self.assertEqual(len(conflicts), 2)
64
71
        self.assert_('hello' in conflicts[0].path)
82
89
        l = ConflictList([TextConflict('hello')])
83
90
        l.remove_files(tree)
84
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
        self.assertEqual((tree_conflicts, ConflictList()),
 
115
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
116
                                                         ignore_misses=True))
 
117
 
85
118
 
86
119
class TestConflictStanzas(TestCase):
87
120
 
89
122
        # write and read our example stanza.
90
123
        stanza_iter = example_conflicts.to_stanzas()
91
124
        processed = ConflictList.from_stanzas(stanza_iter)
92
 
        for o,p in zip(processed, example_conflicts):
 
125
        for o, p in zip(processed, example_conflicts):
93
126
            self.assertEqual(o, p)
94
127
 
 
128
            self.assertIsInstance(o.path, unicode)
 
129
 
 
130
            if o.file_id is not None:
 
131
                self.assertIsInstance(o.file_id, str)
 
132
 
 
133
            conflict_path = getattr(o, 'conflict_path', None)
 
134
            if conflict_path is not None:
 
135
                self.assertIsInstance(conflict_path, unicode)
 
136
 
 
137
            conflict_file_id = getattr(o, 'conflict_file_id', None)
 
138
            if conflict_file_id is not None:
 
139
                self.assertIsInstance(conflict_file_id, str)
 
140
 
95
141
    def test_stanzification(self):
96
142
        for stanza in example_conflicts.to_stanzas():
97
 
            try:
98
 
                self.assertStartsWith(stanza['file_id'], 'id')
99
 
            except KeyError:
100
 
                pass
101
 
            self.assertStartsWith(stanza['path'], 'path')
102
 
            try:
103
 
                self.assertStartsWith(stanza['conflict_file_id'], 'id')
104
 
                self.assertStartsWith(stanza['conflict_file_path'], 'path')
105
 
            except KeyError:
106
 
                pass
 
143
            if 'file_id' in stanza:
 
144
                # In Stanza form, the file_id has to be unicode.
 
145
                self.assertStartsWith(stanza['file_id'], u'\xeed')
 
146
            self.assertStartsWith(stanza['path'], u'p\xe5th')
 
147
            if 'conflict_path' in stanza:
 
148
                self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
 
149
            if 'conflict_file_id' in stanza:
 
150
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')