52
45
tree.commit(message='message2')
53
46
tree.add('meep.txt')
54
47
tree.commit(message='message3')
57
def make_merged_branch(self, path='.', format=None):
58
tree = self.make_linear_branch(path, format)
59
tree2 = tree.bzrdir.sprout('tree2',
60
revision_id=tree.branch.get_rev_id(1)).open_workingtree()
61
tree2.commit(message='tree2 message2')
62
tree2.commit(message='tree2 message3')
63
tree.merge_from_branch(tree2.branch)
64
tree.commit(message='merge')
68
class TestLogWithLogCatcher(TestLog):
71
super(TestLogWithLogCatcher, self).setUp()
72
# Capture log formatter creations
73
class MyLogFormatter(test_log.LogCatcher):
75
def __new__(klass, *args, **kwargs):
76
self.log_catcher = test_log.LogCatcher(*args, **kwargs)
77
# Always return our own log formatter
78
return self.log_catcher
79
# Break cycle with closure over self on cleanup by removing method
80
self.addCleanup(setattr, MyLogFormatter, "__new__", None)
83
# Always return our own log formatter class hijacking the
84
# default behavior (which requires setting up a config
87
self.overrideAttr(log.log_formatter_registry, 'get_default', getme)
89
def get_captured_revisions(self):
90
return self.log_catcher.revisions
92
def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
93
self.run_bzr(['log'] + args, working_dir=working_dir)
94
self.assertEqual(expected_revnos,
95
[r.revno for r in self.get_captured_revisions()])
97
def assertLogRevnosAndDepths(self, args, expected_revnos_and_depths,
99
self.run_bzr(['log'] + args, working_dir=working_dir)
100
self.assertEqual(expected_revnos_and_depths,
101
[(r.revno, r.merge_depth)
102
for r in self.get_captured_revisions()])
105
class TestLogRevSpecs(TestLogWithLogCatcher):
107
def test_log_no_revspec(self):
108
self.make_linear_branch()
109
self.assertLogRevnos([], ['3', '2', '1'])
48
self.full_log = self.run_bzr(["log", path])[0]
111
51
def test_log_null_end_revspec(self):
112
self.make_linear_branch()
113
self.assertLogRevnos(['-r1..'], ['3', '2', '1'])
53
self.assertTrue('revno: 1\n' in self.full_log)
54
self.assertTrue('revno: 2\n' in self.full_log)
55
self.assertTrue('revno: 3\n' in self.full_log)
56
self.assertTrue('message:\n message1\n' in self.full_log)
57
self.assertTrue('message:\n message2\n' in self.full_log)
58
self.assertTrue('message:\n message3\n' in self.full_log)
60
log = self.run_bzr("log -r 1..")[0]
61
self.assertEqualDiff(log, self.full_log)
115
63
def test_log_null_begin_revspec(self):
116
self.make_linear_branch()
117
self.assertLogRevnos(['-r..3'], ['3', '2', '1'])
65
log = self.run_bzr("log -r ..3")[0]
66
self.assertEqualDiff(self.full_log, log)
119
68
def test_log_null_both_revspecs(self):
120
self.make_linear_branch()
121
self.assertLogRevnos(['-r..'], ['3', '2', '1'])
70
log = self.run_bzr("log -r ..")[0]
71
self.assertEqualDiff(self.full_log, log)
73
def test_log_zero_revspec(self):
75
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
78
def test_log_zero_begin_revspec(self):
80
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
83
def test_log_zero_end_revspec(self):
85
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
88
def test_log_unsupported_timezone(self):
90
self.run_bzr_error('bzr: ERROR: Unsupported timezone format "foo", '
91
'options are "utc", "original", "local".',
92
['log', '--timezone', 'foo'])
123
94
def test_log_negative_begin_revspec_full_log(self):
124
self.make_linear_branch()
125
self.assertLogRevnos(['-r-3..'], ['3', '2', '1'])
96
log = self.run_bzr("log -r -3..")[0]
97
self.assertEqualDiff(self.full_log, log)
127
99
def test_log_negative_both_revspec_full_log(self):
128
self.make_linear_branch()
129
self.assertLogRevnos(['-r-3..-1'], ['3', '2', '1'])
101
log = self.run_bzr("log -r -3..-1")[0]
102
self.assertEqualDiff(self.full_log, log)
131
104
def test_log_negative_both_revspec_partial(self):
132
self.make_linear_branch()
133
self.assertLogRevnos(['-r-3..-2'], ['2', '1'])
106
log = self.run_bzr("log -r -3..-2")[0]
107
self.assertTrue('revno: 1\n' in log)
108
self.assertTrue('revno: 2\n' in log)
109
self.assertTrue('revno: 3\n' not in log)
135
111
def test_log_negative_begin_revspec(self):
136
self.make_linear_branch()
137
self.assertLogRevnos(['-r-2..'], ['3', '2'])
113
log = self.run_bzr("log -r -2..")[0]
114
self.assertTrue('revno: 1\n' not in log)
115
self.assertTrue('revno: 2\n' in log)
116
self.assertTrue('revno: 3\n' in log)
139
118
def test_log_positive_revspecs(self):
140
self.make_linear_branch()
141
self.assertLogRevnos(['-r1..3'], ['3', '2', '1'])
143
def test_log_dotted_revspecs(self):
144
self.make_merged_branch()
145
self.assertLogRevnos(['-n0', '-r1..1.1.1'], ['1.1.1', '1'])
147
def test_log_limit(self):
148
tree = self.make_branch_and_tree('.')
149
# We want more commits than our batch size starts at
150
for pos in range(10):
151
tree.commit("%s" % pos)
152
self.assertLogRevnos(['--limit', '2'], ['10', '9'])
154
def test_log_limit_short(self):
155
self.make_linear_branch()
156
self.assertLogRevnos(['-l', '2'], ['3', '2'])
158
def test_log_change_revno(self):
159
self.make_linear_branch()
160
self.assertLogRevnos(['-c1'], ['1'])
162
def test_branch_revspec(self):
163
foo = self.make_branch_and_tree('foo')
164
bar = self.make_branch_and_tree('bar')
165
self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
168
foo.commit(message='foo')
169
bar.commit(message='bar')
170
self.run_bzr('log -r branch:../bar', working_dir='foo')
171
self.assertEqual([bar.branch.get_rev_id(1)],
173
for r in self.get_captured_revisions()])
176
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
178
def test_exclude_common_ancestry_simple_revnos(self):
179
self.make_linear_branch()
180
self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
184
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
187
super(TestLogMergedLinearAncestry, self).setUp()
188
# FIXME: Using a MemoryTree would be even better here (but until we
189
# stop calling run_bzr, there is no point) --vila 100118.
190
builder = branchbuilder.BranchBuilder(self.get_transport())
191
builder.start_series()
205
builder.build_snapshot('1', None, [
206
('add', ('', 'root-id', 'directory', ''))])
207
builder.build_snapshot('2', ['1'], [])
209
builder.build_snapshot('1.1.1', ['1'], [])
210
# merge branch into mainline
211
builder.build_snapshot('3', ['2', '1.1.1'], [])
212
# new commits in branch
213
builder.build_snapshot('1.1.2', ['1.1.1'], [])
214
builder.build_snapshot('1.1.3', ['1.1.2'], [])
215
# merge branch into mainline
216
builder.build_snapshot('4', ['3', '1.1.3'], [])
217
# merge mainline into branch
218
builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
219
# merge branch into mainline
220
builder.build_snapshot('5', ['4', '1.1.4'], [])
221
builder.finish_series()
224
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
225
['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
226
def test_n0_forward(self):
227
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
228
['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
231
# starting from 1.1.4 we follow the left-hand ancestry
232
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4'],
233
['1.1.4', '1.1.3', '1.1.2', '1.1.1'])
235
def test_n1_forward(self):
236
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
237
['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
240
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
243
super(Test_GenerateAllRevisions, self).setUp()
244
builder = self.make_branch_with_many_merges()
245
b = builder.get_branch()
247
self.addCleanup(b.unlock)
250
def make_branch_with_many_merges(self, path='.', format=None):
251
builder = branchbuilder.BranchBuilder(self.get_transport())
252
builder.start_series()
253
# The graph below may look a bit complicated (and it may be but I've
254
# banged my head enough on it) but the bug requires at least dotted
255
# revnos *and* merged revisions below that.
256
builder.build_snapshot('1', None, [
257
('add', ('', 'root-id', 'directory', ''))])
258
builder.build_snapshot('2', ['1'], [])
259
builder.build_snapshot('1.1.1', ['1'], [])
260
builder.build_snapshot('2.1.1', ['2'], [])
261
builder.build_snapshot('3', ['2', '1.1.1'], [])
262
builder.build_snapshot('2.1.2', ['2.1.1'], [])
263
builder.build_snapshot('2.2.1', ['2.1.1'], [])
264
builder.build_snapshot('2.1.3', ['2.1.2', '2.2.1'], [])
265
builder.build_snapshot('4', ['3', '2.1.3'], [])
266
builder.build_snapshot('5', ['4', '2.1.2'], [])
267
builder.finish_series()
270
def test_not_an_ancestor(self):
271
self.assertRaises(errors.BzrCommandError,
272
log._generate_all_revisions,
273
self.branch, '1.1.1', '2.1.3', 'reverse',
274
delayed_graph_generation=True)
276
def test_wrong_order(self):
277
self.assertRaises(errors.BzrCommandError,
278
log._generate_all_revisions,
279
self.branch, '5', '2.1.3', 'reverse',
280
delayed_graph_generation=True)
282
def test_no_start_rev_id_with_end_rev_id_being_a_merge(self):
283
revs = log._generate_all_revisions(
284
self.branch, None, '2.1.3',
285
'reverse', delayed_graph_generation=True)
288
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
290
def test_log_revno_n_path_wrong_namespace(self):
291
self.make_linear_branch('branch1')
292
self.make_linear_branch('branch2')
293
# There is no guarantee that a path exist between two arbitrary
295
self.run_bzr("log -r revno:2:branch1..revno:3:branch2", retcode=3)
297
def test_log_revno_n_path_correct_order(self):
298
self.make_linear_branch('branch2')
299
self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
120
log = self.run_bzr("log -r 1..3")[0]
121
self.assertEqualDiff(self.full_log, log)
123
def test_log_reversed_revspecs(self):
125
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
126
'the end revision.\n',),
302
129
def test_log_revno_n_path(self):
303
self.make_linear_branch('branch2')
304
self.assertLogRevnos(['-rrevno:1:branch2'],
306
rev_props = self.log_catcher.revisions[0].rev.properties
307
self.assertEqual('branch2', rev_props['branch-nick'])
310
class TestLogErrors(TestLog):
312
def test_log_zero_revspec(self):
313
self.make_minimal_branch()
314
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
317
def test_log_zero_begin_revspec(self):
318
self.make_linear_branch()
319
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
322
def test_log_zero_end_revspec(self):
323
self.make_linear_branch()
324
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
130
self._prepare(path='branch1')
131
self._prepare(path='branch2')
132
log = self.run_bzr("log -r revno:2:branch1..revno:3:branch2",
134
log = self.run_bzr("log -r revno:1:branch2..revno:3:branch2")[0]
135
self.assertEqualDiff(self.full_log, log)
136
log = self.run_bzr("log -r revno:1:branch2")[0]
137
self.assertTrue('revno: 1\n' in log)
138
self.assertTrue('revno: 2\n' not in log)
139
self.assertTrue('branch nick: branch2\n' in log)
140
self.assertTrue('branch nick: branch1\n' not in log)
327
142
def test_log_nonexistent_revno(self):
328
self.make_minimal_branch()
329
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
330
"does not exist in branch:"],
144
(out, err) = self.run_bzr_error(args="log -r 1234",
145
error_regexes=["bzr: ERROR: Requested revision: '1234' "
146
"does not exist in branch:"])
333
148
def test_log_nonexistent_dotted_revno(self):
334
self.make_minimal_branch()
335
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
336
"does not exist in branch:"],
337
['log', '-r123.123'])
150
(out, err) = self.run_bzr_error(args="log -r 123.123",
151
error_regexes=["bzr: ERROR: Requested revision: '123.123' "
152
"does not exist in branch:"])
154
def test_log_change_revno(self):
156
expected_log = self.run_bzr("log -r 1")[0]
157
log = self.run_bzr("log -c 1")[0]
158
self.assertEqualDiff(expected_log, log)
339
160
def test_log_change_nonexistent_revno(self):
340
self.make_minimal_branch()
341
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
342
"does not exist in branch:"],
162
(out, err) = self.run_bzr_error(args="log -c 1234",
163
error_regexes=["bzr: ERROR: Requested revision: '1234' "
164
"does not exist in branch:"])
345
166
def test_log_change_nonexistent_dotted_revno(self):
346
self.make_minimal_branch()
347
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
348
"does not exist in branch:"],
349
['log', '-c123.123'])
168
(out, err) = self.run_bzr_error(args="log -c 123.123",
169
error_regexes=["bzr: ERROR: Requested revision: '123.123' "
170
"does not exist in branch:"])
351
def test_log_change_single_revno_only(self):
352
self.make_minimal_branch()
353
self.run_bzr_error(['bzr: ERROR: Option --change does not'
354
' accept revision ranges'],
172
def test_log_change_single_revno(self):
174
self.run_bzr_error('bzr: ERROR: Option --change does not'
175
' accept revision ranges',
355
176
['log', '--change', '2..3'])
357
178
def test_log_change_incompatible_with_revision(self):
358
self.run_bzr_error(['bzr: ERROR: --revision and --change'
359
' are mutually exclusive'],
180
self.run_bzr_error('bzr: ERROR: --revision and --change'
181
' are mutually exclusive',
360
182
['log', '--change', '2', '--revision', '3'])
362
184
def test_log_nonexistent_file(self):
363
self.make_minimal_branch()
364
185
# files that don't exist in either the basis tree or working tree
365
186
# should give an error
187
wt = self.make_branch_and_tree('.')
366
188
out, err = self.run_bzr('log does-not-exist', retcode=3)
367
self.assertContainsRe(err,
368
'Path unknown at end or start of revision range: '
371
def test_log_reversed_revspecs(self):
372
self.make_linear_branch()
373
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
374
'the end revision.\n',),
377
def test_log_reversed_dotted_revspecs(self):
378
self.make_merged_branch()
379
self.run_bzr_error(('bzr: ERROR: Start revision not found in '
380
'left-hand history of end revision.\n',),
383
def test_log_bad_message_re(self):
384
"""Bad --message argument gives a sensible message
386
See https://bugs.launchpad.net/bzr/+bug/251352
388
self.make_minimal_branch()
389
out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
390
self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
391
self.assertNotContainsRe(err, "Unprintable exception")
392
self.assertEqual(out, '')
394
def test_log_unsupported_timezone(self):
395
self.make_linear_branch()
396
self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
397
'options are "utc", "original", "local".'],
398
['log', '--timezone', 'foo'])
400
def test_log_exclude_ancestry_no_range(self):
401
self.make_linear_branch()
402
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
403
' requires -r with two revisions'],
404
['log', '--exclude-common-ancestry'])
406
def test_log_exclude_ancestry_single_revision(self):
407
self.make_merged_branch()
408
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
409
' requires two different revisions'],
410
['log', '--exclude-common-ancestry',
413
class TestLogTags(TestLog):
189
self.assertContainsRe(
190
err, 'Path unknown at end or start of revision range: does-not-exist')
415
192
def test_log_with_tags(self):
416
tree = self.make_linear_branch(format='dirstate-tags')
193
tree = self._prepare(format='dirstate-tags')
417
194
branch = tree.branch
418
195
branch.tags.set_tag('tag1', branch.get_rev_id(1))
419
196
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
500
294
self.assertUseLongDeltaFormat(['log', '--long', '-vv'])
503
class TestLogMerges(TestLogWithLogCatcher):
506
super(TestLogMerges, self).setUp()
507
self.make_branches_with_merges()
509
def make_branches_with_merges(self):
510
level0 = self.make_branch_and_tree('level0')
511
self.wt_commit(level0, 'in branch level0')
512
level1 = level0.bzrdir.sprout('level1').open_workingtree()
513
self.wt_commit(level1, 'in branch level1')
514
level2 = level1.bzrdir.sprout('level2').open_workingtree()
515
self.wt_commit(level2, 'in branch level2')
516
level1.merge_from_branch(level2.branch)
517
self.wt_commit(level1, 'merge branch level2')
518
level0.merge_from_branch(level1.branch)
519
self.wt_commit(level0, 'merge branch level1')
297
class TestLogMerges(TestCaseWithoutPropsHandler):
300
parent_tree = self.make_branch_and_tree('parent')
301
parent_tree.commit(message='first post', allow_pointless=True)
302
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
303
child_tree.commit(message='branch 1', allow_pointless=True)
305
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
306
smaller_tree.commit(message='branch 2', allow_pointless=True)
307
child_tree.merge_from_branch(smaller_tree.branch)
308
child_tree.commit(message='merge branch 2')
309
parent_tree.merge_from_branch(child_tree.branch)
310
parent_tree.commit(message='merge branch 1')
313
def _prepare_short(self):
314
parent_tree = self.make_branch_and_tree('parent')
315
parent_tree.commit(message='first post',
316
timestamp=1132586700, timezone=36000,
317
committer='Joe Foo <joe@foo.com>')
318
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
319
child_tree.commit(message='branch 1',
320
timestamp=1132586800, timezone=36000,
321
committer='Joe Foo <joe@foo.com>')
323
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
324
smaller_tree.commit(message='branch 2',
325
timestamp=1132586900, timezone=36000,
326
committer='Joe Foo <joe@foo.com>')
327
child_tree.merge_from_branch(smaller_tree.branch)
328
child_tree.commit(message='merge branch 2',
329
timestamp=1132587000, timezone=36000,
330
committer='Joe Foo <joe@foo.com>')
331
parent_tree.merge_from_branch(child_tree.branch)
332
parent_tree.commit(message='merge branch 1',
333
timestamp=1132587100, timezone=36000,
334
committer='Joe Foo <joe@foo.com>')
521
337
def test_merges_are_indented_by_level(self):
522
self.run_bzr(['log', '-n0'], working_dir='level0')
523
revnos_and_depth = [(r.revno, r.merge_depth)
524
for r in self.get_captured_revisions()]
525
self.assertEqual([('2', 0), ('1.1.2', 1), ('1.2.1', 2), ('1.1.1', 1),
527
[(r.revno, r.merge_depth)
528
for r in self.get_captured_revisions()])
339
out,err = self.run_bzr('log -n0')
340
self.assertEqual('', err)
341
log = normalize_log(out)
342
self.assertEqualDiff(log, """\
343
------------------------------------------------------------
345
committer: Lorem Ipsum <test@example.com>
350
------------------------------------------------------------
352
committer: Lorem Ipsum <test@example.com>
357
------------------------------------------------------------
359
committer: Lorem Ipsum <test@example.com>
360
branch nick: smallerchild
364
------------------------------------------------------------
366
committer: Lorem Ipsum <test@example.com>
371
------------------------------------------------------------
373
committer: Lorem Ipsum <test@example.com>
530
380
def test_force_merge_revisions_off(self):
531
self.assertLogRevnos(['-n1'], ['2', '1'], working_dir='level0')
382
out,err = self.run_bzr('log --long -n1')
383
self.assertEqual('', err)
384
log = normalize_log(out)
385
self.assertEqualDiff(log, """\
386
------------------------------------------------------------
388
committer: Lorem Ipsum <test@example.com>
393
------------------------------------------------------------
395
committer: Lorem Ipsum <test@example.com>
533
402
def test_force_merge_revisions_on(self):
534
self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
535
working_dir='level0')
403
self._prepare_short()
404
out,err = self.run_bzr('log --short -n0')
405
self.assertEqual('', err)
406
log = normalize_log(out)
407
self.assertEqualDiff(log, """\
408
2 Joe Foo\t2005-11-22 [merge]
411
1.1.2 Joe Foo\t2005-11-22 [merge]
414
1.2.1 Joe Foo\t2005-11-22
417
1.1.1 Joe Foo\t2005-11-22
420
1 Joe Foo\t2005-11-22
537
425
def test_include_merges(self):
538
426
# Confirm --include-merges gives the same output as -n0
539
self.assertLogRevnos(['--include-merges'],
540
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
541
working_dir='level0')
542
self.assertLogRevnos(['--include-merges'],
543
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
544
working_dir='level0')
545
out_im, err_im = self.run_bzr('log --include-merges',
546
working_dir='level0')
547
out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
548
self.assertEqual('', err_im)
549
self.assertEqual('', err_n0)
427
self._prepare_short()
428
out_im, err_im = self.run_bzr('log --include-merges')
429
out_n0, err_n0 = self.run_bzr('log -n0')
430
self.assertEqual(err_im, err_n0)
550
431
self.assertEqual(out_im, out_n0)
552
433
def test_force_merge_revisions_N(self):
553
self.assertLogRevnos(['-n2'],
554
['2', '1.1.2', '1.1.1', '1'],
555
working_dir='level0')
434
self._prepare_short()
435
out,err = self.run_bzr('log --short -n2')
436
self.assertEqual('', err)
437
log = normalize_log(out)
438
self.assertEqualDiff(log, """\
439
2 Joe Foo\t2005-11-22 [merge]
442
1.1.2 Joe Foo\t2005-11-22 [merge]
445
1.1.1 Joe Foo\t2005-11-22
448
1 Joe Foo\t2005-11-22
557
453
def test_merges_single_merge_rev(self):
558
self.assertLogRevnosAndDepths(['-n0', '-r1.1.2'],
559
[('1.1.2', 0), ('1.2.1', 1)],
560
working_dir='level0')
455
out,err = self.run_bzr('log -n0 -r1.1.2')
456
self.assertEqual('', err)
457
log = normalize_log(out)
458
self.assertEqualDiff(log, """\
459
------------------------------------------------------------
461
committer: Lorem Ipsum <test@example.com>
466
------------------------------------------------------------
468
committer: Lorem Ipsum <test@example.com>
469
branch nick: smallerchild
562
475
def test_merges_partial_range(self):
563
self.assertLogRevnosAndDepths(
564
['-n0', '-r1.1.1..1.1.2'],
565
[('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
566
working_dir='level0')
568
def test_merges_partial_range_ignore_before_lower_bound(self):
569
"""Dont show revisions before the lower bound's merged revs"""
570
self.assertLogRevnosAndDepths(
571
['-n0', '-r1.1.2..2'],
572
[('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
573
working_dir='level0')
576
class TestLogDiff(TestLogWithLogCatcher):
578
# FIXME: We need specific tests for each LogFormatter about how the diffs
579
# are displayed: --long indent them by depth, --short use a fixed
580
# indent and --line does't display them. -- vila 10019
583
super(TestLogDiff, self).setUp()
584
self.make_branch_with_diffs()
586
def make_branch_with_diffs(self):
587
level0 = self.make_branch_and_tree('level0')
588
self.build_tree(['level0/file1', 'level0/file2'])
591
self.wt_commit(level0, 'in branch level0')
593
level1 = level0.bzrdir.sprout('level1').open_workingtree()
594
self.build_tree_contents([('level1/file2', 'hello\n')])
595
self.wt_commit(level1, 'in branch level1')
596
level0.merge_from_branch(level1.branch)
597
self.wt_commit(level0, 'merge branch level1')
599
def _diff_file1_revno1(self):
600
return """=== added file 'file1'
601
--- file1\t1970-01-01 00:00:00 +0000
602
+++ file1\t2005-11-22 00:00:00 +0000
604
+contents of level0/file1
608
def _diff_file2_revno2(self):
609
return """=== modified file 'file2'
610
--- file2\t2005-11-22 00:00:00 +0000
611
+++ file2\t2005-11-22 00:00:01 +0000
613
-contents of level0/file2
618
def _diff_file2_revno1_1_1(self):
619
return """=== modified file 'file2'
620
--- file2\t2005-11-22 00:00:00 +0000
621
+++ file2\t2005-11-22 00:00:01 +0000
623
-contents of level0/file2
628
def _diff_file2_revno1(self):
629
return """=== added file 'file2'
630
--- file2\t1970-01-01 00:00:00 +0000
631
+++ file2\t2005-11-22 00:00:00 +0000
633
+contents of level0/file2
637
def assertLogRevnosAndDiff(self, args, expected,
639
self.run_bzr(['log', '-p'] + args, working_dir=working_dir)
640
expected_revnos_and_depths = [
641
(revno, depth) for revno, depth, diff in expected]
642
# Check the revnos and depths first to make debugging easier
643
self.assertEqual(expected_revnos_and_depths,
644
[(r.revno, r.merge_depth)
645
for r in self.get_captured_revisions()])
646
# Now check the diffs, adding the revno in case of failure
647
fmt = 'In revno %s\n%s'
648
for expected_rev, actual_rev in izip(expected,
649
self.get_captured_revisions()):
650
revno, depth, expected_diff = expected_rev
651
actual_diff = actual_rev.diff
652
self.assertEqualDiff(fmt % (revno, expected_diff),
653
fmt % (revno, actual_diff))
655
def test_log_diff_with_merges(self):
656
self.assertLogRevnosAndDiff(
658
[('2', 0, self._diff_file2_revno2()),
659
('1.1.1', 1, self._diff_file2_revno1_1_1()),
660
('1', 0, self._diff_file1_revno1()
661
+ self._diff_file2_revno1())],
662
working_dir='level0')
665
def test_log_diff_file1(self):
666
self.assertLogRevnosAndDiff(['-n0', 'file1'],
667
[('1', 0, self._diff_file1_revno1())],
668
working_dir='level0')
670
def test_log_diff_file2(self):
671
self.assertLogRevnosAndDiff(['-n1', 'file2'],
672
[('2', 0, self._diff_file2_revno2()),
673
('1', 0, self._diff_file2_revno1())],
674
working_dir='level0')
677
class TestLogUnicodeDiff(TestLog):
477
out, err = self.run_bzr('log -n0 -r1.1.1..1.1.2')
478
self.assertEqual('', err)
479
log = normalize_log(out)
480
self.assertEqualDiff(log, """\
481
------------------------------------------------------------
483
committer: Lorem Ipsum <test@example.com>
488
------------------------------------------------------------
490
committer: Lorem Ipsum <test@example.com>
491
branch nick: smallerchild
495
------------------------------------------------------------
497
committer: Lorem Ipsum <test@example.com>
505
def subst_dates(string):
506
"""Replace date strings with constant values."""
507
return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}',
508
'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
511
class TestLogDiff(TestCaseWithoutPropsHandler):
514
parent_tree = self.make_branch_and_tree('parent')
515
self.build_tree(['parent/file1', 'parent/file2'])
516
parent_tree.add('file1')
517
parent_tree.add('file2')
518
parent_tree.commit(message='first post',
519
timestamp=1132586655, timezone=36000,
520
committer='Lorem Ipsum <test@example.com>')
521
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
522
self.build_tree_contents([('child/file2', 'hello\n')])
523
child_tree.commit(message='branch 1',
524
timestamp=1132586700, timezone=36000,
525
committer='Lorem Ipsum <test@example.com>')
526
parent_tree.merge_from_branch(child_tree.branch)
527
parent_tree.commit(message='merge branch 1',
528
timestamp=1132586800, timezone=36000,
529
committer='Lorem Ipsum <test@example.com>')
532
def test_log_show_diff_long_with_merges(self):
534
out,err = self.run_bzr('log -p -n0')
535
self.assertEqual('', err)
536
log = normalize_log(out)
537
self.assertEqualDiff(subst_dates(log), """\
538
------------------------------------------------------------
540
committer: Lorem Ipsum <test@example.com>
546
=== modified file 'file2'
547
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
548
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
550
-contents of parent/file2
552
------------------------------------------------------------
554
committer: Lorem Ipsum <test@example.com>
560
=== modified file 'file2'
561
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
562
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
564
-contents of parent/file2
566
------------------------------------------------------------
568
committer: Lorem Ipsum <test@example.com>
574
=== added file 'file1'
575
--- file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
576
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
578
+contents of parent/file1
580
=== added file 'file2'
581
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
582
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
584
+contents of parent/file2
587
def test_log_show_diff_short(self):
589
out,err = self.run_bzr('log -p --short')
590
self.assertEqual('', err)
591
log = normalize_log(out)
592
self.assertEqualDiff(subst_dates(log), """\
593
2 Lorem Ipsum\t2005-11-22 [merge]
595
=== modified file 'file2'
596
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
597
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
599
-contents of parent/file2
602
1 Lorem Ipsum\t2005-11-22
604
=== added file 'file1'
605
--- file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
606
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
608
+contents of parent/file1
609
\x20\x20\x20\x20\x20\x20
610
=== added file 'file2'
611
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
612
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
614
+contents of parent/file2
616
Use --include-merges or -n0 to see merged revisions.
619
def test_log_show_diff_line(self):
621
out,err = self.run_bzr('log -p --line')
622
self.assertEqual('', err)
623
log = normalize_log(out)
624
# Not supported by this formatter so expect plain output
625
self.assertEqualDiff(subst_dates(log), """\
626
2: Lorem Ipsum 2005-11-22 [merge] merge branch 1
627
1: Lorem Ipsum 2005-11-22 first post
630
def test_log_show_diff_file(self):
631
"""Only the diffs for the given file are to be shown"""
633
out,err = self.run_bzr('log -p --short file2')
634
self.assertEqual('', err)
635
log = normalize_log(out)
636
self.assertEqualDiff(subst_dates(log), """\
637
2 Lorem Ipsum\t2005-11-22 [merge]
639
=== modified file 'file2'
640
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
641
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
643
-contents of parent/file2
646
1 Lorem Ipsum\t2005-11-22
648
=== added file 'file2'
649
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
650
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
652
+contents of parent/file2
654
Use --include-merges or -n0 to see merged revisions.
656
out,err = self.run_bzr('log -p --short file1')
657
self.assertEqual('', err)
658
log = normalize_log(out)
659
self.assertEqualDiff(subst_dates(log), """\
660
1 Lorem Ipsum\t2005-11-22
662
=== added file 'file1'
663
--- file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
664
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
666
+contents of parent/file1
679
670
def test_log_show_diff_non_ascii(self):
680
671
# Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
829
824
tree.commit('remove file1')
830
825
os.chdir('parent')
832
# FIXME: It would be good to parametrize the following tests against all
833
# formatters. But the revisions selection is not *currently* part of the
834
# LogFormatter contract, so using LogCatcher is sufficient -- vila 100118
835
def test_log_file1(self):
837
self.assertLogRevnos(['-n0', 'file1'], ['1'])
839
def test_log_file2(self):
842
self.assertLogRevnos(['-n0', 'file2'], ['4', '3.1.1', '2'])
843
# file2 in a merge revision
844
self.assertLogRevnos(['-n0', '-r3.1.1', 'file2'], ['3.1.1'])
845
# file2 in a mainline revision
846
self.assertLogRevnos(['-n0', '-r4', 'file2'], ['4', '3.1.1'])
847
# file2 since a revision
848
self.assertLogRevnos(['-n0', '-r3..', 'file2'], ['4', '3.1.1'])
849
# file2 up to a revision
850
self.assertLogRevnos(['-n0', '-r..3', 'file2'], ['2'])
852
def test_log_file3(self):
854
self.assertLogRevnos(['-n0', 'file3'], ['3'])
827
def test_log_file(self):
828
"""The log for a particular file should only list revs for that file"""
830
log = self.run_bzr('log -n0 file1')[0]
831
self.assertContainsRe(log, 'revno: 1\n')
832
self.assertNotContainsRe(log, 'revno: 2\n')
833
self.assertNotContainsRe(log, 'revno: 3\n')
834
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
835
self.assertNotContainsRe(log, 'revno: 4 ')
836
log = self.run_bzr('log -n0 file2')[0]
837
self.assertNotContainsRe(log, 'revno: 1\n')
838
self.assertContainsRe(log, 'revno: 2\n')
839
self.assertNotContainsRe(log, 'revno: 3\n')
840
self.assertContainsRe(log, 'revno: 3.1.1\n')
841
self.assertContainsRe(log, 'revno: 4 ')
842
log = self.run_bzr('log -n0 file3')[0]
843
self.assertNotContainsRe(log, 'revno: 1\n')
844
self.assertNotContainsRe(log, 'revno: 2\n')
845
self.assertContainsRe(log, 'revno: 3\n')
846
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
847
self.assertNotContainsRe(log, 'revno: 4 ')
848
log = self.run_bzr('log -n0 -r3.1.1 file2')[0]
849
self.assertNotContainsRe(log, 'revno: 1\n')
850
self.assertNotContainsRe(log, 'revno: 2\n')
851
self.assertNotContainsRe(log, 'revno: 3\n')
852
self.assertContainsRe(log, 'revno: 3.1.1\n')
853
self.assertNotContainsRe(log, 'revno: 4 ')
854
log = self.run_bzr('log -n0 -r4 file2')[0]
855
self.assertNotContainsRe(log, 'revno: 1\n')
856
self.assertNotContainsRe(log, 'revno: 2\n')
857
self.assertNotContainsRe(log, 'revno: 3\n')
858
self.assertContainsRe(log, 'revno: 3.1.1\n')
859
self.assertContainsRe(log, 'revno: 4 ')
860
log = self.run_bzr('log -n0 -r3.. file2')[0]
861
self.assertNotContainsRe(log, 'revno: 1\n')
862
self.assertNotContainsRe(log, 'revno: 2\n')
863
self.assertNotContainsRe(log, 'revno: 3\n')
864
self.assertContainsRe(log, 'revno: 3.1.1\n')
865
self.assertContainsRe(log, 'revno: 4 ')
866
log = self.run_bzr('log -n0 -r..3 file2')[0]
867
self.assertNotContainsRe(log, 'revno: 1\n')
868
self.assertContainsRe(log, 'revno: 2\n')
869
self.assertNotContainsRe(log, 'revno: 3\n')
870
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
871
self.assertNotContainsRe(log, 'revno: 4 ')
856
873
def test_log_file_historical_missing(self):
857
874
# Check logging a deleted file gives an error if the
883
912
self.assertContainsRe(err, err_msg)
885
914
# Check we can see a renamed file if we give the right end revision
886
self.assertLogRevnos(['-r..4', 'file3'], ['3'])
889
class TestLogMultiple(TestLogWithLogCatcher):
915
log, err = self.run_bzr('log -r..4 file3')
916
self.assertEquals('', err)
917
self.assertNotContainsRe(log, 'revno: 1\n')
918
self.assertNotContainsRe(log, 'revno: 2\n')
919
self.assertContainsRe(log, 'revno: 3\n')
920
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
921
self.assertNotContainsRe(log, 'revno: 4 ')
923
def test_line_log_file(self):
924
"""The line log for a file should only list relevant mainline revs"""
925
# Note: this also implicitly covers the short logging case.
926
# We test using --line in preference to --short because matching
927
# revnos in the output of --line is more reliable.
930
# full history of file1
931
log = self.run_bzr('log --line file1')[0]
932
self.assertContainsRe(log, '^1:', re.MULTILINE)
933
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
934
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
935
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
936
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
938
# full history of file2
939
log = self.run_bzr('log --line file2')[0]
940
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
941
self.assertContainsRe(log, '^2:', re.MULTILINE)
942
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
943
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
944
self.assertContainsRe(log, '^4:', re.MULTILINE)
946
# full history of file3
947
log = self.run_bzr('log --line file3')[0]
948
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
949
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
950
self.assertContainsRe(log, '^3:', re.MULTILINE)
951
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
952
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
954
# file in a merge revision
955
log = self.run_bzr('log --line -r3.1.1 file2')[0]
956
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
957
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
958
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
959
self.assertContainsRe(log, '^3.1.1:', re.MULTILINE)
960
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
962
# file in a mainline revision
963
log = self.run_bzr('log --line -r4 file2')[0]
964
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
965
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
966
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
967
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
968
self.assertContainsRe(log, '^4:', re.MULTILINE)
970
# file since a revision
971
log = self.run_bzr('log --line -r3.. file2')[0]
972
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
973
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
974
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
975
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
976
self.assertContainsRe(log, '^4:', re.MULTILINE)
978
# file up to a revision
979
log = self.run_bzr('log --line -r..3 file2')[0]
980
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
981
self.assertContainsRe(log, '^2:', re.MULTILINE)
982
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
983
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
984
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
987
class TestLogMultiple(TestCaseWithTransport):
891
989
def prepare_tree(self):
892
990
tree = self.make_branch_and_tree('parent')
added
removed
bzrlib/tests/blackbox/test_log.py
