← 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: John Arbash Meinel
  • Date: 2008-09-26 22:14:42 UTC
  • mto: This revision was merged to the branch mainline in revision 3747.
  • Revision ID: john@arbash-meinel.com-20080926221442-3r67j99sr9rwe9w0
Make message optional, don't check the memory flag directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
87
87
e
88
88
""".splitlines(True)
89
89
 
 
90
expected_1 = annotation("""\
 
91
blahblah a
 
92
blahblah b
 
93
blahblah c
 
94
blahblah d
 
95
blahblah e
 
96
""")
 
97
 
90
98
 
91
99
new_2 = """\
92
100
a
99
107
""".splitlines(True)
100
108
 
101
109
 
 
110
# For the 'duplicate' series, both sides introduce the same change, which then
 
111
# gets merged around. The last-modified should properly reflect this.
 
112
# We always change the fourth line so that the file is properly tracked as
 
113
# being modified in each revision. In reality, this probably would happen over
 
114
# many revisions, and it would be a different line that changes.
 
115
# BASE
 
116
#  |\
 
117
#  A B  # line should be annotated as new for A and B
 
118
#  |\|
 
119
#  C D  # line should 'converge' and say A
 
120
#  |/
 
121
#  E    # D should supersede A and stay as D (not become E because C references
 
122
#         A)
 
123
duplicate_base = annotation("""\
 
124
rev-base first
 
125
rev-base second
 
126
rev-base third
 
127
rev-base fourth-base
 
128
""")
 
129
 
 
130
duplicate_A = annotation("""\
 
131
rev-base first
 
132
rev-A alt-second
 
133
rev-base third
 
134
rev-A fourth-A
 
135
""")
 
136
 
 
137
duplicate_B = annotation("""\
 
138
rev-base first
 
139
rev-B alt-second
 
140
rev-base third
 
141
rev-B fourth-B
 
142
""")
 
143
 
 
144
duplicate_C = annotation("""\
 
145
rev-base first
 
146
rev-A alt-second
 
147
rev-base third
 
148
rev-C fourth-C
 
149
""")
 
150
 
 
151
duplicate_D = annotation("""\
 
152
rev-base first
 
153
rev-A alt-second
 
154
rev-base third
 
155
rev-D fourth-D
 
156
""")
 
157
 
 
158
duplicate_E = annotation("""\
 
159
rev-base first
 
160
rev-A alt-second
 
161
rev-base third
 
162
rev-E fourth-E
 
163
""")
 
164
 
 
165
 
102
166
class TestAnnotate(tests.TestCaseWithTransport):
103
167
 
104
168
    def create_merged_trees(self):
120
184
                     committer="joe@foo.com",
121
185
                     timestamp=1166046000.00, timezone=0)
122
186
 
123
 
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
 
187
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
124
188
 
125
189
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
126
190
        tree1.commit('b', rev_id='rev-2',
141
205
        tree1.commit('merge 2', rev_id='rev-3',
142
206
                     committer='sal@foo.com',
143
207
                     timestamp=1166046003.00, timezone=0)
 
208
        tree1.lock_read()
 
209
        self.addCleanup(tree1.unlock)
144
210
        return tree1, tree2
145
211
 
146
212
    def create_deeply_merged_trees(self):
152
218
         |      |          |
153
219
         +------+          |
154
220
         |      |          |
155
 
        rev-3  rev-1_1_2  rev-1_1_1_1_1 --+
 
221
        rev-3  rev-1_1_2  rev-1_2_1 ------+
156
222
         |      |          |              |
157
223
         +------+          |              |
158
224
         |                 |              |
159
 
        rev-4             rev-1_1_1_1_2  rev-1_1_1_1_1_1_1
 
225
        rev-4             rev-1_2_2  rev-1_3_1
160
226
         |                 |              |
161
227
         +-----------------+              |
162
228
         |                                |
167
233
        rev-6
168
234
        """
169
235
        tree1, tree2 = self.create_merged_trees()
 
236
        tree1.unlock()
170
237
 
171
 
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
 
238
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
172
239
 
173
240
        tree2.commit('noop', rev_id='rev-1_1_2')
174
241
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
175
242
        tree1.commit('noop merge', rev_id='rev-4')
176
243
 
177
244
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
178
 
        tree3.commit('four', rev_id='rev-1_1_1_1_1',
 
245
        tree3.commit('four', rev_id='rev-1_2_1',
179
246
                     committer='jerry@foo.com',
180
247
                     timestamp=1166046003.00, timezone=0)
181
248
 
182
 
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
 
249
        tree4 = tree3.bzrdir.sprout('tree4').open_workingtree()
183
250
 
184
 
        tree3.commit('noop', rev_id='rev-1_1_1_1_2',
 
251
        tree3.commit('noop', rev_id='rev-1_2_2',
185
252
                     committer='jerry@foo.com',
186
253
                     timestamp=1166046004.00, timezone=0)
187
254
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
189
256
 
190
257
        self.build_tree_contents([('tree4/a',
191
258
                                   'first\nthird\nfourth\nfifth\nsixth\n')])
192
 
        tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
 
259
        tree4.commit('five and six', rev_id='rev-1_3_1',
193
260
                     committer='george@foo.com',
194
261
                     timestamp=1166046005.00, timezone=0)
195
262
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
196
263
        tree1.commit('merge five and six', rev_id='rev-6')
197
 
        return tree1
 
264
        tree1.lock_read()
 
265
        return tree1
 
266
 
 
267
    def create_duplicate_lines_tree(self):
 
268
        tree1 = self.make_branch_and_tree('tree1')
 
269
        base_text = ''.join(l for r, l in duplicate_base)
 
270
        a_text = ''.join(l for r, l in duplicate_A)
 
271
        b_text = ''.join(l for r, l in duplicate_B)
 
272
        c_text = ''.join(l for r, l in duplicate_C)
 
273
        d_text = ''.join(l for r, l in duplicate_D)
 
274
        e_text = ''.join(l for r, l in duplicate_E)
 
275
        self.build_tree_contents([('tree1/file', base_text)])
 
276
        tree1.add(['file'], ['file-id'])
 
277
        tree1.commit('base', rev_id='rev-base')
 
278
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
279
 
 
280
        self.build_tree_contents([('tree1/file', a_text),
 
281
                                  ('tree2/file', b_text)])
 
282
        tree1.commit('A', rev_id='rev-A')
 
283
        tree2.commit('B', rev_id='rev-B')
 
284
 
 
285
        tree2.merge_from_branch(tree1.branch)
 
286
        conflicts.resolve(tree2, None) # Resolve the conflicts
 
287
        self.build_tree_contents([('tree2/file', d_text)])
 
288
        tree2.commit('D', rev_id='rev-D')
 
289
 
 
290
        self.build_tree_contents([('tree1/file', c_text)])
 
291
        tree1.commit('C', rev_id='rev-C')
 
292
 
 
293
        tree1.merge_from_branch(tree2.branch)
 
294
        conflicts.resolve(tree1, None) # Resolve the conflicts
 
295
        self.build_tree_contents([('tree1/file', e_text)])
 
296
        tree1.commit('E', rev_id='rev-E')
 
297
        return tree1
 
298
 
 
299
    def assertRepoAnnotate(self, expected, repo, file_id, revision_id):
 
300
        """Assert that the revision is properly annotated."""
 
301
        actual = list(repo.revision_tree(revision_id).annotate_iter(file_id))
 
302
        if actual != expected:
 
303
            # Create an easier to understand diff when the lines don't actually
 
304
            # match
 
305
            self.assertEqualDiff(''.join('\t'.join(l) for l in expected),
 
306
                                 ''.join('\t'.join(l) for l in actual))
 
307
 
 
308
    def test_annotate_duplicate_lines(self):
 
309
        # XXX: Should this be a repository_implementations test?
 
310
        tree1 = self.create_duplicate_lines_tree()
 
311
        repo = tree1.branch.repository
 
312
        repo.lock_read()
 
313
        self.addCleanup(repo.unlock)
 
314
        self.assertRepoAnnotate(duplicate_base, repo, 'file-id', 'rev-base')
 
315
        self.assertRepoAnnotate(duplicate_A, repo, 'file-id', 'rev-A')
 
316
        self.assertRepoAnnotate(duplicate_B, repo, 'file-id', 'rev-B')
 
317
        self.assertRepoAnnotate(duplicate_C, repo, 'file-id', 'rev-C')
 
318
        self.assertRepoAnnotate(duplicate_D, repo, 'file-id', 'rev-D')
 
319
        self.assertRepoAnnotate(duplicate_E, repo, 'file-id', 'rev-E')
198
320
 
199
321
    def test_annotate_shows_dotted_revnos(self):
200
322
        tree1, tree2 = self.create_merged_trees()
214
336
        sio = StringIO()
215
337
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
216
338
                               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',
 
339
        self.assertEqualDiff('1     joe@foo | first\n'
 
340
                             '2     joe@foo | second\n'
 
341
                             '1.1.1 barry@f | third\n'
 
342
                             '1.2.1 jerry@f | fourth\n'
 
343
                             '1.3.1 george@ | fifth\n'
 
344
                             '              | sixth\n',
223
345
                             sio.getvalue())
224
346
 
225
347
        sio = StringIO()
226
348
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
227
349
                               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',
 
350
        self.assertEqualDiff('1     joe@foo | first\n'
 
351
                             '2     joe@foo | second\n'
 
352
                             '1.1.1 barry@f | third\n'
 
353
                             '1.2.1 jerry@f | fourth\n'
 
354
                             '1.3.1 george@ | fifth\n'
 
355
                             '1.3.1 george@ | sixth\n',
234
356
                             sio.getvalue())
235
357
 
236
358
        # verbose=True shows everything, the full revno, user id, and date
237
359
        sio = StringIO()
238
360
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
239
361
                               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',
 
362
        self.assertEqualDiff('1     joe@foo.com    20061213 | first\n'
 
363
                             '2     joe@foo.com    20061213 | second\n'
 
364
                             '1.1.1 barry@foo.com  20061213 | third\n'
 
365
                             '1.2.1 jerry@foo.com  20061213 | fourth\n'
 
366
                             '1.3.1 george@foo.com 20061213 | fifth\n'
 
367
                             '                              | sixth\n',
246
368
                             sio.getvalue())
247
369
 
248
370
        sio = StringIO()
249
371
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
250
372
                               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',
 
373
        self.assertEqualDiff('1     joe@foo.com    20061213 | first\n'
 
374
                             '2     joe@foo.com    20061213 | second\n'
 
375
                             '1.1.1 barry@foo.com  20061213 | third\n'
 
376
                             '1.2.1 jerry@foo.com  20061213 | fourth\n'
 
377
                             '1.3.1 george@foo.com 20061213 | fifth\n'
 
378
                             '1.3.1 george@foo.com 20061213 | sixth\n',
257
379
                             sio.getvalue())
258
380
 
259
381
    def test_annotate_uses_branch_context(self):
265
387
        tree1 = self.create_deeply_merged_trees()
266
388
 
267
389
        sio = StringIO()
268
 
        annotate.annotate_file(tree1.branch, 'rev-1_1_1_1_1_1_1', 'a-id',
 
390
        annotate.annotate_file(tree1.branch, 'rev-1_3_1', 'a-id',
269
391
                               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',
 
392
        self.assertEqualDiff('1     joe@foo | first\n'
 
393
                             '1.1.1 barry@f | third\n'
 
394
                             '1.2.1 jerry@f | fourth\n'
 
395
                             '1.3.1 george@ | fifth\n'
 
396
                             '              | sixth\n',
275
397
                             sio.getvalue())
276
398
 
277
399
    def test_annotate_show_ids(self):
282
404
                               to_file=sio, show_ids=True, full=False)
283
405
 
284
406
        # It looks better with real revision ids :)
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',
 
407
        self.assertEqualDiff('    rev-1 | first\n'
 
408
                             '    rev-2 | second\n'
 
409
                             'rev-1_1_1 | third\n'
 
410
                             'rev-1_2_1 | fourth\n'
 
411
                             'rev-1_3_1 | fifth\n'
 
412
                             '          | sixth\n',
291
413
                             sio.getvalue())
292
414
 
293
415
        sio = StringIO()
294
416
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
295
417
                               to_file=sio, show_ids=True, full=True)
296
418
 
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',
 
419
        self.assertEqualDiff('    rev-1 | first\n'
 
420
                             '    rev-2 | second\n'
 
421
                             'rev-1_1_1 | third\n'
 
422
                             'rev-1_2_1 | fourth\n'
 
423
                             'rev-1_3_1 | fifth\n'
 
424
                             'rev-1_3_1 | sixth\n',
303
425
                             sio.getvalue())
304
426
 
305
427
    def test_annotate_unicode_author(self):
317
439
                     committer=u'p\xe9rez',
318
440
                     timestamp=1166046000.00, timezone=0)
319
441
 
 
442
        tree1.lock_read()
 
443
        self.addCleanup(tree1.unlock)
320
444
        # this passes if no exception is raised
321
445
        to_file = StringIO()
322
446
        annotate.annotate_file(tree1.branch, 'rev-1', 'a-id', to_file=to_file)
338
462
        annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
339
463
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
340
464
 
 
465
    def test_annotate_author_or_committer(self):
 
466
        tree1 = self.make_branch_and_tree('tree1')
 
467
 
 
468
        self.build_tree_contents([('tree1/a', 'hello')])
 
469
        tree1.add(['a'], ['a-id'])
 
470
        tree1.commit('a', rev_id='rev-1',
 
471
                     committer='Committer <committer@example.com>',
 
472
                     timestamp=1166046000.00, timezone=0)
 
473
 
 
474
        self.build_tree_contents([('tree1/b', 'bye')])
 
475
        tree1.add(['b'], ['b-id'])
 
476
        tree1.commit('b', rev_id='rev-2',
 
477
                     committer='Committer <committer@example.com>',
 
478
                     author='Author <author@example.com>',
 
479
                     timestamp=1166046000.00, timezone=0)
 
480
 
 
481
        tree1.lock_read()
 
482
        self.addCleanup(tree1.unlock)
 
483
        to_file = StringIO()
 
484
        annotate.annotate_file(tree1.branch, 'rev-1', 'a-id', to_file=to_file)
 
485
        self.assertEqual('1   committ | hello\n', to_file.getvalue())
 
486
 
 
487
        to_file = StringIO()
 
488
        annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
 
489
        self.assertEqual('2   author@ | bye\n', to_file.getvalue())
 
490
 
341
491
 
342
492
class TestReannotate(tests.TestCase):
343
493
 
344
 
    def annotateEqual(self, expected, parents, newlines, revision_id):
 
494
    def annotateEqual(self, expected, parents, newlines, revision_id,
 
495
                      blocks=None):
345
496
        annotate_list = list(annotate.reannotate(parents, newlines,
346
 
                             revision_id))
 
497
                             revision_id, blocks))
347
498
        self.assertEqual(len(expected), len(annotate_list))
348
499
        for e, a in zip(expected, annotate_list):
349
500
            self.assertEqual(e, a)
353
504
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
354
505
        self.annotateEqual(expected_1_2_2, [parent_1, parent_2], new_2, 
355
506
                           'blahblah')
 
507
 
 
508
    def test_reannotate_no_parents(self):
 
509
        self.annotateEqual(expected_1, [], new_1, 'blahblah')
 
510
 
 
511
    def test_reannotate_left_matching_blocks(self):
 
512
        """Ensure that left_matching_blocks has an impact.
 
513
 
 
514
        In this case, the annotation is ambiguous, so the hint isn't actually
 
515
        lying.
 
516
        """
 
517
        parent = [('rev1', 'a\n')]
 
518
        new_text = ['a\n', 'a\n']
 
519
        blocks = [(0, 0, 1), (1, 2, 0)]
 
520
        self.annotateEqual([('rev1', 'a\n'), ('rev2', 'a\n')], [parent],
 
521
                           new_text, 'rev2', blocks)
 
522
        blocks = [(0, 1, 1), (1, 2, 0)]
 
523
        self.annotateEqual([('rev2', 'a\n'), ('rev1', 'a\n')], [parent],
 
524
                           new_text, 'rev2', blocks)