← 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-08-09 15:19:06 UTC
  • mfrom: (2681.1.7 send-bundle)
  • Revision ID: pqm@pqm.ubuntu.com-20070809151906-hdn9oyslf2qib2op
Allow omitting -o for bundle, add --format

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
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
 
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
 
 
98
90
 
99
91
new_2 = """\
100
92
a
107
99
""".splitlines(True)
108
100
 
109
101
 
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
 
 
166
102
class TestAnnotate(tests.TestCaseWithTransport):
167
103
 
168
104
    def create_merged_trees(self):
184
120
                     committer="joe@foo.com",
185
121
                     timestamp=1166046000.00, timezone=0)
186
122
 
187
 
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
123
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
188
124
 
189
125
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
190
126
        tree1.commit('b', rev_id='rev-2',
205
141
        tree1.commit('merge 2', rev_id='rev-3',
206
142
                     committer='sal@foo.com',
207
143
                     timestamp=1166046003.00, timezone=0)
208
 
        tree1.lock_read()
209
 
        self.addCleanup(tree1.unlock)
210
144
        return tree1, tree2
211
145
 
212
146
    def create_deeply_merged_trees(self):
218
152
         |      |          |
219
153
         +------+          |
220
154
         |      |          |
221
 
        rev-3  rev-1_1_2  rev-1_2_1 ------+
 
155
        rev-3  rev-1_1_2  rev-1_1_1_1_1 --+
222
156
         |      |          |              |
223
157
         +------+          |              |
224
158
         |                 |              |
225
 
        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
226
160
         |                 |              |
227
161
         +-----------------+              |
228
162
         |                                |
233
167
        rev-6
234
168
        """
235
169
        tree1, tree2 = self.create_merged_trees()
236
 
        tree1.unlock()
237
170
 
238
 
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
171
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
239
172
 
240
173
        tree2.commit('noop', rev_id='rev-1_1_2')
241
174
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
242
175
        tree1.commit('noop merge', rev_id='rev-4')
243
176
 
244
177
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
245
 
        tree3.commit('four', rev_id='rev-1_2_1',
 
178
        tree3.commit('four', rev_id='rev-1_1_1_1_1',
246
179
                     committer='jerry@foo.com',
247
180
                     timestamp=1166046003.00, timezone=0)
248
181
 
249
 
        tree4 = tree3.bzrdir.sprout('tree4').open_workingtree()
 
182
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
250
183
 
251
 
        tree3.commit('noop', rev_id='rev-1_2_2',
 
184
        tree3.commit('noop', rev_id='rev-1_1_1_1_2',
252
185
                     committer='jerry@foo.com',
253
186
                     timestamp=1166046004.00, timezone=0)
254
187
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
256
189
 
257
190
        self.build_tree_contents([('tree4/a',
258
191
                                   'first\nthird\nfourth\nfifth\nsixth\n')])
259
 
        tree4.commit('five and six', rev_id='rev-1_3_1',
 
192
        tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
260
193
                     committer='george@foo.com',
261
194
                     timestamp=1166046005.00, timezone=0)
262
195
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
263
196
        tree1.commit('merge five and six', rev_id='rev-6')
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 per_repository 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')
 
197
        return tree1
320
198
 
321
199
    def test_annotate_shows_dotted_revnos(self):
322
200
        tree1, tree2 = self.create_merged_trees()
336
214
        sio = StringIO()
337
215
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
338
216
                               to_file=sio, verbose=False, full=False)
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',
 
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',
345
223
                             sio.getvalue())
346
224
 
347
225
        sio = StringIO()
348
226
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
349
227
                               to_file=sio, verbose=False, full=True)
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',
 
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',
356
234
                             sio.getvalue())
357
235
 
358
236
        # verbose=True shows everything, the full revno, user id, and date
359
237
        sio = StringIO()
360
238
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
361
239
                               to_file=sio, verbose=True, full=False)
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',
 
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',
368
246
                             sio.getvalue())
369
247
 
370
248
        sio = StringIO()
371
249
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
372
250
                               to_file=sio, verbose=True, full=True)
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',
 
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',
379
257
                             sio.getvalue())
380
258
 
381
259
    def test_annotate_uses_branch_context(self):
387
265
        tree1 = self.create_deeply_merged_trees()
388
266
 
389
267
        sio = StringIO()
390
 
        annotate.annotate_file(tree1.branch, 'rev-1_3_1', 'a-id',
 
268
        annotate.annotate_file(tree1.branch, 'rev-1_1_1_1_1_1_1', 'a-id',
391
269
                               to_file=sio, verbose=False, full=False)
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',
 
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',
397
275
                             sio.getvalue())
398
276
 
399
277
    def test_annotate_show_ids(self):
404
282
                               to_file=sio, show_ids=True, full=False)
405
283
 
406
284
        # It looks better with real revision ids :)
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',
 
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',
413
291
                             sio.getvalue())
414
292
 
415
293
        sio = StringIO()
416
294
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
417
295
                               to_file=sio, show_ids=True, full=True)
418
296
 
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',
 
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',
425
303
                             sio.getvalue())
426
304
 
427
305
    def test_annotate_unicode_author(self):
439
317
                     committer=u'p\xe9rez',
440
318
                     timestamp=1166046000.00, timezone=0)
441
319
 
442
 
        tree1.lock_read()
443
 
        self.addCleanup(tree1.unlock)
444
320
        # this passes if no exception is raised
445
321
        to_file = StringIO()
446
322
        annotate.annotate_file(tree1.branch, 'rev-1', 'a-id', to_file=to_file)
462
338
        annotate.annotate_file(tree1.branch, 'rev-2', 'b-id', to_file=to_file)
463
339
        self.assertContainsRe('2   p.rez   | bye\n', to_file.getvalue())
464
340
 
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
 
                     authors=['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
 
 
491
341
 
492
342
class TestReannotate(tests.TestCase):
493
343
 
494
 
    def annotateEqual(self, expected, parents, newlines, revision_id,
495
 
                      blocks=None):
 
344
    def annotateEqual(self, expected, parents, newlines, revision_id):
496
345
        annotate_list = list(annotate.reannotate(parents, newlines,
497
 
                             revision_id, blocks))
 
346
                             revision_id))
498
347
        self.assertEqual(len(expected), len(annotate_list))
499
348
        for e, a in zip(expected, annotate_list):
500
349
            self.assertEqual(e, a)
502
351
    def test_reannotate(self):
503
352
        self.annotateEqual(parent_1, [parent_1], new_1, 'blahblah')
504
353
        self.annotateEqual(expected_2_1, [parent_2], new_1, 'blahblah')
505
 
        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, 
506
355
                           '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)