1
# Copyright (C) 2005 by Canonical Ltd
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.
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.
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
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,
27
from bzrlib.errors import NotConflicted
30
# TODO: Test commit with some added, and added-but-missing files
31
# RBC 20060124 is that not tested in test_commit.py ?
33
# The order of 'path' here is important - do not let it
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',
43
ParentLoop('Cancelled move', 'pathe', 'path2e', None, 'id2e'),
44
UnversionedParent('Versioned directory', 'pathf', 'idf'),
48
class TestConflicts(TestCaseWithTransport):
50
def test_conflicts(self):
51
"""Conflicts are detected properly"""
52
tree = self.make_branch_and_tree('.',
53
format=bzrdir.BzrDirFormat6())
55
file('hello', 'w').write('hello world4')
56
file('hello.THIS', 'w').write('hello world2')
57
file('hello.BASE', 'w').write('hello world1')
58
file('hello.OTHER', 'w').write('hello world3')
59
file('hello.sploo.BASE', 'w').write('yellow world')
60
file('hello.sploo.OTHER', 'w').write('yellow world2')
61
self.assertEqual(len(list(tree.list_files())), 6)
62
conflicts = tree.conflicts()
63
self.assertEqual(len(conflicts), 2)
64
self.assert_('hello' in conflicts[0].path)
65
self.assert_('hello.sploo' in conflicts[1].path)
67
restore('hello.sploo')
68
self.assertEqual(len(tree.conflicts()), 0)
69
self.assertFileEqual('hello world2', 'hello')
70
assert not os.path.lexists('hello.sploo')
71
self.assertRaises(NotConflicted, restore, 'hello')
72
self.assertRaises(NotConflicted, restore, 'hello.sploo')
74
def test_resolve_conflict_dir(self):
75
tree = self.make_branch_and_tree('.')
77
file('hello', 'w').write('hello world4')
78
tree.add('hello', 'q')
79
file('hello.THIS', 'w').write('hello world2')
80
file('hello.BASE', 'w').write('hello world1')
81
os.mkdir('hello.OTHER')
82
l = ConflictList([TextConflict('hello')])
86
class TestConflictStanzas(TestCase):
88
def test_stanza_roundtrip(self):
89
# write and read our example stanza.
90
stanza_iter = example_conflicts.to_stanzas()
91
processed = ConflictList.from_stanzas(stanza_iter)
92
for o,p in zip(processed, example_conflicts):
93
self.assertEqual(o, p)
95
def test_stanzification(self):
96
for stanza in example_conflicts.to_stanzas():
98
self.assertStartsWith(stanza['file_id'], 'id')
101
self.assertStartsWith(stanza['path'], 'path')
103
self.assertStartsWith(stanza['conflict_file_id'], 'id')
104
self.assertStartsWith(stanza['conflict_file_path'], 'path')
added
removed
bzrlib/tests/test_conflicts.py
