← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-28 06:58:22 UTC
  • mfrom: (2379.2.3 hpss-chroot)
  • Revision ID: pqm@pqm.ubuntu.com-20070328065822-999550a858a3ced3
(robertc) Fix chroot urls to not expose the url of the transport they are protecting, allowing regular url operations to work on them. (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
1
 
# Copyright (C) 2006-2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Whitebox tests for annotate functionality."""
18
18
 
19
 
import codecs
20
19
from cStringIO import StringIO
21
20
 
22
21
from bzrlib import (
23
22
    annotate,
24
 
    symbol_versioning,
 
23
    conflicts,
 
24
    errors,
25
25
    tests,
 
26
    trace,
26
27
    )
27
28
 
28
29
 
85
86
e
86
87
""".splitlines(True)
87
88
 
88
 
expected_1 = annotation("""\
89
 
blahblah a
90
 
blahblah b
91
 
blahblah c
92
 
blahblah d
93
 
blahblah e
94
 
""")
95
 
 
96
89
 
97
90
new_2 = """\
98
91
a
105
98
""".splitlines(True)
106
99
 
107
100
 
108
 
# For the 'duplicate' series, both sides introduce the same change, which then
109
 
# gets merged around. The last-modified should properly reflect this.
110
 
# We always change the fourth line so that the file is properly tracked as
111
 
# being modified in each revision. In reality, this probably would happen over
112
 
# many revisions, and it would be a different line that changes.
113
 
# BASE
114
 
#  |\
115
 
#  A B  # line should be annotated as new for A and B
116
 
#  |\|
117
 
#  C D  # line should 'converge' and say A
118
 
#  |/
119
 
#  E    # D should supersede A and stay as D (not become E because C references
120
 
#         A)
121
 
duplicate_base = annotation("""\
122
 
rev-base first
123
 
rev-base second
124
 
rev-base third
125
 
rev-base fourth-base
126
 
""")
127
 
 
128
 
duplicate_A = annotation("""\
129
 
rev-base first
130
 
rev-A alt-second
131
 
rev-base third
132
 
rev-A fourth-A
133
 
""")
134
 
 
135
 
duplicate_B = annotation("""\
136
 
rev-base first
137
 
rev-B alt-second
138
 
rev-base third
139
 
rev-B fourth-B
140
 
""")
141
 
 
142
 
duplicate_C = annotation("""\
143
 
rev-base first
144
 
rev-A alt-second
145
 
rev-base third
146
 
rev-C fourth-C
147
 
""")
148
 
 
149
 
duplicate_D = annotation("""\
150
 
rev-base first
151
 
rev-A alt-second
152
 
rev-base third
153
 
rev-D fourth-D
154
 
""")
155
 
 
156
 
duplicate_E = annotation("""\
157
 
rev-base first
158
 
rev-A alt-second
159
 
rev-base third
160
 
rev-E fourth-E
161
 
""")
162
 
 
163
 
 
164
101
class TestAnnotate(tests.TestCaseWithTransport):
165
102
 
166
103
    def create_merged_trees(self):
174
111
         |
175
112
        rev-3
176
113
        """
177
 
        builder = self.make_branch_builder('branch')
178
 
        builder.start_series()
179
 
        self.addCleanup(builder.finish_series)
180
 
        builder.build_snapshot('rev-1', None, [
181
 
            ('add', ('', 'root-id', 'directory', None)),
182
 
            ('add', ('a', 'a-id', 'file', 'first\n')),
183
 
            ], timestamp=1166046000.00, timezone=0, committer="joe@foo.com")
184
 
        builder.build_snapshot('rev-2', ['rev-1'], [
185
 
            ('modify', ('a-id', 'first\nsecond\n')),
186
 
            ], timestamp=1166046001.00, timezone=0, committer="joe@foo.com")
187
 
        builder.build_snapshot('rev-1_1_1', ['rev-1'], [
188
 
            ('modify', ('a-id', 'first\nthird\n')),
189
 
            ], timestamp=1166046002.00, timezone=0, committer="barry@foo.com")
190
 
        builder.build_snapshot('rev-3', ['rev-2', 'rev-1_1_1'], [
191
 
            ('modify', ('a-id', 'first\nsecond\nthird\n')),
192
 
            ], timestamp=1166046003.00, timezone=0, committer="sal@foo.com")
193
 
        return builder
 
114
 
 
115
        tree1 = self.make_branch_and_tree('tree1')
 
116
        self.build_tree_contents([('tree1/a', 'first\n')])
 
117
        tree1.add(['a'], ['a-id'])
 
118
        tree1.commit('a', rev_id='rev-1',
 
119
                     committer="joe@foo.com",
 
120
                     timestamp=1166046000.00, timezone=0)
 
121
 
 
122
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
 
123
 
 
124
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
 
125
        tree1.commit('b', rev_id='rev-2',
 
126
                     committer='joe@foo.com',
 
127
                     timestamp=1166046001.00, timezone=0)
 
128
 
 
129
        self.build_tree_contents([('tree2/a', 'first\nthird\n')])
 
130
        tree2.commit('c', rev_id='rev-1_1_1',
 
131
                     committer="barry@foo.com",
 
132
                     timestamp=1166046002.00, timezone=0)
 
133
 
 
134
        num_conflicts = tree1.merge_from_branch(tree2.branch)
 
135
        self.assertEqual(1, num_conflicts)
 
136
 
 
137
        self.build_tree_contents([('tree1/a',
 
138
                                 'first\nsecond\nthird\n')])
 
139
        tree1.set_conflicts(conflicts.ConflictList())
 
140
        tree1.commit('merge 2', rev_id='rev-3',
 
141
                     committer='sal@foo.com',
 
142
                     timestamp=1166046003.00, timezone=0)
 
143
        return tree1, tree2
194
144
 
195
145
    def create_deeply_merged_trees(self):
196
146
        """Create some trees with a more complex merge history.
201
151
         |      |          |
202
152
         +------+          |
203
153
         |      |          |
204
 
        rev-3  rev-1_1_2  rev-1_2_1 ------+
 
154
        rev-3  rev-1_1_2  rev-1_1_1_1_1 --+
205
155
         |      |          |              |
206
156
         +------+          |              |
207
157
         |                 |              |
208
 
        rev-4             rev-1_2_2  rev-1_3_1
 
158
        rev-4             rev-1_1_1_1_2  rev-1_1_1_1_1_1_1
209
159
         |                 |              |
210
160
         +-----------------+              |
211
161
         |                                |
215
165
         |
216
166
        rev-6
217
167
        """
218
 
        builder = self.create_merged_trees()
219
 
        builder.build_snapshot('rev-1_1_2', ['rev-1_1_1'], [])
220
 
        builder.build_snapshot('rev-4', ['rev-3', 'rev-1_1_2'], [])
221
 
        builder.build_snapshot('rev-1_2_1', ['rev-1_1_1'], [
222
 
            ('modify', ('a-id', 'first\nthird\nfourth\n')),
223
 
            ], timestamp=1166046003.00, timezone=0, committer="jerry@foo.com")
224
 
        builder.build_snapshot('rev-1_2_2', ['rev-1_2_1'], [],
225
 
            timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
226
 
        builder.build_snapshot('rev-5', ['rev-4', 'rev-1_2_2'], [
227
 
            ('modify', ('a-id', 'first\nsecond\nthird\nfourth\n')),
228
 
            ], timestamp=1166046004.00, timezone=0, committer="jerry@foo.com")
229
 
        builder.build_snapshot('rev-1_3_1', ['rev-1_2_1'], [
230
 
            ('modify', ('a-id', 'first\nthird\nfourth\nfifth\nsixth\n')),
231
 
            ], timestamp=1166046005.00, timezone=0, committer="george@foo.com")
232
 
        builder.build_snapshot('rev-6', ['rev-5', 'rev-1_3_1'], [
233
 
            ('modify', ('a-id',
234
 
                        'first\nsecond\nthird\nfourth\nfifth\nsixth\n')),
235
 
            ])
236
 
        return builder
237
 
 
238
 
    def create_duplicate_lines_tree(self):
239
 
        builder = self.make_branch_builder('branch')
240
 
        builder.start_series()
241
 
        self.addCleanup(builder.finish_series)
242
 
        base_text = ''.join(l for r, l in duplicate_base)
243
 
        a_text = ''.join(l for r, l in duplicate_A)
244
 
        b_text = ''.join(l for r, l in duplicate_B)
245
 
        c_text = ''.join(l for r, l in duplicate_C)
246
 
        d_text = ''.join(l for r, l in duplicate_D)
247
 
        e_text = ''.join(l for r, l in duplicate_E)
248
 
        builder.build_snapshot('rev-base', None, [
249
 
            ('add', ('', 'root-id', 'directory', None)),
250
 
            ('add', ('file', 'file-id', 'file', base_text)),
251
 
            ])
252
 
        builder.build_snapshot('rev-A', ['rev-base'], [
253
 
            ('modify', ('file-id', a_text))])
254
 
        builder.build_snapshot('rev-B', ['rev-base'], [
255
 
            ('modify', ('file-id', b_text))])
256
 
        builder.build_snapshot('rev-C', ['rev-A'], [
257
 
            ('modify', ('file-id', c_text))])
258
 
        builder.build_snapshot('rev-D', ['rev-B', 'rev-A'], [
259
 
            ('modify', ('file-id', d_text))])
260
 
        builder.build_snapshot('rev-E', ['rev-C', 'rev-D'], [
261
 
            ('modify', ('file-id', e_text))])
262
 
        return builder
263
 
 
264
 
    def assertAnnotateEqualDiff(self, actual, expected):
265
 
        if actual != expected:
266
 
            # Create an easier to understand diff when the lines don't actually
267
 
            # match
268
 
            self.assertEqualDiff(''.join('\t'.join(l) for l in expected),
269
 
                                 ''.join('\t'.join(l) for l in actual))
270
 
 
271
 
    def assertBranchAnnotate(self, expected, branch, file_id, revision_id,
272
 
            verbose=False, full=False, show_ids=False):
273
 
        tree = branch.repository.revision_tree(revision_id)
274
 
        to_file = StringIO()
275
 
        annotate.annotate_file_tree(tree, file_id, to_file,
276
 
            verbose=verbose, full=full, show_ids=show_ids, branch=branch)
277
 
        self.assertAnnotateEqualDiff(to_file.getvalue(), expected)
278
 
 
279
 
    def assertRepoAnnotate(self, expected, repo, file_id, revision_id):
280
 
        """Assert that the revision is properly annotated."""
281
 
        actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
282
 
        self.assertAnnotateEqualDiff(actual, expected)
283
 
 
284
 
    def test_annotate_duplicate_lines(self):
285
 
        # XXX: Should this be a per_repository test?
286
 
        builder = self.create_duplicate_lines_tree()
287
 
        repo = builder.get_branch().repository
288
 
        repo.lock_read()
289
 
        self.addCleanup(repo.unlock)
290
 
        self.assertRepoAnnotate(duplicate_base, repo, 'file-id', 'rev-base')
291
 
        self.assertRepoAnnotate(duplicate_A, repo, 'file-id', 'rev-A')
292
 
        self.assertRepoAnnotate(duplicate_B, repo, 'file-id', 'rev-B')
293
 
        self.assertRepoAnnotate(duplicate_C, repo, 'file-id', 'rev-C')
294
 
        self.assertRepoAnnotate(duplicate_D, repo, 'file-id', 'rev-D')
295
 
        self.assertRepoAnnotate(duplicate_E, repo, 'file-id', 'rev-E')
 
168
        tree1, tree2 = self.create_merged_trees()
 
169
 
 
170
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
 
171
 
 
172
        tree2.commit('noop', rev_id='rev-1_1_2')
 
173
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
 
174
        tree1.commit('noop merge', rev_id='rev-4')
 
175
 
 
176
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
 
177
        tree3.commit('four', rev_id='rev-1_1_1_1_1',
 
178
                     committer='jerry@foo.com',
 
179
                     timestamp=1166046003.00, timezone=0)
 
180
 
 
181
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
 
182
 
 
183
        tree3.commit('noop', rev_id='rev-1_1_1_1_2',
 
184
                     committer='jerry@foo.com',
 
185
                     timestamp=1166046004.00, timezone=0)
 
186
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
 
187
        tree1.commit('merge four', rev_id='rev-5')
 
188
 
 
189
        self.build_tree_contents([('tree4/a',
 
190
                                   'first\nthird\nfourth\nfifth\nsixth\n')])
 
191
        tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
 
192
                     committer='george@foo.com',
 
193
                     timestamp=1166046005.00, timezone=0)
 
194
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
 
195
        tree1.commit('merge five and six', rev_id='rev-6')
 
196
        return tree1
296
197
 
297
198
    def test_annotate_shows_dotted_revnos(self):
298
 
        builder = self.create_merged_trees()
 
199
        tree1, tree2 = self.create_merged_trees()
299
200
 
300
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
301
 
                                  '2     joe@foo | second\n'
302
 
                                  '1.1.1 barry@f | third\n',
303
 
                                  builder.get_branch(), 'a-id', 'rev-3')
 
201
        sio = StringIO()
 
202
        annotate.annotate_file(tree1.branch, 'rev-3', 'a-id',
 
203
                               to_file=sio)
 
204
        self.assertEqualDiff('1     joe@foo | first\n'
 
205
                             '2     joe@foo | second\n'
 
206
                             '1.1.1 barry@f | third\n',
 
207
                             sio.getvalue())
304
208
 
305
209
    def test_annotate_limits_dotted_revnos(self):
306
210
        """Annotate should limit dotted revnos to a depth of 12"""
307
 
        builder = self.create_deeply_merged_trees()
308
 
 
309
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
310
 
                                  '2     joe@foo | second\n'
311
 
                                  '1.1.1 barry@f | third\n'
312
 
                                  '1.2.1 jerry@f | fourth\n'
313
 
                                  '1.3.1 george@ | fifth\n'
314
 
                                  '              | sixth\n',
315
 
                                  builder.get_branch(), 'a-id', 'rev-6',
316
 
                                  verbose=False, full=False)
317
 
 
318
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
319
 
                                  '2     joe@foo | second\n'
320
 
                                  '1.1.1 barry@f | third\n'
321
 
                                  '1.2.1 jerry@f | fourth\n'
322
 
                                  '1.3.1 george@ | fifth\n'
323
 
                                  '1.3.1 george@ | sixth\n',
324
 
                                  builder.get_branch(), 'a-id', 'rev-6',
325
 
                                  verbose=False, full=True)
 
211
        tree1 = self.create_deeply_merged_trees()
 
212
 
 
213
        sio = StringIO()
 
214
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
215
                               to_file=sio, verbose=False, full=False)
 
216
        self.assertEqualDiff('1            joe@foo | first\n'
 
217
                             '2            joe@foo | second\n'
 
218
                             '1.1.1        barry@f | third\n'
 
219
                             '1.1.1.1.1    jerry@f | fourth\n'
 
220
                             '1.1.1.1.1.1> george@ | fifth\n'
 
221
                             '                     | sixth\n',
 
222
                             sio.getvalue())
 
223
 
 
224
        sio = StringIO()
 
225
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
226
                               to_file=sio, verbose=False, full=True)
 
227
        self.assertEqualDiff('1            joe@foo | first\n'
 
228
                             '2            joe@foo | second\n'
 
229
                             '1.1.1        barry@f | third\n'
 
230
                             '1.1.1.1.1    jerry@f | fourth\n'
 
231
                             '1.1.1.1.1.1> george@ | fifth\n'
 
232
                             '1.1.1.1.1.1> george@ | sixth\n',
 
233
                             sio.getvalue())
326
234
 
327
235
        # verbose=True shows everything, the full revno, user id, and date
328
 
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
329
 
                                  '2     joe@foo.com    20061213 | second\n'
330
 
                                  '1.1.1 barry@foo.com  20061213 | third\n'
331
 
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
332
 
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
333
 
                                  '                              | sixth\n',
334
 
                                  builder.get_branch(), 'a-id', 'rev-6',
335
 
                                  verbose=True, full=False)
 
236
        sio = StringIO()
 
237
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
238
                               to_file=sio, verbose=True, full=False)
 
239
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
240
                             '2             joe@foo.com    20061213 | second\n'
 
241
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
242
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
243
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
 
244
                             '                                      | sixth\n',
 
245
                             sio.getvalue())
336
246
 
337
 
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
338
 
                                  '2     joe@foo.com    20061213 | second\n'
339
 
                                  '1.1.1 barry@foo.com  20061213 | third\n'
340
 
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
341
 
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
342
 
                                  '1.3.1 george@foo.com 20061213 | sixth\n',
343
 
                                  builder.get_branch(), 'a-id', 'rev-6',
344
 
                                  verbose=True, full=True)
 
247
        sio = StringIO()
 
248
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
249
                               to_file=sio, verbose=True, full=True)
 
250
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
251
                             '2             joe@foo.com    20061213 | second\n'
 
252
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
253
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
254
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
 
255
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | sixth\n',
 
256
                             sio.getvalue())
345
257
 
346
258
    def test_annotate_uses_branch_context(self):
347
259
        """Dotted revnos should use the Branch context.
349
261
        When annotating a non-mainline revision, the annotation should still
350
262
        use dotted revnos from the mainline.
351
263
        """
352
 
        builder = self.create_deeply_merged_trees()
 
264
        tree1 = self.create_deeply_merged_trees()
353
265
 
354
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
355
 
                                  '1.1.1 barry@f | third\n'
356
 
                                  '1.2.1 jerry@f | fourth\n'
357
 
                                  '1.3.1 george@ | fifth\n'
358
 
                                  '              | sixth\n',
359
 
                                  builder.get_branch(), 'a-id', 'rev-1_3_1',
360
 
                                  verbose=False, full=False)
 
266
        sio = StringIO()
 
267
        annotate.annotate_file(tree1.branch, 'rev-1_1_1_1_1_1_1', 'a-id',
 
268
                               to_file=sio, verbose=False, full=False)
 
269
        self.assertEqualDiff('1            joe@foo | first\n'
 
270
                             '1.1.1        barry@f | third\n'
 
271
                             '1.1.1.1.1    jerry@f | fourth\n'
 
272
                             '1.1.1.1.1.1> george@ | fifth\n'
 
273
                             '                     | sixth\n',
 
274
                             sio.getvalue())
361
275
 
362
276
    def test_annotate_show_ids(self):
363
 
        builder = self.create_deeply_merged_trees()
 
277
        tree1 = self.create_deeply_merged_trees()
 
278
 
 
279
        sio = StringIO()
 
280
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
281
                               to_file=sio, show_ids=True, full=False)
364
282
 
365
283
        # It looks better with real revision ids :)
366
 
        self.assertBranchAnnotate('    rev-1 | first\n'
367
 
                                  '    rev-2 | second\n'
368
 
                                  'rev-1_1_1 | third\n'
369
 
                                  'rev-1_2_1 | fourth\n'
370
 
                                  'rev-1_3_1 | fifth\n'
371
 
                                  '          | sixth\n',
372
 
                                  builder.get_branch(), 'a-id', 'rev-6',
373
 
                                  show_ids=True, full=False)
374
 
 
375
 
        self.assertBranchAnnotate('    rev-1 | first\n'
376
 
                                  '    rev-2 | second\n'
377
 
                                  'rev-1_1_1 | third\n'
378
 
                                  'rev-1_2_1 | fourth\n'
379
 
                                  'rev-1_3_1 | fifth\n'
380
 
                                  'rev-1_3_1 | sixth\n',
381
 
                                  builder.get_branch(), 'a-id', 'rev-6',
382
 
                                  show_ids=True, full=True)
383
 
 
384
 
    def test_annotate_unicode_author(self):
385
 
        tree1 = self.make_branch_and_tree('tree1')
386
 
 
387
 
        self.build_tree_contents([('tree1/a', 'adi\xc3\xb3s')])
388
 
        tree1.add(['a'], ['a-id'])
389
 
        tree1.commit('a', rev_id='rev-1',
390
 
                     committer=u'Pepe P\xe9rez <pperez@ejemplo.com>',
391
 
                     timestamp=1166046000.00, timezone=0)
392
 
 
393
 
        self.build_tree_contents([('tree1/b', 'bye')])
394
 
        tree1.add(['b'], ['b-id'])
395
 
        tree1.commit('b', rev_id='rev-2',
396
 
                     committer=u'p\xe9rez',
397
 
                     timestamp=1166046000.00, timezone=0)
398
 
 
399
 
        tree1.lock_read()
400
 
        self.addCleanup(tree1.unlock)
401
 
 
402
 
        revtree_1 = tree1.branch.repository.revision_tree('rev-1')
403
 
        revtree_2 = tree1.branch.repository.revision_tree('rev-2')
404
 
 
405
 
        # this passes if no exception is raised
406
 
        to_file = StringIO()
407
 
        annotate.annotate_file_tree(revtree_1, 'a-id',
408
 
            to_file=to_file, branch=tree1.branch)
 
284
        self.assertEqualDiff('            rev-1 | first\n'
 
285
                             '            rev-2 | second\n'
 
286
                             '        rev-1_1_1 | third\n'
 
287
                             '    rev-1_1_1_1_1 | fourth\n'
 
288
                             'rev-1_1_1_1_1_1_1 | fifth\n'
 
289
                             '                  | sixth\n',
 
290
                             sio.getvalue())
409
291
 
410
292
        sio = StringIO()
411
 
        to_file = codecs.getwriter('ascii')(sio)
412
 
        to_file.encoding = 'ascii' # codecs does not set it
413
 
        annotate.annotate_file_tree(revtree_2, 'b-id',
414
 
            to_file=to_file, branch=tree1.branch)
415
 
        self.assertEqualDiff('2   p?rez   | bye\n', sio.getvalue())
416
 
 
417
 
        # test now with to_file.encoding = None
418
 
        to_file = tests.StringIOWrapper()
419
 
        to_file.encoding = None
420
 
        annotate.annotate_file_tree(revtree_2, 'b-id',
421
 
            to_file=to_file, branch=tree1.branch)
422
 
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
423
 
 
424
 
        # and when it does not exist
425
 
        to_file = StringIO()
426
 
        annotate.annotate_file_tree(revtree_2, 'b-id',
427
 
            to_file=to_file, branch=tree1.branch)
428
 
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
429
 
 
430
 
    def test_annotate_author_or_committer(self):
431
 
        tree1 = self.make_branch_and_tree('tree1')
432
 
 
433
 
        self.build_tree_contents([('tree1/a', 'hello')])
434
 
        tree1.add(['a'], ['a-id'])
435
 
        tree1.commit('a', rev_id='rev-1',
436
 
                     committer='Committer <committer@example.com>',
437
 
                     timestamp=1166046000.00, timezone=0)
438
 
 
439
 
        self.build_tree_contents([('tree1/b', 'bye')])
440
 
        tree1.add(['b'], ['b-id'])
441
 
        tree1.commit('b', rev_id='rev-2',
442
 
                     committer='Committer <committer@example.com>',
443
 
                     authors=['Author <author@example.com>'],
444
 
                     timestamp=1166046000.00, timezone=0)
445
 
 
446
 
        tree1.lock_read()
447
 
        self.addCleanup(tree1.unlock)
448
 
 
449
 
        self.assertBranchAnnotate('1   committ | hello\n', tree1.branch,
450
 
            'a-id', 'rev-1')
451
 
 
452
 
        to_file = StringIO()
453
 
        self.assertBranchAnnotate('2   author@ | bye\n', tree1.branch,
454
 
            'b-id', 'rev-2')
 
293
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
294
                               to_file=sio, show_ids=True, full=True)
 
295
 
 
296
        self.assertEqualDiff('            rev-1 | first\n'
 
297
                             '            rev-2 | second\n'
 
298
                             '        rev-1_1_1 | third\n'
 
299
                             '    rev-1_1_1_1_1 | fourth\n'
 
300
                             'rev-1_1_1_1_1_1_1 | fifth\n'
 
301
                             'rev-1_1_1_1_1_1_1 | sixth\n',
 
302
                             sio.getvalue())
455
303
 
456
304
 
457
305
class TestReannotate(tests.TestCase):
458
306
 
459
 
    def annotateEqual(self, expected, parents, newlines, revision_id,
460
 
                      blocks=None):
 
307
    def annotateEqual(self, expected, parents, newlines, revision_id):
461
308
        annotate_list = list(annotate.reannotate(parents, newlines,
462
 
                             revision_id, blocks))
 
309
                             revision_id))
463
310
        self.assertEqual(len(expected), len(annotate_list))
464
311
        for e, a in zip(expected, annotate_list):
465
312
            self.assertEqual(e, a)
467
314
    def test_reannotate(self):
468
315
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
469
316
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
470
 
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
 
317
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2, 
471
318
                           'blahblah')
472
 
 
473
 
    def test_reannotate_no_parents(self):
474
 
        self.annotateEqual(expected_1, [], new_1, 'blahblah')
475
 
 
476
 
    def test_reannotate_left_matching_blocks(self):
477
 
        """Ensure that left_matching_blocks has an impact.
478
 
 
479
 
        In this case, the annotation is ambiguous, so the hint isn't actually
480
 
        lying.
481
 
        """
482
 
        parent = [('rev1', 'a\n')]
483
 
        new_text = ['a\n', 'a\n']
484
 
        blocks = [(0, 0, 1), (1, 2, 0)]
485
 
        self.annotateEqual([('rev1', 'a\n'), ('rev2', 'a\n')], [parent],
486
 
                           new_text, 'rev2', blocks)
487
 
        blocks = [(0, 1, 1), (1, 2, 0)]
488
 
        self.annotateEqual([('rev2', 'a\n'), ('rev1', 'a\n')], [parent],
489
 
                           new_text, 'rev2', blocks)