1
# Copyright (C) 2006 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
17
"""Whitebox tests for annotate functionality."""
19
from cStringIO import StringIO
30
class TestAnnotate(tests.TestCaseWithTransport):
32
def create_merged_trees(self):
33
tree1 = self.make_branch_and_tree('tree1')
34
self.build_tree_contents([('tree1/a', 'first\n')])
35
tree1.add(['a'], ['a-id'])
36
tree1.commit('a', rev_id='rev-1',
37
committer="joe@foo.com",
38
timestamp=1166046000.00, timezone=0)
40
tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
42
self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
43
tree1.commit('b', rev_id='rev-2',
44
committer='joe@foo.com',
45
timestamp=1166046001.00, timezone=0)
47
self.build_tree_contents([('tree2/a', 'first\nthird\n')])
48
tree2.commit('c', rev_id='rev-1_1_1',
49
committer="barry@foo.com",
50
timestamp=1166046002.00, timezone=0)
52
num_conflicts = tree1.merge_from_branch(tree2.branch)
53
self.assertEqual(1, num_conflicts)
55
self.build_tree_contents([('tree1/a',
56
'first\nsecond\nthird\n')])
57
tree1.set_conflicts(conflicts.ConflictList())
58
tree1.commit('merge 2', rev_id='rev-3',
59
committer='sal@foo.com',
60
timestamp=1166046003.00, timezone=0)
63
def create_deeply_merged_trees(self):
64
tree1, tree2 = self.create_merged_trees()
66
tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
68
tree2.commit('noop', rev_id='rev-1.1.2')
69
self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
70
tree1.commit('noop merge', rev_id='rev-4')
72
self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
73
tree3.commit('four', rev_id='rev-1_1_1_1_1',
74
committer='jerry@foo.com',
75
timestamp=1166046003.00, timezone=0)
77
tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
79
tree3.commit('noop', rev_id='rev-1.1.1.1.2',
80
committer='jerry@foo.com',
81
timestamp=1166046004.00, timezone=0)
82
self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
83
tree1.commit('merge four', rev_id='rev-5')
85
self.build_tree_contents([('tree4/a',
86
'first\nthird\nfourth\nfifth\nsixth\n')])
87
tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
88
committer='george@foo.com',
89
timestamp=1166046005.00, timezone=0)
90
self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
91
tree1.commit('merge five and six', rev_id='rev-6')
94
def test_annotate_shows_dotted_revnos(self):
95
tree1, tree2 = self.create_merged_trees()
98
annotate.annotate_file(tree1.branch, 'rev-3', 'a-id',
100
self.assertEqualDiff('1 joe@foo | first\n'
101
'2 joe@foo | second\n'
102
'1.1.1 barry@f | third\n',
105
def test_annotate_limits_dotted_revnos(self):
106
"""Annotate should limit dotted revnos to a depth of 12"""
107
tree1 = self.create_deeply_merged_trees()
110
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
111
to_file=sio, verbose=False, full=False)
112
self.assertEqualDiff('1 joe@foo | first\n'
113
'2 joe@foo | second\n'
114
'1.1.1 barry@f | third\n'
115
'1.1.1.1.1 jerry@f | fourth\n'
116
'1.1.1.1.1.1> george@ | fifth\n'
121
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
122
to_file=sio, verbose=False, full=True)
123
self.assertEqualDiff('1 joe@foo | first\n'
124
'2 joe@foo | second\n'
125
'1.1.1 barry@f | third\n'
126
'1.1.1.1.1 jerry@f | fourth\n'
127
'1.1.1.1.1.1> george@ | fifth\n'
128
'1.1.1.1.1.1> george@ | sixth\n',
131
# verbose=True shows everything, the full revno, user id, and date
133
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
134
to_file=sio, verbose=True, full=False)
135
self.assertEqualDiff('1 joe@foo.com 20061213 | first\n'
136
'2 joe@foo.com 20061213 | second\n'
137
'1.1.1 barry@foo.com 20061213 | third\n'
138
'1.1.1.1.1 jerry@foo.com 20061213 | fourth\n'
139
'1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
144
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
145
to_file=sio, verbose=True, full=True)
146
self.assertEqualDiff('1 joe@foo.com 20061213 | first\n'
147
'2 joe@foo.com 20061213 | second\n'
148
'1.1.1 barry@foo.com 20061213 | third\n'
149
'1.1.1.1.1 jerry@foo.com 20061213 | fourth\n'
150
'1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
151
'1.1.1.1.1.1.1 george@foo.com 20061213 | sixth\n',
154
def test_annotate_show_ids(self):
155
tree1 = self.create_deeply_merged_trees()
158
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
159
to_file=sio, show_ids=True, full=False)
161
# It looks better with real revision ids :)
162
self.assertEqualDiff(' rev-1 | first\n'
164
' rev-1_1_1 | third\n'
165
' rev-1_1_1_1_1 | fourth\n'
166
'rev-1_1_1_1_1_1_1 | fifth\n'
171
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
172
to_file=sio, show_ids=True, full=True)
174
self.assertEqualDiff(' rev-1 | first\n'
176
' rev-1_1_1 | third\n'
177
' rev-1_1_1_1_1 | fourth\n'
178
'rev-1_1_1_1_1_1_1 | fifth\n'
179
'rev-1_1_1_1_1_1_1 | sixth\n',
added
removed
bzrlib/tests/test_annotate.py
