← 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: Ian Clatworthy
  • Date: 2007-08-13 14:33:10 UTC
  • mto: (2733.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2734.
  • Revision ID: ian.clatworthy@internode.on.net-20070813143310-twhj4la0qnupvze8
Added Quick Start Summary

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
 
21
21
 
22
22
from bzrlib import (
23
23
    annotate,
24
 
    symbol_versioning,
 
24
    conflicts,
 
25
    errors,
25
26
    tests,
 
27
    trace,
26
28
    )
27
29
 
28
30
 
85
87
e
86
88
""".splitlines(True)
87
89
 
88
 
expected_1 = annotation("""\
89
 
blahblah a
90
 
blahblah b
91
 
blahblah c
92
 
blahblah d
93
 
blahblah e
94
 
""")
95
 
 
96
90
 
97
91
new_2 = """\
98
92
a
105
99
""".splitlines(True)
106
100
 
107
101
 
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
102
class TestAnnotate(tests.TestCaseWithTransport):
165
103
 
166
104
    def create_merged_trees(self):
174
112
         |
175
113
        rev-3
176
114
        """
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
 
115
 
 
116
        tree1 = self.make_branch_and_tree('tree1')
 
117
        self.build_tree_contents([('tree1/a', 'first\n')])
 
118
        tree1.add(['a'], ['a-id'])
 
119
        tree1.commit('a', rev_id='rev-1',
 
120
                     committer="joe@foo.com",
 
121
                     timestamp=1166046000.00, timezone=0)
 
122
 
 
123
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
 
124
 
 
125
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
 
126
        tree1.commit('b', rev_id='rev-2',
 
127
                     committer='joe@foo.com',
 
128
                     timestamp=1166046001.00, timezone=0)
 
129
 
 
130
        self.build_tree_contents([('tree2/a', 'first\nthird\n')])
 
131
        tree2.commit('c', rev_id='rev-1_1_1',
 
132
                     committer="barry@foo.com",
 
133
                     timestamp=1166046002.00, timezone=0)
 
134
 
 
135
        num_conflicts = tree1.merge_from_branch(tree2.branch)
 
136
        self.assertEqual(1, num_conflicts)
 
137
 
 
138
        self.build_tree_contents([('tree1/a',
 
139
                                 'first\nsecond\nthird\n')])
 
140
        tree1.set_conflicts(conflicts.ConflictList())
 
141
        tree1.commit('merge 2', rev_id='rev-3',
 
142
                     committer='sal@foo.com',
 
143
                     timestamp=1166046003.00, timezone=0)
 
144
        return tree1, tree2
194
145
 
195
146
    def create_deeply_merged_trees(self):
196
147
        """Create some trees with a more complex merge history.
201
152
         |      |          |
202
153
         +------+          |
203
154
         |      |          |
204
 
        rev-3  rev-1_1_2  rev-1_2_1 ------+
 
155
        rev-3  rev-1_1_2  rev-1_1_1_1_1 --+
205
156
         |      |          |              |
206
157
         +------+          |              |
207
158
         |                 |              |
208
 
        rev-4             rev-1_2_2  rev-1_3_1
 
159
        rev-4             rev-1_1_1_1_2  rev-1_1_1_1_1_1_1
209
160
         |                 |              |
210
161
         +-----------------+              |
211
162
         |                                |
215
166
         |
216
167
        rev-6
217
168
        """
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')
 
169
        tree1, tree2 = self.create_merged_trees()
 
170
 
 
171
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
 
172
 
 
173
        tree2.commit('noop', rev_id='rev-1_1_2')
 
174
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
 
175
        tree1.commit('noop merge', rev_id='rev-4')
 
176
 
 
177
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
 
178
        tree3.commit('four', rev_id='rev-1_1_1_1_1',
 
179
                     committer='jerry@foo.com',
 
180
                     timestamp=1166046003.00, timezone=0)
 
181
 
 
182
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
 
183
 
 
184
        tree3.commit('noop', rev_id='rev-1_1_1_1_2',
 
185
                     committer='jerry@foo.com',
 
186
                     timestamp=1166046004.00, timezone=0)
 
187
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
 
188
        tree1.commit('merge four', rev_id='rev-5')
 
189
 
 
190
        self.build_tree_contents([('tree4/a',
 
191
                                   'first\nthird\nfourth\nfifth\nsixth\n')])
 
192
        tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
 
193
                     committer='george@foo.com',
 
194
                     timestamp=1166046005.00, timezone=0)
 
195
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
 
196
        tree1.commit('merge five and six', rev_id='rev-6')
 
197
        return tree1
296
198
 
297
199
    def test_annotate_shows_dotted_revnos(self):
298
 
        builder = self.create_merged_trees()
299
 
 
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')
304
 
 
305
 
    def test_annotate_file(self):
306
 
        builder = self.create_merged_trees()
307
 
 
308
 
        to_file = StringIO()
309
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
310
 
            annotate.annotate_file, builder.get_branch(),
311
 
                'rev-3', 'a-id', to_file=to_file)
312
 
 
313
 
        self.assertAnnotateEqualDiff('1     joe@foo | first\n'
314
 
                                     '2     joe@foo | second\n'
315
 
                                     '1.1.1 barry@f | third\n',
316
 
                                     to_file.getvalue())
 
200
        tree1, tree2 = self.create_merged_trees()
 
201
 
 
202
        sio = StringIO()
 
203
        annotate.annotate_file(tree1.branch, 'rev-3', 'a-id',
 
204
                               to_file=sio)
 
205
        self.assertEqualDiff('1     joe@foo | first\n'
 
206
                             '2     joe@foo | second\n'
 
207
                             '1.1.1 barry@f | third\n',
 
208
                             sio.getvalue())
317
209
 
318
210
    def test_annotate_limits_dotted_revnos(self):
319
211
        """Annotate should limit dotted revnos to a depth of 12"""
320
 
        builder = self.create_deeply_merged_trees()
321
 
 
322
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
323
 
                                  '2     joe@foo | second\n'
324
 
                                  '1.1.1 barry@f | third\n'
325
 
                                  '1.2.1 jerry@f | fourth\n'
326
 
                                  '1.3.1 george@ | fifth\n'
327
 
                                  '              | sixth\n',
328
 
                                  builder.get_branch(), 'a-id', 'rev-6',
329
 
                                  verbose=False, full=False)
330
 
 
331
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
332
 
                                  '2     joe@foo | second\n'
333
 
                                  '1.1.1 barry@f | third\n'
334
 
                                  '1.2.1 jerry@f | fourth\n'
335
 
                                  '1.3.1 george@ | fifth\n'
336
 
                                  '1.3.1 george@ | sixth\n',
337
 
                                  builder.get_branch(), 'a-id', 'rev-6',
338
 
                                  verbose=False, full=True)
 
212
        tree1 = self.create_deeply_merged_trees()
 
213
 
 
214
        sio = StringIO()
 
215
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
216
                               to_file=sio, verbose=False, full=False)
 
217
        self.assertEqualDiff('1            joe@foo | first\n'
 
218
                             '2            joe@foo | second\n'
 
219
                             '1.1.1        barry@f | third\n'
 
220
                             '1.1.1.1.1    jerry@f | fourth\n'
 
221
                             '1.1.1.1.1.1> george@ | fifth\n'
 
222
                             '                     | sixth\n',
 
223
                             sio.getvalue())
 
224
 
 
225
        sio = StringIO()
 
226
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
227
                               to_file=sio, verbose=False, full=True)
 
228
        self.assertEqualDiff('1            joe@foo | first\n'
 
229
                             '2            joe@foo | second\n'
 
230
                             '1.1.1        barry@f | third\n'
 
231
                             '1.1.1.1.1    jerry@f | fourth\n'
 
232
                             '1.1.1.1.1.1> george@ | fifth\n'
 
233
                             '1.1.1.1.1.1> george@ | sixth\n',
 
234
                             sio.getvalue())
339
235
 
340
236
        # verbose=True shows everything, the full revno, user id, and date
341
 
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
342
 
                                  '2     joe@foo.com    20061213 | second\n'
343
 
                                  '1.1.1 barry@foo.com  20061213 | third\n'
344
 
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
345
 
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
346
 
                                  '                              | sixth\n',
347
 
                                  builder.get_branch(), 'a-id', 'rev-6',
348
 
                                  verbose=True, full=False)
 
237
        sio = StringIO()
 
238
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
239
                               to_file=sio, verbose=True, full=False)
 
240
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
241
                             '2             joe@foo.com    20061213 | second\n'
 
242
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
243
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
244
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
 
245
                             '                                      | sixth\n',
 
246
                             sio.getvalue())
349
247
 
350
 
        self.assertBranchAnnotate('1     joe@foo.com    20061213 | first\n'
351
 
                                  '2     joe@foo.com    20061213 | second\n'
352
 
                                  '1.1.1 barry@foo.com  20061213 | third\n'
353
 
                                  '1.2.1 jerry@foo.com  20061213 | fourth\n'
354
 
                                  '1.3.1 george@foo.com 20061213 | fifth\n'
355
 
                                  '1.3.1 george@foo.com 20061213 | sixth\n',
356
 
                                  builder.get_branch(), 'a-id', 'rev-6',
357
 
                                  verbose=True, full=True)
 
248
        sio = StringIO()
 
249
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
250
                               to_file=sio, verbose=True, full=True)
 
251
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
252
                             '2             joe@foo.com    20061213 | second\n'
 
253
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
254
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
255
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
 
256
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | sixth\n',
 
257
                             sio.getvalue())
358
258
 
359
259
    def test_annotate_uses_branch_context(self):
360
260
        """Dotted revnos should use the Branch context.
362
262
        When annotating a non-mainline revision, the annotation should still
363
263
        use dotted revnos from the mainline.
364
264
        """
365
 
        builder = self.create_deeply_merged_trees()
 
265
        tree1 = self.create_deeply_merged_trees()
366
266
 
367
 
        self.assertBranchAnnotate('1     joe@foo | first\n'
368
 
                                  '1.1.1 barry@f | third\n'
369
 
                                  '1.2.1 jerry@f | fourth\n'
370
 
                                  '1.3.1 george@ | fifth\n'
371
 
                                  '              | sixth\n',
372
 
                                  builder.get_branch(), 'a-id', 'rev-1_3_1',
373
 
                                  verbose=False, full=False)
 
267
        sio = StringIO()
 
268
        annotate.annotate_file(tree1.branch, 'rev-1_1_1_1_1_1_1', 'a-id',
 
269
                               to_file=sio, verbose=False, full=False)
 
270
        self.assertEqualDiff('1            joe@foo | first\n'
 
271
                             '1.1.1        barry@f | third\n'
 
272
                             '1.1.1.1.1    jerry@f | fourth\n'
 
273
                             '1.1.1.1.1.1> george@ | fifth\n'
 
274
                             '                     | sixth\n',
 
275
                             sio.getvalue())
374
276
 
375
277
    def test_annotate_show_ids(self):
376
 
        builder = self.create_deeply_merged_trees()
 
278
        tree1 = self.create_deeply_merged_trees()
 
279
 
 
280
        sio = StringIO()
 
281
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
282
                               to_file=sio, show_ids=True, full=False)
377
283
 
378
284
        # It looks better with real revision ids :)
379
 
        self.assertBranchAnnotate('    rev-1 | first\n'
380
 
                                  '    rev-2 | second\n'
381
 
                                  'rev-1_1_1 | third\n'
382
 
                                  'rev-1_2_1 | fourth\n'
383
 
                                  'rev-1_3_1 | fifth\n'
384
 
                                  '          | sixth\n',
385
 
                                  builder.get_branch(), 'a-id', 'rev-6',
386
 
                                  show_ids=True, full=False)
387
 
 
388
 
        self.assertBranchAnnotate('    rev-1 | first\n'
389
 
                                  '    rev-2 | second\n'
390
 
                                  'rev-1_1_1 | third\n'
391
 
                                  'rev-1_2_1 | fourth\n'
392
 
                                  'rev-1_3_1 | fifth\n'
393
 
                                  'rev-1_3_1 | sixth\n',
394
 
                                  builder.get_branch(), 'a-id', 'rev-6',
395
 
                                  show_ids=True, full=True)
 
285
        self.assertEqualDiff('            rev-1 | first\n'
 
286
                             '            rev-2 | second\n'
 
287
                             '        rev-1_1_1 | third\n'
 
288
                             '    rev-1_1_1_1_1 | fourth\n'
 
289
                             'rev-1_1_1_1_1_1_1 | fifth\n'
 
290
                             '                  | sixth\n',
 
291
                             sio.getvalue())
 
292
 
 
293
        sio = StringIO()
 
294
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
 
295
                               to_file=sio, show_ids=True, full=True)
 
296
 
 
297
        self.assertEqualDiff('            rev-1 | first\n'
 
298
                             '            rev-2 | second\n'
 
299
                             '        rev-1_1_1 | third\n'
 
300
                             '    rev-1_1_1_1_1 | fourth\n'
 
301
                             'rev-1_1_1_1_1_1_1 | fifth\n'
 
302
                             'rev-1_1_1_1_1_1_1 | sixth\n',
 
303
                             sio.getvalue())
396
304
 
397
305
    def test_annotate_unicode_author(self):
398
306
        tree1 = self.make_branch_and_tree('tree1')
409
317
                     committer=u'p\xe9rez',
410
318
                     timestamp=1166046000.00, timezone=0)
411
319
 
412
 
        tree1.lock_read()
413
 
        self.addCleanup(tree1.unlock)
414
 
 
415
 
        revtree_1 = tree1.branch.repository.revision_tree('rev-1')
416
 
        revtree_2 = tree1.branch.repository.revision_tree('rev-2')
417
 
 
418
320
        # this passes if no exception is raised
419
321
        to_file = StringIO()
420
 
        annotate.annotate_file_tree(revtree_1, 'a-id',
421
 
            to_file=to_file, branch=tree1.branch)
 
322
        annotate.annotate_file(tree1.branch, 'rev-1', 'a-id', to_file=to_file)
422
323
 
423
324
        sio = StringIO()
424
325
        to_file = codecs.getwriter('ascii')(sio)
425
326
        to_file.encoding = 'ascii' # codecs does not set it
426
 
        annotate.annotate_file_tree(revtree_2, 'b-id',
427
 
            to_file=to_file, branch=tree1.branch)
 
327
        annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
428
328
        self.assertEqualDiff('2   p?rez   | bye\n', sio.getvalue())
429
329
 
430
330
        # test now with to_file.encoding = None
431
331
        to_file = tests.StringIOWrapper()
432
332
        to_file.encoding = None
433
 
        annotate.annotate_file_tree(revtree_2, 'b-id',
434
 
            to_file=to_file, branch=tree1.branch)
 
333
        annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
435
334
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
436
335
 
437
336
        # and when it does not exist
438
337
        to_file = StringIO()
439
 
        annotate.annotate_file_tree(revtree_2, 'b-id',
440
 
            to_file=to_file, branch=tree1.branch)
 
338
        annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
441
339
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
442
340
 
443
 
    def test_annotate_author_or_committer(self):
444
 
        tree1 = self.make_branch_and_tree('tree1')
445
 
 
446
 
        self.build_tree_contents([('tree1/a', 'hello')])
447
 
        tree1.add(['a'], ['a-id'])
448
 
        tree1.commit('a', rev_id='rev-1',
449
 
                     committer='Committer <committer@example.com>',
450
 
                     timestamp=1166046000.00, timezone=0)
451
 
 
452
 
        self.build_tree_contents([('tree1/b', 'bye')])
453
 
        tree1.add(['b'], ['b-id'])
454
 
        tree1.commit('b', rev_id='rev-2',
455
 
                     committer='Committer <committer@example.com>',
456
 
                     authors=['Author <author@example.com>'],
457
 
                     timestamp=1166046000.00, timezone=0)
458
 
 
459
 
        tree1.lock_read()
460
 
        self.addCleanup(tree1.unlock)
461
 
 
462
 
        self.assertBranchAnnotate('1   committ | hello\n', tree1.branch,
463
 
            'a-id', 'rev-1')
464
 
 
465
 
        to_file = StringIO()
466
 
        self.assertBranchAnnotate('2   author@ | bye\n', tree1.branch,
467
 
            'b-id', 'rev-2')
468
 
 
469
341
 
470
342
class TestReannotate(tests.TestCase):
471
343
 
472
 
    def annotateEqual(self, expected, parents, newlines, revision_id,
473
 
                      blocks=None):
 
344
    def annotateEqual(self, expected, parents, newlines, revision_id):
474
345
        annotate_list = list(annotate.reannotate(parents, newlines,
475
 
                             revision_id, blocks))
 
346
                             revision_id))
476
347
        self.assertEqual(len(expected), len(annotate_list))
477
348
        for e, a in zip(expected, annotate_list):
478
349
            self.assertEqual(e, a)
480
351
    def test_reannotate(self):
481
352
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
482
353
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
483
 
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2,
 
354
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2, 
484
355
                           'blahblah')
485
 
 
486
 
    def test_reannotate_no_parents(self):
487
 
        self.annotateEqual(expected_1, [], new_1, 'blahblah')
488
 
 
489
 
    def test_reannotate_left_matching_blocks(self):
490
 
        """Ensure that left_matching_blocks has an impact.
491
 
 
492
 
        In this case, the annotation is ambiguous, so the hint isn't actually
493
 
        lying.
494
 
        """
495
 
        parent = [('rev1', 'a\n')]
496
 
        new_text = ['a\n', 'a\n']
497
 
        blocks = [(0, 0, 1), (1, 2, 0)]
498
 
        self.annotateEqual([('rev1', 'a\n'), ('rev2', 'a\n')], [parent],
499
 
                           new_text, 'rev2', blocks)
500
 
        blocks = [(0, 1, 1), (1, 2, 0)]
501
 
        self.annotateEqual([('rev2', 'a\n'), ('rev1', 'a\n')], [parent],
502
 
                           new_text, 'rev2', blocks)