← 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-12-20 16:16:34 UTC
  • mfrom: (3123.5.18 hardlinks)
  • Revision ID: pqm@pqm.ubuntu.com-20071220161634-2kcjb650o21ydko4
Accelerate build_tree using similar workingtrees (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
107
107
""".splitlines(True)
108
108
 
109
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
 
 
166
110
class TestAnnotate(tests.TestCaseWithTransport):
167
111
 
168
112
    def create_merged_trees(self):
184
128
                     committer="joe@foo.com",
185
129
                     timestamp=1166046000.00, timezone=0)
186
130
 
187
 
        tree2 = tree1.bzrdir.sprout('tree2').open_workingtree()
 
131
        tree2 = tree1.bzrdir.clone('tree2').open_workingtree()
188
132
 
189
133
        self.build_tree_contents([('tree1/a', 'first\nsecond\n')])
190
134
        tree1.commit('b', rev_id='rev-2',
218
162
         |      |          |
219
163
         +------+          |
220
164
         |      |          |
221
 
        rev-3  rev-1_1_2  rev-1_2_1 ------+
 
165
        rev-3  rev-1_1_2  rev-1_1_1_1_1 --+
222
166
         |      |          |              |
223
167
         +------+          |              |
224
168
         |                 |              |
225
 
        rev-4             rev-1_2_2  rev-1_3_1
 
169
        rev-4             rev-1_1_1_1_2  rev-1_1_1_1_1_1_1
226
170
         |                 |              |
227
171
         +-----------------+              |
228
172
         |                                |
235
179
        tree1, tree2 = self.create_merged_trees()
236
180
        tree1.unlock()
237
181
 
238
 
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
 
182
        tree3 = tree2.bzrdir.clone('tree3').open_workingtree()
239
183
 
240
184
        tree2.commit('noop', rev_id='rev-1_1_2')
241
185
        self.assertEqual(0, tree1.merge_from_branch(tree2.branch))
242
186
        tree1.commit('noop merge', rev_id='rev-4')
243
187
 
244
188
        self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
245
 
        tree3.commit('four', rev_id='rev-1_2_1',
 
189
        tree3.commit('four', rev_id='rev-1_1_1_1_1',
246
190
                     committer='jerry@foo.com',
247
191
                     timestamp=1166046003.00, timezone=0)
248
192
 
249
 
        tree4 = tree3.bzrdir.sprout('tree4').open_workingtree()
 
193
        tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
250
194
 
251
 
        tree3.commit('noop', rev_id='rev-1_2_2',
 
195
        tree3.commit('noop', rev_id='rev-1_1_1_1_2',
252
196
                     committer='jerry@foo.com',
253
197
                     timestamp=1166046004.00, timezone=0)
254
198
        self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
256
200
 
257
201
        self.build_tree_contents([('tree4/a',
258
202
                                   'first\nthird\nfourth\nfifth\nsixth\n')])
259
 
        tree4.commit('five and six', rev_id='rev-1_3_1',
 
203
        tree4.commit('five and six', rev_id='rev-1_1_1_1_1_1_1',
260
204
                     committer='george@foo.com',
261
205
                     timestamp=1166046005.00, timezone=0)
262
206
        self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
264
208
        tree1.lock_read()
265
209
        return tree1
266
210
 
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')
320
 
 
321
211
    def test_annotate_shows_dotted_revnos(self):
322
212
        tree1, tree2 = self.create_merged_trees()
323
213
 
336
226
        sio = StringIO()
337
227
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
338
228
                               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',
 
229
        self.assertEqualDiff('1            joe@foo | first\n'
 
230
                             '2            joe@foo | second\n'
 
231
                             '1.1.1        barry@f | third\n'
 
232
                             '1.1.1.1.1    jerry@f | fourth\n'
 
233
                             '1.1.1.1.1.1> george@ | fifth\n'
 
234
                             '                     | sixth\n',
345
235
                             sio.getvalue())
346
236
 
347
237
        sio = StringIO()
348
238
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
349
239
                               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',
 
240
        self.assertEqualDiff('1            joe@foo | first\n'
 
241
                             '2            joe@foo | second\n'
 
242
                             '1.1.1        barry@f | third\n'
 
243
                             '1.1.1.1.1    jerry@f | fourth\n'
 
244
                             '1.1.1.1.1.1> george@ | fifth\n'
 
245
                             '1.1.1.1.1.1> george@ | sixth\n',
356
246
                             sio.getvalue())
357
247
 
358
248
        # verbose=True shows everything, the full revno, user id, and date
359
249
        sio = StringIO()
360
250
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
361
251
                               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',
 
252
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
253
                             '2             joe@foo.com    20061213 | second\n'
 
254
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
255
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
256
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
 
257
                             '                                      | sixth\n',
368
258
                             sio.getvalue())
369
259
 
370
260
        sio = StringIO()
371
261
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
372
262
                               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',
 
263
        self.assertEqualDiff('1             joe@foo.com    20061213 | first\n'
 
264
                             '2             joe@foo.com    20061213 | second\n'
 
265
                             '1.1.1         barry@foo.com  20061213 | third\n'
 
266
                             '1.1.1.1.1     jerry@foo.com  20061213 | fourth\n'
 
267
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | fifth\n'
 
268
                             '1.1.1.1.1.1.1 george@foo.com 20061213 | sixth\n',
379
269
                             sio.getvalue())
380
270
 
381
271
    def test_annotate_uses_branch_context(self):
387
277
        tree1 = self.create_deeply_merged_trees()
388
278
 
389
279
        sio = StringIO()
390
 
        annotate.annotate_file(tree1.branch, 'rev-1_3_1', 'a-id',
 
280
        annotate.annotate_file(tree1.branch, 'rev-1_1_1_1_1_1_1', 'a-id',
391
281
                               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',
 
282
        self.assertEqualDiff('1            joe@foo | first\n'
 
283
                             '1.1.1        barry@f | third\n'
 
284
                             '1.1.1.1.1    jerry@f | fourth\n'
 
285
                             '1.1.1.1.1.1> george@ | fifth\n'
 
286
                             '                     | sixth\n',
397
287
                             sio.getvalue())
398
288
 
399
289
    def test_annotate_show_ids(self):
404
294
                               to_file=sio, show_ids=True, full=False)
405
295
 
406
296
        # 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',
 
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
                             '                  | sixth\n',
413
303
                             sio.getvalue())
414
304
 
415
305
        sio = StringIO()
416
306
        annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
417
307
                               to_file=sio, show_ids=True, full=True)
418
308
 
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',
 
309
        self.assertEqualDiff('            rev-1 | first\n'
 
310
                             '            rev-2 | second\n'
 
311
                             '        rev-1_1_1 | third\n'
 
312
                             '    rev-1_1_1_1_1 | fourth\n'
 
313
                             'rev-1_1_1_1_1_1_1 | fifth\n'
 
314
                             'rev-1_1_1_1_1_1_1 | sixth\n',
425
315
                             sio.getvalue())
426
316
 
427
317
    def test_annotate_unicode_author(self):