1
# -*- coding: utf-8 -*-
2
# Copyright (C) 2007 Adeodato Simó <dato@net.com.org.es>
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from cStringIO import StringIO
26
from bzrlib.merge_directive import MergeDirective2
28
from bzrlib.plugins.gtk.diff import (
31
iter_changes_to_status,
32
MergeDirectiveController,
35
=== modified file 'tests/test_diff.py'
36
--- tests/test_diff.py 2008-03-11 13:18:28 +0000
37
+++ tests/test_diff.py 2008-05-08 22:44:02 +0000
40
from bzrlib import tests
42
-from bzrlib.plugins.gtk.diff import DiffView, iter_changes_to_status
43
+from bzrlib.plugins.gtk.diff import (
46
+ iter_changes_to_status,
50
class TestDiffViewSimple(tests.TestCase):
53
class TestDiffViewSimple(tests.TestCase):
55
def test_parse_colordiffrc(self):
59
# now a comment and a blank line
62
# another comment preceded by whitespace
67
'diffstuff': '#ffff00',
69
parsed_colors = DiffView.parse_colordiffrc(StringIO(colordiffrc))
70
self.assertEqual(colors, parsed_colors)
73
class TestDiffView(tests.TestCaseWithTransport):
75
def test_unicode(self):
76
self.requireFeature(tests.UnicodeFilenameFeature)
78
tree = self.make_branch_and_tree('tree')
79
self.build_tree([u'tree/\u03a9'])
80
tree.add([u'\u03a9'], ['omega-id'])
83
view.set_trees(tree, tree.basis_tree())
86
start, end = buf.get_bounds()
87
text = buf.get_text(start, end)
88
self.assertContainsRe(text,
89
"=== added file '\xce\xa9'\n"
90
'--- .*\t1970-01-01 00:00:00 \\+0000\n'
91
r'\+\+\+ .*\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d\n'
93
'\\+contents of tree/\xce\xa9\n'
98
class MockDiffWidget(object):
100
def set_diff_text_sections(self, sections):
101
self.sections = list(sections)
104
class MockWindow(object):
106
self.diff = MockDiffWidget()
107
self.merge_successful = False
109
def set_title(self, title):
112
def _get_save_path(self, basename):
115
def _get_merge_target(self):
121
def _merge_successful(self):
122
self.merge_successful = True
124
def _conflicts(self):
125
self.conflicts = True
127
def _handle_error(self, e):
128
self.handled_error = e
131
class TestDiffController(tests.TestCaseWithTransport):
133
def get_controller(self):
134
window = MockWindow()
135
return DiffController('load-path', eg_diff.splitlines(True), window)
137
def test_get_diff_sections(self):
138
controller = self.get_controller()
139
controller = DiffController('.', eg_diff.splitlines(True),
141
sections = list(controller.get_diff_sections())
142
self.assertEqual('Complete Diff', sections[0][0])
143
self.assertIs(None, sections[0][1])
144
self.assertEqual(eg_diff, sections[0][2])
146
self.assertEqual('tests/test_diff.py', sections[1][0])
147
self.assertEqual('tests/test_diff.py', sections[1][1])
148
self.assertEqual(''.join(eg_diff.splitlines(True)[1:]),
151
def test_initialize_window(self):
152
controller = self.get_controller()
153
controller.initialize_window(controller.window)
154
self.assertEqual(2, len(controller.window.diff.sections))
155
self.assertEqual('load-path - diff', controller.window.title)
157
def test_perform_save(self):
158
self.build_tree_contents([('load-path', 'foo')])
159
controller = self.get_controller()
160
controller.perform_save(None)
161
self.assertFileEqual('foo', 'save-path')
164
class TestMergeDirectiveController(tests.TestCaseWithTransport):
166
def make_this_other_directive(self):
167
this = self.make_branch_and_tree('this')
168
this.commit('first commit')
169
other = this.bzrdir.sprout('other').open_workingtree()
170
self.build_tree_contents([('other/foo', 'bar')])
172
other.commit('second commit')
175
directive = MergeDirective2.from_objects(other.branch.repository,
176
other.last_revision(), 0,
180
return this, other, directive
182
def make_merged_window(self, directive):
183
window = MockWindow()
184
controller = MergeDirectiveController('directive', directive, window)
185
controller.perform_merge(window)
188
def test_perform_merge_success(self):
189
this, other, directive = self.make_this_other_directive()
190
window = self.make_merged_window(directive)
191
self.assertTrue(window.merge_successful)
192
self.assertEqual(other.last_revision(), this.get_parent_ids()[1])
193
self.assertFileEqual('bar', 'this/foo')
195
def test_perform_merge_conflicts(self):
196
this, other, directive = self.make_this_other_directive()
197
self.build_tree_contents([('this/foo', 'bar')])
199
this.commit('message')
200
window = self.make_merged_window(directive)
201
self.assertFalse(window.merge_successful)
202
self.assertTrue(window.conflicts)
203
self.assertEqual(other.last_revision(), this.get_parent_ids()[1])
204
self.assertFileEqual('bar', 'this/foo')
206
def test_perform_merge_uncommitted_changes(self):
207
this, other, directive = self.make_this_other_directive()
208
self.build_tree_contents([('this/foo', 'bar')])
210
window = self.make_merged_window(directive)
211
self.assertIsInstance(window.handled_error, errors.UncommittedChanges)
214
class Test_IterChangesToStatus(tests.TestCaseWithTransport):
216
def assertStatusEqual(self, expected, tree):
217
values = iter_changes_to_status(tree.basis_tree(), tree)
218
self.assertEqual(expected, values)
220
def test_status_added(self):
221
tree = self.make_branch_and_tree('tree')
222
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
223
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
225
self.assertStatusEqual(
226
[('a-id', 'a', 'added', 'a'),
227
('b-id', 'b', 'added', 'b/'),
228
('c-id', 'b/c', 'added', 'b/c'),
231
def test_status_renamed(self):
232
tree = self.make_branch_and_tree('tree')
233
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
234
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
235
rev_id1 = tree.commit('one')
237
tree.rename_one('b', 'd')
238
tree.rename_one('a', 'd/a')
240
self.assertStatusEqual(
241
[('b-id', 'd', 'renamed', 'b/ => d/'),
242
('a-id', 'd/a', 'renamed', 'a => d/a'),
245
def test_status_modified(self):
246
tree = self.make_branch_and_tree('tree')
247
self.build_tree(['tree/a'])
248
tree.add(['a'], ['a-id'])
249
rev_id1 = tree.commit('one')
251
self.build_tree_contents([('tree/a', 'new contents for a\n')])
253
self.assertStatusEqual(
254
[('a-id', 'a', 'modified', 'a'),
257
def test_status_renamed_and_modified(self):
258
tree = self.make_branch_and_tree('tree')
259
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
260
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
261
rev_id1 = tree.commit('one')
263
tree.rename_one('b', 'd')
264
tree.rename_one('a', 'd/a')
265
self.build_tree_contents([('tree/d/a', 'new contents for a\n'),
266
('tree/d/c', 'new contents for c\n'),
268
# 'c' is not considered renamed, because only its parent was moved, it
269
# stayed in the same directory
271
self.assertStatusEqual(
272
[('b-id', 'd', 'renamed', 'b/ => d/'),
273
('a-id', 'd/a', 'renamed and modified', 'a => d/a'),
274
('c-id', 'd/c', 'modified', 'd/c'),
277
def test_status_kind_changed(self):
278
tree = self.make_branch_and_tree('tree')
279
self.build_tree(['tree/a', 'tree/b'])
280
tree.add(['a', 'b'], ['a-id', 'b-id'])
284
self.build_tree(['tree/a/'])
285
# XXX: This is technically valid, and the file list handles it fine,
286
# but 'show_diff_trees()' does not, so we skip this part of the
288
# tree.rename_one('b', 'c')
289
# os.remove('tree/c')
290
# self.build_tree(['tree/c/'])
292
self.assertStatusEqual(
293
[('a-id', 'a', 'kind changed', 'a => a/'),
294
# ('b-id', 'c', True, 'b => c/', 'renamed and modified'),
297
def test_status_removed(self):
298
tree = self.make_branch_and_tree('tree')
299
self.build_tree(['tree/a', 'tree/b/'])
300
tree.add(['a', 'b'], ['a-id', 'b-id'])
304
tree.remove('b', force=True)
306
self.assertStatusEqual(
307
[('a-id', 'a', 'removed', 'a'),
308
('b-id', 'b', 'removed', 'b/'),
311
def test_status_missing_file(self):
312
this = self.make_branch_and_tree('this')
313
self.build_tree(['this/foo'])
314
this.add(['foo'], ['foo-id'])
317
other = this.bzrdir.sprout('other').open_workingtree()
319
os.remove('this/foo')
320
this.remove('foo', force=True)
321
this.commit('remove')
323
f = open('other/foo', 'wt')
325
f.write('Modified\n')
328
other.commit('modified')
330
this.merge_from_branch(other.branch)
331
conflicts.resolve(this)
333
self.assertStatusEqual(
334
[('foo-id', 'foo.OTHER', 'missing', 'foo.OTHER'),],
337
def test_status_missing_directory(self):
338
this = self.make_branch_and_tree('this')
339
self.build_tree(['this/foo/', 'this/foo/bar'])
340
this.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
343
other = this.bzrdir.sprout('other').open_workingtree()
345
os.remove('this/foo/bar')
347
this.remove('foo', force=True)
348
this.commit('remove')
350
f = open('other/foo/bar', 'wt')
352
f.write('Modified\n')
355
other.commit('modified')
357
this.merge_from_branch(other.branch)
358
conflicts.resolve(this)
360
self.assertStatusEqual(
361
[('foo-id', u'foo', 'added', u'foo/'),
362
('bar-id', u'foo/bar.OTHER', 'missing', u'foo/bar.OTHER'),],
added
removed
tests/test_diff.py
