107
107
""".splitlines(True)
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.
117
# A B # line should be annotated as new for A and B
119
# C D # line should 'converge' and say D
121
# E # D should supersede A and stay as D (not become E because C references
123
duplicate_base = annotation("""\
130
duplicate_A = annotation("""\
137
duplicate_B = annotation("""\
144
duplicate_C = annotation("""\
151
duplicate_D = annotation("""\
158
duplicate_E = annotation("""\
110
166
class TestAnnotate(tests.TestCaseWithTransport):
112
168
def create_merged_trees(self):
186
242
tree1.commit('noop merge', rev_id='rev-4')
188
244
self.build_tree_contents([('tree3/a', 'first\nthird\nfourth\n')])
189
tree3.commit('four', rev_id='rev-1_1_1_1_1',
245
tree3.commit('four', rev_id='rev-1_2_1',
190
246
committer='jerry@foo.com',
191
247
timestamp=1166046003.00, timezone=0)
193
249
tree4 = tree3.bzrdir.clone('tree4').open_workingtree()
195
tree3.commit('noop', rev_id='rev-1_1_1_1_2',
251
tree3.commit('noop', rev_id='rev-1_2_2',
196
252
committer='jerry@foo.com',
197
253
timestamp=1166046004.00, timezone=0)
198
254
self.assertEqual(0, tree1.merge_from_branch(tree3.branch))
201
257
self.build_tree_contents([('tree4/a',
202
258
'first\nthird\nfourth\nfifth\nsixth\n')])
203
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',
204
260
committer='george@foo.com',
205
261
timestamp=1166046005.00, timezone=0)
206
262
self.assertEqual(0, tree1.merge_from_branch(tree4.branch))
208
264
tree1.lock_read()
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.clone('tree2').open_workingtree()
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')
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')
290
self.build_tree_contents([('tree1/file', c_text)])
291
tree1.commit('C', rev_id='rev-C')
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')
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
305
self.assertEqualDiff(''.join('\t'.join(l) for l in expected),
306
''.join('\t'.join(l) for l in actual))
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
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')
211
321
def test_annotate_shows_dotted_revnos(self):
212
322
tree1, tree2 = self.create_merged_trees()
227
337
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
228
338
to_file=sio, verbose=False, full=False)
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'
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'
238
348
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
239
349
to_file=sio, verbose=False, full=True)
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',
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',
248
358
# verbose=True shows everything, the full revno, user id, and date
250
360
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
251
361
to_file=sio, verbose=True, full=False)
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'
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'
261
371
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
262
372
to_file=sio, verbose=True, full=True)
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',
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',
271
381
def test_annotate_uses_branch_context(self):
277
387
tree1 = self.create_deeply_merged_trees()
280
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',
281
391
to_file=sio, verbose=False, full=False)
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'
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'
289
399
def test_annotate_show_ids(self):
294
404
to_file=sio, show_ids=True, full=False)
296
406
# It looks better with real revision ids :)
297
self.assertEqualDiff(' rev-1 | first\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'
407
self.assertEqualDiff(' rev-1 | first\n'
409
'rev-1_1_1 | third\n'
410
'rev-1_2_1 | fourth\n'
411
'rev-1_3_1 | fifth\n'
306
416
annotate.annotate_file(tree1.branch, 'rev-6', 'a-id',
307
417
to_file=sio, show_ids=True, full=True)
309
self.assertEqualDiff(' rev-1 | first\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',
419
self.assertEqualDiff(' rev-1 | first\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',
317
427
def test_annotate_unicode_author(self):
added
removed
bzrlib/tests/test_annotate.py
