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
|
# -*- coding: utf-8 -*-
# Copyright (C) 2007 Adeodato Simó <dato@net.com.org.es>
#
# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from cStringIO import StringIO
import os
from bzrlib import tests
from bzrlib.plugins.gtk.diff import DiffView, iter_changes_to_status
class TestDiffViewSimple(tests.TestCase):
def test_parse_colordiffrc(self):
colordiffrc = '''\
newtext=blue
oldtext = Red
# now a comment and a blank line
diffstuff = #ffff00
# another comment preceded by whitespace
'''
colors = {
'newtext': 'blue',
'oldtext': 'Red',
'diffstuff': '#ffff00',
}
parsed_colors = DiffView.parse_colordiffrc(StringIO(colordiffrc))
self.assertEqual(colors, parsed_colors)
class TestDiffView(tests.TestCaseWithTransport):
def test_unicode(self):
from bzrlib.tests.test_diff import UnicodeFilename
self.requireFeature(UnicodeFilename)
tree = self.make_branch_and_tree('tree')
self.build_tree([u'tree/\u03a9'])
tree.add([u'\u03a9'], ['omega-id'])
view = DiffView()
view.set_trees(tree, tree.basis_tree())
view.show_diff(None)
buf = view.buffer
start, end = buf.get_bounds()
text = buf.get_text(start, end)
self.assertContainsRe(text,
"=== added file '\xce\xa9'\n"
'--- .*\t1970-01-01 00:00:00 \\+0000\n'
r'\+\+\+ .*\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d\n'
'@@ -0,0 \\+1,1 @@\n'
'\\+contents of tree/\xce\xa9\n'
'\n'
)
class Test_IterChangesToStatus(tests.TestCaseWithTransport):
def assertStatusEqual(self, expected, tree):
values = iter_changes_to_status(tree.basis_tree(), tree)
self.assertEqual(expected, values)
def test_status_added(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
self.assertStatusEqual(
[('a-id', 'a', 'added', 'a'),
('b-id', 'b', 'added', 'b/'),
('c-id', 'b/c', 'added', 'b/c'),
], tree)
def test_status_renamed(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
rev_id1 = tree.commit('one')
tree.rename_one('b', 'd')
tree.rename_one('a', 'd/a')
self.assertStatusEqual(
[('b-id', 'd', 'renamed', 'b/ => d/'),
('a-id', 'd/a', 'renamed', 'a => d/a'),
], tree)
def test_status_modified(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a'])
tree.add(['a'], ['a-id'])
rev_id1 = tree.commit('one')
self.build_tree_contents([('tree/a', 'new contents for a\n')])
self.assertStatusEqual(
[('a-id', 'a', 'modified', 'a'),
], tree)
def test_status_renamed_and_modified(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
rev_id1 = tree.commit('one')
tree.rename_one('b', 'd')
tree.rename_one('a', 'd/a')
self.build_tree_contents([('tree/d/a', 'new contents for a\n'),
('tree/d/c', 'new contents for c\n'),
])
# 'c' is not considered renamed, because only its parent was moved, it
# stayed in the same directory
self.assertStatusEqual(
[('b-id', 'd', 'renamed', 'b/ => d/'),
('a-id', 'd/a', 'renamed and modified', 'a => d/a'),
('c-id', 'd/c', 'modified', 'd/c'),
], tree)
def test_status_kind_changed(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a', 'tree/b'])
tree.add(['a', 'b'], ['a-id', 'b-id'])
tree.commit('one')
os.remove('tree/a')
self.build_tree(['tree/a/'])
# XXX: This is technically valid, and the file list handles it fine,
# but 'show_diff_trees()' does not, so we skip this part of the
# test for now.
# tree.rename_one('b', 'c')
# os.remove('tree/c')
# self.build_tree(['tree/c/'])
self.assertStatusEqual(
[('a-id', 'a', 'kind changed', 'a => a/'),
# ('b-id', 'c', True, 'b => c/', 'renamed and modified'),
], tree)
def test_status_removed(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a', 'tree/b/'])
tree.add(['a', 'b'], ['a-id', 'b-id'])
tree.commit('one')
os.remove('tree/a')
tree.remove('b', force=True)
self.assertStatusEqual(
[('a-id', 'a', 'removed', 'a'),
('b-id', 'b', 'removed', 'b/'),
], tree)
|