← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Aaron Bentley
  • Date: 2009-03-10 04:55:49 UTC
  • mto: This revision was merged to the branch mainline in revision 4112.
  • Revision ID: aaron@aaronbentley.com-20090310045549-j5jmgq190872oem7
Remove locking decorator

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
20
20
from bzrlib import bzrdir
21
21
from bzrlib.tests import TestCaseWithTransport, TestCase
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.conflicts import (MissingParent, ContentsConflict, TextConflict,
24
 
        PathConflict, DuplicateID, DuplicateEntry, ParentLoop, UnversionedParent,
25
 
        ConflictList, 
26
 
        restore)
 
23
from bzrlib.conflicts import (
 
24
    ConflictList,
 
25
    ContentsConflict,
 
26
    DuplicateID,
 
27
    DuplicateEntry,
 
28
    MissingParent,
 
29
    NonDirectoryParent,
 
30
    ParentLoop,
 
31
    PathConflict,
 
32
    TextConflict,
 
33
    UnversionedParent,
 
34
    resolve,
 
35
    restore,
 
36
    )
27
37
from bzrlib.errors import NotConflicted
28
38
 
29
39
 
32
42
 
33
43
# The order of 'path' here is important - do not let it
34
44
# be a sorted list.
35
 
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'),
 
45
# u'\xe5' == a with circle
 
46
# '\xc3\xae' == u'\xee' == i with hat
 
47
# So these are u'pathg' and 'idg' only with a circle and a hat. (shappo?)
 
48
example_conflicts = ConflictList([
 
49
    MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
 
50
    ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
 
51
    TextConflict(u'p\xe5tha'),
 
52
    PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
 
53
    DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2',
 
54
                '\xc3\xaedc', '\xc3\xaedc'),
 
55
    DuplicateEntry('Moved existing file to',  u'p\xe5thdd.moved', u'p\xe5thd',
 
56
                   '\xc3\xaedd', None),
 
57
    ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
 
58
               None, '\xc3\xaed2e'),
 
59
    UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'),
 
60
    NonDirectoryParent('Created directory', u'p\xe5thg', '\xc3\xaedg'),
45
61
])
46
62
 
47
63
 
58
74
        file('hello.OTHER', 'w').write('hello world3')
59
75
        file('hello.sploo.BASE', 'w').write('yellow world')
60
76
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
77
        tree.lock_read()
61
78
        self.assertEqual(len(list(tree.list_files())), 6)
 
79
        tree.unlock()
62
80
        conflicts = tree.conflicts()
63
81
        self.assertEqual(len(conflicts), 2)
64
82
        self.assert_('hello' in conflicts[0].path)
67
85
        restore('hello.sploo')
68
86
        self.assertEqual(len(tree.conflicts()), 0)
69
87
        self.assertFileEqual('hello world2', 'hello')
70
 
        assert not os.path.lexists('hello.sploo')
 
88
        self.assertFalse(os.path.lexists('hello.sploo'))
71
89
        self.assertRaises(NotConflicted, restore, 'hello')
72
90
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
73
91
 
82
100
        l = ConflictList([TextConflict('hello')])
83
101
        l.remove_files(tree)
84
102
 
 
103
    def test_select_conflicts(self):
 
104
        tree = self.make_branch_and_tree('.')
 
105
        tree_conflicts = ConflictList([ContentsConflict('foo'),
 
106
                                       ContentsConflict('bar')])
 
107
        self.assertEqual((ConflictList([ContentsConflict('bar')]),
 
108
                          ConflictList([ContentsConflict('foo')])),
 
109
                         tree_conflicts.select_conflicts(tree, ['foo']))
 
110
        self.assertEqual((ConflictList(), tree_conflicts),
 
111
                         tree_conflicts.select_conflicts(tree, [''],
 
112
                         ignore_misses=True, recurse=True))
 
113
        tree_conflicts = ConflictList([ContentsConflict('foo/baz'),
 
114
                                       ContentsConflict('bar')])
 
115
        self.assertEqual((ConflictList([ContentsConflict('bar')]),
 
116
                          ConflictList([ContentsConflict('foo/baz')])),
 
117
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
118
                                                         recurse=True,
 
119
                                                         ignore_misses=True))
 
120
        tree_conflicts = ConflictList([PathConflict('qux', 'foo/baz')])
 
121
        self.assertEqual((ConflictList(), tree_conflicts),
 
122
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
123
                                                         recurse=True,
 
124
                                                         ignore_misses=True))
 
125
        self.assertEqual((tree_conflicts, ConflictList()),
 
126
                         tree_conflicts.select_conflicts(tree, ['foo'],
 
127
                                                         ignore_misses=True))
 
128
 
 
129
    def test_resolve_conflicts_recursive(self):
 
130
        tree = self.make_branch_and_tree('.')
 
131
        self.build_tree(['dir/', 'dir/hello'])
 
132
        tree.add(['dir', 'dir/hello'])
 
133
        tree.set_conflicts(ConflictList([TextConflict('dir/hello')]))
 
134
        resolve(tree, ['dir'], recursive=False, ignore_misses=True)
 
135
        self.assertEqual(ConflictList([TextConflict('dir/hello')]),
 
136
                         tree.conflicts())
 
137
        resolve(tree, ['dir'], recursive=True, ignore_misses=True)
 
138
        self.assertEqual(ConflictList([]),
 
139
                         tree.conflicts())
 
140
 
85
141
 
86
142
class TestConflictStanzas(TestCase):
87
143
 
89
145
        # write and read our example stanza.
90
146
        stanza_iter = example_conflicts.to_stanzas()
91
147
        processed = ConflictList.from_stanzas(stanza_iter)
92
 
        for o,p in zip(processed, example_conflicts):
 
148
        for o, p in zip(processed, example_conflicts):
93
149
            self.assertEqual(o, p)
94
150
 
 
151
            self.assertIsInstance(o.path, unicode)
 
152
 
 
153
            if o.file_id is not None:
 
154
                self.assertIsInstance(o.file_id, str)
 
155
 
 
156
            conflict_path = getattr(o, 'conflict_path', None)
 
157
            if conflict_path is not None:
 
158
                self.assertIsInstance(conflict_path, unicode)
 
159
 
 
160
            conflict_file_id = getattr(o, 'conflict_file_id', None)
 
161
            if conflict_file_id is not None:
 
162
                self.assertIsInstance(conflict_file_id, str)
 
163
 
95
164
    def test_stanzification(self):
96
165
        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
 
166
            if 'file_id' in stanza:
 
167
                # In Stanza form, the file_id has to be unicode.
 
168
                self.assertStartsWith(stanza['file_id'], u'\xeed')
 
169
            self.assertStartsWith(stanza['path'], u'p\xe5th')
 
170
            if 'conflict_path' in stanza:
 
171
                self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
 
172
            if 'conflict_file_id' in stanza:
 
173
                self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')