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