1185.14.8
by Aaron Bentley
Added test_commit.py |
1 |
# Copyright (C) 2005 by Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1185.14.8
by Aaron Bentley
Added test_commit.py |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1185.14.8
by Aaron Bentley
Added test_commit.py |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1185.14.8
by Aaron Bentley
Added test_commit.py |
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 |
||
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
20 |
from bzrlib import bzrdir |
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
21 |
from bzrlib.tests import TestCaseWithTransport, TestCase |
1185.14.8
by Aaron Bentley
Added test_commit.py |
22 |
from bzrlib.branch import Branch |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
23 |
from bzrlib.conflicts import (MissingParent, ContentsConflict, TextConflict, |
24 |
PathConflict, DuplicateID, DuplicateEntry, ParentLoop, UnversionedParent, |
|
25 |
ConflictList, |
|
26 |
restore) |
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
27 |
from bzrlib.errors import NotConflicted |
1185.14.8
by Aaron Bentley
Added test_commit.py |
28 |
|
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
29 |
|
1185.14.8
by Aaron Bentley
Added test_commit.py |
30 |
# TODO: Test commit with some added, and added-but-missing files
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
31 |
# RBC 20060124 is that not tested in test_commit.py ?
|
1185.14.8
by Aaron Bentley
Added test_commit.py |
32 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
33 |
# The order of 'path' here is important - do not let it
|
34 |
# be a sorted list.
|
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
35 |
example_conflicts = ConflictList([ |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
36 |
MissingParent('Not deleting', 'pathg', 'idg'), |
1534.10.19
by Aaron Bentley
Stanza conversion, cooking |
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'), |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
45 |
])
|
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
46 |
|
47 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
48 |
class TestConflicts(TestCaseWithTransport): |
1185.14.8
by Aaron Bentley
Added test_commit.py |
49 |
|
50 |
def test_conflicts(self): |
|
51 |
"""Conflicts are detected properly"""
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
52 |
tree = self.make_branch_and_tree('.', |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
53 |
format=bzrdir.BzrDirFormat6()) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
54 |
b = tree.branch |
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
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') |
|
1185.14.8
by Aaron Bentley
Added test_commit.py |
59 |
file('hello.sploo.BASE', 'w').write('yellow world') |
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
60 |
file('hello.sploo.OTHER', 'w').write('yellow world2') |
61 |
self.assertEqual(len(list(tree.list_files())), 6) |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
62 |
conflicts = tree.conflicts() |
1185.14.8
by Aaron Bentley
Added test_commit.py |
63 |
self.assertEqual(len(conflicts), 2) |
1534.10.20
by Aaron Bentley
Got all tests passing |
64 |
self.assert_('hello' in conflicts[0].path) |
65 |
self.assert_('hello.sploo' in conflicts[1].path) |
|
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
66 |
restore('hello') |
67 |
restore('hello.sploo') |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
68 |
self.assertEqual(len(tree.conflicts()), 0) |
1185.35.1
by Aaron Bentley
Implemented conflicts.restore |
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') |
|
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
73 |
|
1558.12.9
by Aaron Bentley
Handle resolving conflicts with directories properly |
74 |
def test_resolve_conflict_dir(self): |
75 |
tree = self.make_branch_and_tree('.') |
|
76 |
b = tree.branch |
|
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')]) |
|
83 |
l.remove_files(tree) |
|
84 |
||
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
85 |
|
86 |
class TestConflictStanzas(TestCase): |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
87 |
|
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
88 |
def test_stanza_roundtrip(self): |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
89 |
# write and read our example stanza.
|
1534.10.23
by Aaron Bentley
Removed conflicts_to_stanzas and stanzas_to_conflicts |
90 |
stanza_iter = example_conflicts.to_stanzas() |
91 |
processed = ConflictList.from_stanzas(stanza_iter) |
|
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
92 |
for o,p in zip(processed, example_conflicts): |
93 |
self.assertEqual(o, p) |
|
94 |
||
95 |
def test_stanzification(self): |
|
1534.10.23
by Aaron Bentley
Removed conflicts_to_stanzas and stanzas_to_conflicts |
96 |
for stanza in example_conflicts.to_stanzas(): |
1534.10.4
by Aaron Bentley
Implemented conflict serialization |
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
|