46
53
tree.commit(message='message2')
47
54
tree.add('meep.txt')
48
55
tree.commit(message='message3')
49
self.full_log = self.run_bzr(["log", path])[0]
58
def make_merged_branch(self, path='.', format=None):
59
tree = self.make_linear_branch(path, format)
60
tree2 = tree.bzrdir.sprout('tree2',
61
revision_id=tree.branch.get_rev_id(1)).open_workingtree()
62
tree2.commit(message='tree2 message2')
63
tree2.commit(message='tree2 message3')
64
tree.merge_from_branch(tree2.branch)
65
tree.commit(message='merge')
69
class TestLogWithLogCatcher(TestLog):
72
super(TestLogWithLogCatcher, self).setUp()
73
# Capture log formatter creations
74
class MyLogFormatter(test_log.LogCatcher):
76
def __new__(klass, *args, **kwargs):
77
self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
# Always return our own log formatter
79
return self.log_catcher
82
# Always return our own log formatter class hijacking the
83
# default behavior (which requires setting up a config
86
self.overrideAttr(log.log_formatter_registry, 'get_default', getme)
88
def get_captured_revisions(self):
89
return self.log_catcher.revisions
91
def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
self.run_bzr(['log'] + args, working_dir=working_dir)
93
self.assertEqual(expected_revnos,
94
[r.revno for r in self.get_captured_revisions()])
96
def assertLogRevnosAndDepths(self, args, expected_revnos_and_depths,
98
self.run_bzr(['log'] + args, working_dir=working_dir)
99
self.assertEqual(expected_revnos_and_depths,
100
[(r.revno, r.merge_depth)
101
for r in self.get_captured_revisions()])
104
class TestLogRevSpecs(TestLogWithLogCatcher):
106
def test_log_no_revspec(self):
107
self.make_linear_branch()
108
self.assertLogRevnos([], ['3', '2', '1'])
52
110
def test_log_null_end_revspec(self):
54
self.assertTrue('revno: 1\n' in self.full_log)
55
self.assertTrue('revno: 2\n' in self.full_log)
56
self.assertTrue('revno: 3\n' in self.full_log)
57
self.assertTrue('message:\n message1\n' in self.full_log)
58
self.assertTrue('message:\n message2\n' in self.full_log)
59
self.assertTrue('message:\n message3\n' in self.full_log)
61
log = self.run_bzr("log -r 1..")[0]
62
self.assertEqualDiff(log, self.full_log)
111
self.make_linear_branch()
112
self.assertLogRevnos(['-r1..'], ['3', '2', '1'])
64
114
def test_log_null_begin_revspec(self):
66
log = self.run_bzr("log -r ..3")[0]
67
self.assertEqualDiff(self.full_log, log)
115
self.make_linear_branch()
116
self.assertLogRevnos(['-r..3'], ['3', '2', '1'])
69
118
def test_log_null_both_revspecs(self):
71
log = self.run_bzr("log -r ..")[0]
72
self.assertEqualDiff(self.full_log, log)
119
self.make_linear_branch()
120
self.assertLogRevnos(['-r..'], ['3', '2', '1'])
122
def test_log_negative_begin_revspec_full_log(self):
123
self.make_linear_branch()
124
self.assertLogRevnos(['-r-3..'], ['3', '2', '1'])
126
def test_log_negative_both_revspec_full_log(self):
127
self.make_linear_branch()
128
self.assertLogRevnos(['-r-3..-1'], ['3', '2', '1'])
130
def test_log_negative_both_revspec_partial(self):
131
self.make_linear_branch()
132
self.assertLogRevnos(['-r-3..-2'], ['2', '1'])
134
def test_log_negative_begin_revspec(self):
135
self.make_linear_branch()
136
self.assertLogRevnos(['-r-2..'], ['3', '2'])
138
def test_log_positive_revspecs(self):
139
self.make_linear_branch()
140
self.assertLogRevnos(['-r1..3'], ['3', '2', '1'])
142
def test_log_dotted_revspecs(self):
143
self.make_merged_branch()
144
self.assertLogRevnos(['-n0', '-r1..1.1.1'], ['1.1.1', '1'])
146
def test_log_limit(self):
147
tree = self.make_branch_and_tree('.')
148
# We want more commits than our batch size starts at
149
for pos in range(10):
150
tree.commit("%s" % pos)
151
self.assertLogRevnos(['--limit', '2'], ['10', '9'])
153
def test_log_limit_short(self):
154
self.make_linear_branch()
155
self.assertLogRevnos(['-l', '2'], ['3', '2'])
157
def test_log_change_revno(self):
158
self.make_linear_branch()
159
self.assertLogRevnos(['-c1'], ['1'])
162
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
165
super(TestLogMergedLinearAncestry, self).setUp()
166
# FIXME: Using a MemoryTree would be even better here (but until we
167
# stop calling run_bzr, there is no point) --vila 100118.
168
builder = branchbuilder.BranchBuilder(self.get_transport())
169
builder.start_series()
171
builder.build_snapshot('1', None, [
172
('add', ('', 'root-id', 'directory', ''))])
173
builder.build_snapshot('2', ['1'], [])
175
builder.build_snapshot('1.1.1', ['1'], [])
176
# merge branch into mainline
177
builder.build_snapshot('3', ['2', '1.1.1'], [])
178
# new commits in branch
179
builder.build_snapshot('1.1.2', ['1.1.1'], [])
180
builder.build_snapshot('1.1.3', ['1.1.2'], [])
181
# merge branch into mainline
182
builder.build_snapshot('4', ['3', '1.1.3'], [])
183
# merge mainline into branch
184
builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
185
# merge branch into mainline
186
builder.build_snapshot('5', ['4', '1.1.4'], [])
187
builder.finish_series()
190
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
191
['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
192
def test_n0_forward(self):
193
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
194
['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
197
# starting from 1.1.4 we follow the left-hand ancestry
198
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4'],
199
['1.1.4', '1.1.3', '1.1.2', '1.1.1'])
201
def test_n1_forward(self):
202
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
203
['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
206
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
208
def make_branch_with_many_merges(self, path='.', format=None):
209
builder = branchbuilder.BranchBuilder(self.get_transport())
210
builder.start_series()
211
# The graph below may look a bit complicated (and it may be but I've
212
# banged my head enough on it) but the bug requires at least dotted
213
# revnos *and* merged revisions below that.
214
builder.build_snapshot('1', None, [
215
('add', ('', 'root-id', 'directory', ''))])
216
builder.build_snapshot('2', ['1'], [])
217
builder.build_snapshot('1.1.1', ['1'], [])
218
builder.build_snapshot('2.1.1', ['2'], [])
219
builder.build_snapshot('3', ['2', '1.1.1'], [])
220
builder.build_snapshot('2.1.2', ['2.1.1'], [])
221
builder.build_snapshot('2.2.1', ['2.1.1'], [])
222
builder.build_snapshot('2.1.3', ['2.1.2', '2.2.1'], [])
223
builder.build_snapshot('4', ['3', '2.1.3'], [])
224
builder.build_snapshot('5', ['4', '2.1.2'], [])
225
builder.finish_series()
228
def test_not_an_ancestor(self):
229
builder = self.make_branch_with_many_merges()
230
b = builder.get_branch()
232
self.addCleanup(b.unlock)
233
self.assertRaises(errors.BzrCommandError,
234
log._generate_all_revisions,
235
b, '1.1.1', '2.1.3', 'reverse',
236
delayed_graph_generation=True)
238
def test_wrong_order(self):
239
builder = self.make_branch_with_many_merges()
240
b = builder.get_branch()
242
self.addCleanup(b.unlock)
243
self.assertRaises(errors.BzrCommandError,
244
log._generate_all_revisions,
245
b, '5', '2.1.3', 'reverse',
246
delayed_graph_generation=True)
249
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
251
def test_log_revno_n_path_wrong_namespace(self):
252
self.make_linear_branch('branch1')
253
self.make_linear_branch('branch2')
254
# There is no guarantee that a path exist between two arbitrary
256
self.run_bzr("log -r revno:2:branch1..revno:3:branch2", retcode=3)
258
def test_log_revno_n_path_correct_order(self):
259
self.make_linear_branch('branch2')
260
self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
263
def test_log_revno_n_path(self):
264
self.make_linear_branch('branch2')
265
self.assertLogRevnos(['-rrevno:1:branch2'],
267
rev_props = self.log_catcher.revisions[0].rev.properties
268
self.assertEqual('branch2', rev_props['branch-nick'])
271
class TestLogErrors(TestLog):
74
273
def test_log_zero_revspec(self):
76
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
274
self.make_minimal_branch()
275
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
79
278
def test_log_zero_begin_revspec(self):
81
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
279
self.make_linear_branch()
280
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
82
281
['log', '-r0..2'])
84
283
def test_log_zero_end_revspec(self):
86
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
284
self.make_linear_branch()
285
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
87
286
['log', '-r-2..0'])
89
def test_log_unsupported_timezone(self):
91
self.run_bzr_error('bzr: ERROR: Unsupported timezone format "foo", '
92
'options are "utc", "original", "local".',
93
['log', '--timezone', 'foo'])
95
def test_log_negative_begin_revspec_full_log(self):
97
log = self.run_bzr("log -r -3..")[0]
98
self.assertEqualDiff(self.full_log, log)
100
def test_log_negative_both_revspec_full_log(self):
102
log = self.run_bzr("log -r -3..-1")[0]
103
self.assertEqualDiff(self.full_log, log)
105
def test_log_negative_both_revspec_partial(self):
107
log = self.run_bzr("log -r -3..-2")[0]
108
self.assertTrue('revno: 1\n' in log)
109
self.assertTrue('revno: 2\n' in log)
110
self.assertTrue('revno: 3\n' not in log)
112
def test_log_negative_begin_revspec(self):
114
log = self.run_bzr("log -r -2..")[0]
115
self.assertTrue('revno: 1\n' not in log)
116
self.assertTrue('revno: 2\n' in log)
117
self.assertTrue('revno: 3\n' in log)
119
def test_log_positive_revspecs(self):
121
log = self.run_bzr("log -r 1..3")[0]
122
self.assertEqualDiff(self.full_log, log)
124
def test_log_reversed_revspecs(self):
126
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
127
'the end revision.\n',),
130
def test_log_revno_n_path(self):
131
self._prepare(path='branch1')
132
self._prepare(path='branch2')
133
log = self.run_bzr("log -r revno:2:branch1..revno:3:branch2",
135
log = self.run_bzr("log -r revno:1:branch2..revno:3:branch2")[0]
136
self.assertEqualDiff(self.full_log, log)
137
log = self.run_bzr("log -r revno:1:branch2")[0]
138
self.assertTrue('revno: 1\n' in log)
139
self.assertTrue('revno: 2\n' not in log)
140
self.assertTrue('branch nick: branch2\n' in log)
141
self.assertTrue('branch nick: branch1\n' not in log)
143
288
def test_log_nonexistent_revno(self):
145
(out, err) = self.run_bzr_error(args="log -r 1234",
146
error_regexes=["bzr: ERROR: Requested revision: '1234' "
147
"does not exist in branch:"])
289
self.make_minimal_branch()
290
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
291
"does not exist in branch:"],
149
294
def test_log_nonexistent_dotted_revno(self):
151
(out, err) = self.run_bzr_error(args="log -r 123.123",
152
error_regexes=["bzr: ERROR: Requested revision: '123.123' "
153
"does not exist in branch:"])
155
def test_log_change_revno(self):
157
expected_log = self.run_bzr("log -r 1")[0]
158
log = self.run_bzr("log -c 1")[0]
159
self.assertEqualDiff(expected_log, log)
295
self.make_minimal_branch()
296
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
297
"does not exist in branch:"],
298
['log', '-r123.123'])
161
300
def test_log_change_nonexistent_revno(self):
163
(out, err) = self.run_bzr_error(args="log -c 1234",
164
error_regexes=["bzr: ERROR: Requested revision: '1234' "
165
"does not exist in branch:"])
301
self.make_minimal_branch()
302
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
303
"does not exist in branch:"],
167
306
def test_log_change_nonexistent_dotted_revno(self):
169
(out, err) = self.run_bzr_error(args="log -c 123.123",
170
error_regexes=["bzr: ERROR: Requested revision: '123.123' "
171
"does not exist in branch:"])
307
self.make_minimal_branch()
308
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
309
"does not exist in branch:"],
310
['log', '-c123.123'])
173
def test_log_change_single_revno(self):
175
self.run_bzr_error('bzr: ERROR: Option --change does not'
176
' accept revision ranges',
312
def test_log_change_single_revno_only(self):
313
self.make_minimal_branch()
314
self.run_bzr_error(['bzr: ERROR: Option --change does not'
315
' accept revision ranges'],
177
316
['log', '--change', '2..3'])
179
318
def test_log_change_incompatible_with_revision(self):
181
self.run_bzr_error('bzr: ERROR: --revision and --change'
182
' are mutually exclusive',
319
self.run_bzr_error(['bzr: ERROR: --revision and --change'
320
' are mutually exclusive'],
183
321
['log', '--change', '2', '--revision', '3'])
185
323
def test_log_nonexistent_file(self):
324
self.make_minimal_branch()
186
325
# files that don't exist in either the basis tree or working tree
187
326
# should give an error
188
wt = self.make_branch_and_tree('.')
189
327
out, err = self.run_bzr('log does-not-exist', retcode=3)
190
self.assertContainsRe(
191
err, 'Path unknown at end or start of revision range: does-not-exist')
328
self.assertContainsRe(err,
329
'Path unknown at end or start of revision range: '
332
def test_log_reversed_revspecs(self):
333
self.make_linear_branch()
334
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
335
'the end revision.\n',),
338
def test_log_reversed_dotted_revspecs(self):
339
self.make_merged_branch()
340
self.run_bzr_error(('bzr: ERROR: Start revision not found in '
341
'left-hand history of end revision.\n',),
344
def test_log_bad_message_re(self):
345
"""Bad --message argument gives a sensible message
347
See https://bugs.launchpad.net/bzr/+bug/251352
349
self.make_minimal_branch()
350
out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
351
self.assertEqual("bzr: ERROR: Invalid regular expression"
352
" in log message filter"
354
": nothing to repeat\n", err)
355
self.assertEqual('', out)
357
def test_log_unsupported_timezone(self):
358
self.make_linear_branch()
359
self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
360
'options are "utc", "original", "local".'],
361
['log', '--timezone', 'foo'])
364
class TestLogTags(TestLog):
193
366
def test_log_with_tags(self):
194
tree = self._prepare(format='dirstate-tags')
367
tree = self.make_linear_branch(format='dirstate-tags')
195
368
branch = tree.branch
196
369
branch.tags.set_tag('tag1', branch.get_rev_id(1))
197
370
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
282
429
self.assertUseLongDeltaFormat(['log', '--long', '-vv'])
285
class TestLogMerges(TestCaseWithoutPropsHandler):
288
parent_tree = self.make_branch_and_tree('parent')
289
parent_tree.commit(message='first post', allow_pointless=True)
290
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
291
child_tree.commit(message='branch 1', allow_pointless=True)
293
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
294
smaller_tree.commit(message='branch 2', allow_pointless=True)
295
child_tree.merge_from_branch(smaller_tree.branch)
296
child_tree.commit(message='merge branch 2')
297
parent_tree.merge_from_branch(child_tree.branch)
298
parent_tree.commit(message='merge branch 1')
301
def _prepare_short(self):
302
parent_tree = self.make_branch_and_tree('parent')
303
parent_tree.commit(message='first post',
304
timestamp=1132586700, timezone=36000,
305
committer='Joe Foo <joe@foo.com>')
306
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
307
child_tree.commit(message='branch 1',
308
timestamp=1132586800, timezone=36000,
309
committer='Joe Foo <joe@foo.com>')
311
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
312
smaller_tree.commit(message='branch 2',
313
timestamp=1132586900, timezone=36000,
314
committer='Joe Foo <joe@foo.com>')
315
child_tree.merge_from_branch(smaller_tree.branch)
316
child_tree.commit(message='merge branch 2',
317
timestamp=1132587000, timezone=36000,
318
committer='Joe Foo <joe@foo.com>')
319
parent_tree.merge_from_branch(child_tree.branch)
320
parent_tree.commit(message='merge branch 1',
321
timestamp=1132587100, timezone=36000,
322
committer='Joe Foo <joe@foo.com>')
432
class TestLogMerges(TestLogWithLogCatcher):
435
super(TestLogMerges, self).setUp()
436
self.make_branches_with_merges()
438
def make_branches_with_merges(self):
439
level0 = self.make_branch_and_tree('level0')
440
self.wt_commit(level0, 'in branch level0')
441
level1 = level0.bzrdir.sprout('level1').open_workingtree()
442
self.wt_commit(level1, 'in branch level1')
443
level2 = level1.bzrdir.sprout('level2').open_workingtree()
444
self.wt_commit(level2, 'in branch level2')
445
level1.merge_from_branch(level2.branch)
446
self.wt_commit(level1, 'merge branch level2')
447
level0.merge_from_branch(level1.branch)
448
self.wt_commit(level0, 'merge branch level1')
325
450
def test_merges_are_indented_by_level(self):
327
out,err = self.run_bzr('log')
328
self.assertEqual('', err)
329
log = normalize_log(out)
330
self.assertEqualDiff(log, """\
331
------------------------------------------------------------
333
committer: Lorem Ipsum <test@example.com>
338
------------------------------------------------------------
340
committer: Lorem Ipsum <test@example.com>
345
------------------------------------------------------------
347
committer: Lorem Ipsum <test@example.com>
348
branch nick: smallerchild
352
------------------------------------------------------------
354
committer: Lorem Ipsum <test@example.com>
359
------------------------------------------------------------
361
committer: Lorem Ipsum <test@example.com>
451
self.run_bzr(['log', '-n0'], working_dir='level0')
452
revnos_and_depth = [(r.revno, r.merge_depth)
453
for r in self.get_captured_revisions()]
454
self.assertEqual([('2', 0), ('1.1.2', 1), ('1.2.1', 2), ('1.1.1', 1),
456
[(r.revno, r.merge_depth)
457
for r in self.get_captured_revisions()])
368
459
def test_force_merge_revisions_off(self):
370
out,err = self.run_bzr('log --long -n1')
371
self.assertEqual('', err)
372
log = normalize_log(out)
373
self.assertEqualDiff(log, """\
374
------------------------------------------------------------
376
committer: Lorem Ipsum <test@example.com>
381
------------------------------------------------------------
383
committer: Lorem Ipsum <test@example.com>
460
self.assertLogRevnos(['-n1'], ['2', '1'], working_dir='level0')
390
462
def test_force_merge_revisions_on(self):
391
self._prepare_short()
392
out,err = self.run_bzr('log --short -n0')
393
self.assertEqual('', err)
394
log = normalize_log(out)
395
self.assertEqualDiff(log, """\
396
2 Joe Foo\t2005-11-22 [merge]
399
1.1.2 Joe Foo\t2005-11-22 [merge]
402
1.2.1 Joe Foo\t2005-11-22
405
1.1.1 Joe Foo\t2005-11-22
408
1 Joe Foo\t2005-11-22
463
self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
464
working_dir='level0')
466
def test_include_merges(self):
467
# Confirm --include-merges gives the same output as -n0
468
self.assertLogRevnos(['--include-merges'],
469
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
470
working_dir='level0')
471
self.assertLogRevnos(['--include-merges'],
472
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
473
working_dir='level0')
474
out_im, err_im = self.run_bzr('log --include-merges',
475
working_dir='level0')
476
out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
477
self.assertEqual('', err_im)
478
self.assertEqual('', err_n0)
479
self.assertEqual(out_im, out_n0)
413
481
def test_force_merge_revisions_N(self):
414
self._prepare_short()
415
out,err = self.run_bzr('log --short -n2')
416
self.assertEqual('', err)
417
log = normalize_log(out)
418
self.assertEqualDiff(log, """\
419
2 Joe Foo\t2005-11-22 [merge]
422
1.1.2 Joe Foo\t2005-11-22 [merge]
425
1.1.1 Joe Foo\t2005-11-22
428
1 Joe Foo\t2005-11-22
482
self.assertLogRevnos(['-n2'],
483
['2', '1.1.2', '1.1.1', '1'],
484
working_dir='level0')
433
486
def test_merges_single_merge_rev(self):
435
out,err = self.run_bzr('log -r1.1.2')
436
self.assertEqual('', err)
437
log = normalize_log(out)
438
self.assertEqualDiff(log, """\
439
------------------------------------------------------------
441
committer: Lorem Ipsum <test@example.com>
446
------------------------------------------------------------
448
committer: Lorem Ipsum <test@example.com>
449
branch nick: smallerchild
487
self.assertLogRevnosAndDepths(['-n0', '-r1.1.2'],
488
[('1.1.2', 0), ('1.2.1', 1)],
489
working_dir='level0')
455
491
def test_merges_partial_range(self):
457
out, err = self.run_bzr('log -r1.1.1..1.1.2')
458
self.assertEqual('', err)
459
log = normalize_log(out)
460
self.assertEqualDiff(log, """\
461
------------------------------------------------------------
463
committer: Lorem Ipsum <test@example.com>
468
------------------------------------------------------------
470
committer: Lorem Ipsum <test@example.com>
471
branch nick: smallerchild
475
------------------------------------------------------------
477
committer: Lorem Ipsum <test@example.com>
484
def test_merges_nonsupporting_formatter(self):
485
# This "feature" of log formatters is madness. If a log
486
# formatter cannot display a dotted-revno, it ought to ignore it.
487
# Otherwise, a linear sequence is always expected to be handled now.
488
raise KnownFailure('log formatters must support linear sequences now')
490
err_msg = 'Selected log formatter only supports mainline revisions.'
491
# The single revision case is tested in the core tests
492
# since all standard formatters support single merge revisions.
493
out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
494
self.assertContainsRe(err, err_msg)
495
out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)
496
self.assertContainsRe(err, err_msg)
499
def subst_dates(string):
500
"""Replace date strings with constant values."""
501
return re.sub(r'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-\+]\d{4}',
502
'YYYY-MM-DD HH:MM:SS +ZZZZ', string)
505
class TestLogDiff(TestCaseWithoutPropsHandler):
508
parent_tree = self.make_branch_and_tree('parent')
509
self.build_tree(['parent/file1', 'parent/file2'])
510
parent_tree.add('file1')
511
parent_tree.add('file2')
512
parent_tree.commit(message='first post',
513
timestamp=1132586655, timezone=36000,
514
committer='Lorem Ipsum <test@example.com>')
515
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
516
self.build_tree_contents([('child/file2', 'hello\n')])
517
child_tree.commit(message='branch 1',
518
timestamp=1132586700, timezone=36000,
519
committer='Lorem Ipsum <test@example.com>')
520
parent_tree.merge_from_branch(child_tree.branch)
521
parent_tree.commit(message='merge branch 1',
522
timestamp=1132586800, timezone=36000,
523
committer='Lorem Ipsum <test@example.com>')
526
def test_log_show_diff_long(self):
528
out,err = self.run_bzr('log -p')
529
self.assertEqual('', err)
530
log = normalize_log(out)
531
self.assertEqualDiff(subst_dates(log), """\
532
------------------------------------------------------------
534
committer: Lorem Ipsum <test@example.com>
540
=== modified file 'file2'
541
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
542
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
544
-contents of parent/file2
546
------------------------------------------------------------
548
committer: Lorem Ipsum <test@example.com>
554
=== modified file 'file2'
555
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
556
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
558
-contents of parent/file2
560
------------------------------------------------------------
562
committer: Lorem Ipsum <test@example.com>
568
=== added file 'file1'
569
--- file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
570
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
572
+contents of parent/file1
574
=== added file 'file2'
575
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
576
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
578
+contents of parent/file2
581
def test_log_show_diff_short(self):
492
self.assertLogRevnosAndDepths(
493
['-n0', '-r1.1.1..1.1.2'],
494
[('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
495
working_dir='level0')
497
def test_merges_partial_range_ignore_before_lower_bound(self):
498
"""Dont show revisions before the lower bound's merged revs"""
499
self.assertLogRevnosAndDepths(
500
['-n0', '-r1.1.2..2'],
501
[('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
502
working_dir='level0')
505
class TestLogDiff(TestLogWithLogCatcher):
507
# FIXME: We need specific tests for each LogFormatter about how the diffs
508
# are displayed: --long indent them by depth, --short use a fixed
509
# indent and --line does't display them. -- vila 10019
512
super(TestLogDiff, self).setUp()
513
self.make_branch_with_diffs()
515
def make_branch_with_diffs(self):
516
level0 = self.make_branch_and_tree('level0')
517
self.build_tree(['level0/file1', 'level0/file2'])
520
self.wt_commit(level0, 'in branch level0')
522
level1 = level0.bzrdir.sprout('level1').open_workingtree()
523
self.build_tree_contents([('level1/file2', 'hello\n')])
524
self.wt_commit(level1, 'in branch level1')
525
level0.merge_from_branch(level1.branch)
526
self.wt_commit(level0, 'merge branch level1')
528
def _diff_file1_revno1(self):
529
return """=== added file 'file1'
530
--- file1\t1970-01-01 00:00:00 +0000
531
+++ file1\t2005-11-22 00:00:00 +0000
533
+contents of level0/file1
537
def _diff_file2_revno2(self):
538
return """=== modified file 'file2'
539
--- file2\t2005-11-22 00:00:00 +0000
540
+++ file2\t2005-11-22 00:00:01 +0000
542
-contents of level0/file2
547
def _diff_file2_revno1_1_1(self):
548
return """=== modified file 'file2'
549
--- file2\t2005-11-22 00:00:00 +0000
550
+++ file2\t2005-11-22 00:00:01 +0000
552
-contents of level0/file2
557
def _diff_file2_revno1(self):
558
return """=== added file 'file2'
559
--- file2\t1970-01-01 00:00:00 +0000
560
+++ file2\t2005-11-22 00:00:00 +0000
562
+contents of level0/file2
566
def assertLogRevnosAndDiff(self, args, expected,
568
self.run_bzr(['log', '-p'] + args, working_dir=working_dir)
569
expected_revnos_and_depths = [
570
(revno, depth) for revno, depth, diff in expected]
571
# Check the revnos and depths first to make debugging easier
572
self.assertEqual(expected_revnos_and_depths,
573
[(r.revno, r.merge_depth)
574
for r in self.get_captured_revisions()])
575
# Now check the diffs, adding the revno in case of failure
576
fmt = 'In revno %s\n%s'
577
for expected_rev, actual_rev in izip(expected,
578
self.get_captured_revisions()):
579
revno, depth, expected_diff = expected_rev
580
actual_diff = actual_rev.diff
581
self.assertEqualDiff(fmt % (revno, expected_diff),
582
fmt % (revno, actual_diff))
584
def test_log_diff_with_merges(self):
585
self.assertLogRevnosAndDiff(
587
[('2', 0, self._diff_file2_revno2()),
588
('1.1.1', 1, self._diff_file2_revno1_1_1()),
589
('1', 0, self._diff_file1_revno1()
590
+ self._diff_file2_revno1())],
591
working_dir='level0')
594
def test_log_diff_file1(self):
595
self.assertLogRevnosAndDiff(['-n0', 'file1'],
596
[('1', 0, self._diff_file1_revno1())],
597
working_dir='level0')
599
def test_log_diff_file2(self):
600
self.assertLogRevnosAndDiff(['-n1', 'file2'],
601
[('2', 0, self._diff_file2_revno2()),
602
('1', 0, self._diff_file2_revno1())],
603
working_dir='level0')
606
class TestLogUnicodeDiff(TestLog):
608
def test_log_show_diff_non_ascii(self):
609
# Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
610
message = u'Message with \xb5'
611
body = 'Body with \xb5\n'
612
wt = self.make_branch_and_tree('.')
613
self.build_tree_contents([('foo', body)])
615
wt.commit(message=message)
616
# check that command won't fail with unicode error
617
# don't care about exact output because we have other tests for this
618
out,err = self.run_bzr('log -p --long')
619
self.assertNotEqual('', out)
620
self.assertEqual('', err)
583
621
out,err = self.run_bzr('log -p --short')
622
self.assertNotEqual('', out)
584
623
self.assertEqual('', err)
585
log = normalize_log(out)
586
self.assertEqualDiff(subst_dates(log), """\
587
2 Lorem Ipsum\t2005-11-22 [merge]
589
=== modified file 'file2'
590
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
591
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
593
-contents of parent/file2
596
1 Lorem Ipsum\t2005-11-22
598
=== added file 'file1'
599
--- file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
600
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
602
+contents of parent/file1
604
=== added file 'file2'
605
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
606
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
608
+contents of parent/file2
612
def test_log_show_diff_line(self):
614
624
out,err = self.run_bzr('log -p --line')
615
self.assertEqual('', err)
616
log = normalize_log(out)
617
# Not supported by this formatter so expect plain output
618
self.assertEqualDiff(subst_dates(log), """\
619
2: Lorem Ipsum 2005-11-22 merge branch 1
620
1: Lorem Ipsum 2005-11-22 first post
623
def test_log_show_diff_file(self):
624
"""Only the diffs for the given file are to be shown"""
626
out,err = self.run_bzr('log -p --short file2')
627
self.assertEqual('', err)
628
log = normalize_log(out)
629
self.assertEqualDiff(subst_dates(log), """\
630
2 Lorem Ipsum\t2005-11-22 [merge]
632
=== modified file 'file2'
633
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
634
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
636
-contents of parent/file2
639
1 Lorem Ipsum\t2005-11-22
641
=== added file 'file2'
642
--- file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
643
+++ file2\tYYYY-MM-DD HH:MM:SS +ZZZZ
645
+contents of parent/file2
648
out,err = self.run_bzr('log -p --short file1')
649
self.assertEqual('', err)
650
log = normalize_log(out)
651
self.assertEqualDiff(subst_dates(log), """\
652
1 Lorem Ipsum\t2005-11-22
654
=== added file 'file1'
655
--- file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
656
+++ file1\tYYYY-MM-DD HH:MM:SS +ZZZZ
658
+contents of parent/file1
663
class TestLogEncodings(TestCaseInTempDir):
625
self.assertNotEqual('', out)
626
self.assertEqual('', err)
629
class TestLogEncodings(tests.TestCaseInTempDir):
666
632
_message = u'Message with \xb5'
796
758
tree.commit('remove file1')
797
759
os.chdir('parent')
799
def test_log_file(self):
800
"""The log for a particular file should only list revs for that file"""
802
log = self.run_bzr('log file1')[0]
803
self.assertContainsRe(log, 'revno: 1\n')
804
self.assertNotContainsRe(log, 'revno: 2\n')
805
self.assertNotContainsRe(log, 'revno: 3\n')
806
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
807
self.assertNotContainsRe(log, 'revno: 4\n')
808
log = self.run_bzr('log file2')[0]
809
self.assertNotContainsRe(log, 'revno: 1\n')
810
self.assertContainsRe(log, 'revno: 2\n')
811
self.assertNotContainsRe(log, 'revno: 3\n')
812
self.assertContainsRe(log, 'revno: 3.1.1\n')
813
self.assertContainsRe(log, 'revno: 4\n')
814
log = self.run_bzr('log file3')[0]
815
self.assertNotContainsRe(log, 'revno: 1\n')
816
self.assertNotContainsRe(log, 'revno: 2\n')
817
self.assertContainsRe(log, 'revno: 3\n')
818
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
819
self.assertNotContainsRe(log, 'revno: 4\n')
820
log = self.run_bzr('log -r3.1.1 file2')[0]
821
self.assertNotContainsRe(log, 'revno: 1\n')
822
self.assertNotContainsRe(log, 'revno: 2\n')
823
self.assertNotContainsRe(log, 'revno: 3\n')
824
self.assertContainsRe(log, 'revno: 3.1.1\n')
825
self.assertNotContainsRe(log, 'revno: 4\n')
826
log = self.run_bzr('log -r4 file2')[0]
827
self.assertNotContainsRe(log, 'revno: 1\n')
828
self.assertNotContainsRe(log, 'revno: 2\n')
829
self.assertNotContainsRe(log, 'revno: 3\n')
830
self.assertContainsRe(log, 'revno: 3.1.1\n')
831
self.assertContainsRe(log, 'revno: 4\n')
832
log = self.run_bzr('log -r3.. file2')[0]
833
self.assertNotContainsRe(log, 'revno: 1\n')
834
self.assertNotContainsRe(log, 'revno: 2\n')
835
self.assertNotContainsRe(log, 'revno: 3\n')
836
self.assertContainsRe(log, 'revno: 3.1.1\n')
837
self.assertContainsRe(log, 'revno: 4\n')
838
log = self.run_bzr('log -r..3 file2')[0]
839
self.assertNotContainsRe(log, 'revno: 1\n')
840
self.assertContainsRe(log, 'revno: 2\n')
841
self.assertNotContainsRe(log, 'revno: 3\n')
842
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
843
self.assertNotContainsRe(log, 'revno: 4\n')
761
# FIXME: It would be good to parametrize the following tests against all
762
# formatters. But the revisions selection is not *currently* part of the
763
# LogFormatter contract, so using LogCatcher is sufficient -- vila 100118
764
def test_log_file1(self):
766
self.assertLogRevnos(['-n0', 'file1'], ['1'])
768
def test_log_file2(self):
771
self.assertLogRevnos(['-n0', 'file2'], ['4', '3.1.1', '2'])
772
# file2 in a merge revision
773
self.assertLogRevnos(['-n0', '-r3.1.1', 'file2'], ['3.1.1'])
774
# file2 in a mainline revision
775
self.assertLogRevnos(['-n0', '-r4', 'file2'], ['4', '3.1.1'])
776
# file2 since a revision
777
self.assertLogRevnos(['-n0', '-r3..', 'file2'], ['4', '3.1.1'])
778
# file2 up to a revision
779
self.assertLogRevnos(['-n0', '-r..3', 'file2'], ['2'])
781
def test_log_file3(self):
783
self.assertLogRevnos(['-n0', 'file3'], ['3'])
845
785
def test_log_file_historical_missing(self):
846
786
# Check logging a deleted file gives an error if the
884
812
self.assertContainsRe(err, err_msg)
886
814
# Check we can see a renamed file if we give the right end revision
887
log, err = self.run_bzr('log -r..4 file3')
888
self.assertEquals('', err)
889
self.assertNotContainsRe(log, 'revno: 1\n')
890
self.assertNotContainsRe(log, 'revno: 2\n')
891
self.assertContainsRe(log, 'revno: 3\n')
892
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
893
self.assertNotContainsRe(log, 'revno: 4\n')
895
def test_line_log_file(self):
896
"""The line log for a file should only list relevant mainline revs"""
897
# Note: this also implicitly covers the short logging case.
898
# We test using --line in preference to --short because matching
899
# revnos in the output of --line is more reliable.
902
# full history of file1
903
log = self.run_bzr('log --line file1')[0]
904
self.assertContainsRe(log, '^1:', re.MULTILINE)
905
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
906
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
907
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
908
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
910
# full history of file2
911
log = self.run_bzr('log --line file2')[0]
912
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
913
self.assertContainsRe(log, '^2:', re.MULTILINE)
914
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
915
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
916
self.assertContainsRe(log, '^4:', re.MULTILINE)
918
# full history of file3
919
log = self.run_bzr('log --line file3')[0]
920
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
921
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
922
self.assertContainsRe(log, '^3:', re.MULTILINE)
923
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
924
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
926
# file in a merge revision
927
log = self.run_bzr('log --line -r3.1.1 file2')[0]
928
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
929
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
930
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
931
self.assertContainsRe(log, '^3.1.1:', re.MULTILINE)
932
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
934
# file in a mainline revision
935
log = self.run_bzr('log --line -r4 file2')[0]
936
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
937
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
938
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
939
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
940
self.assertContainsRe(log, '^4:', re.MULTILINE)
942
# file since a revision
943
log = self.run_bzr('log --line -r3.. file2')[0]
944
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
945
self.assertNotContainsRe(log, '^2:', re.MULTILINE)
946
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
947
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
948
self.assertContainsRe(log, '^4:', re.MULTILINE)
950
# file up to a revision
951
log = self.run_bzr('log --line -r..3 file2')[0]
952
self.assertNotContainsRe(log, '^1:', re.MULTILINE)
953
self.assertContainsRe(log, '^2:', re.MULTILINE)
954
self.assertNotContainsRe(log, '^3:', re.MULTILINE)
955
self.assertNotContainsRe(log, '^3.1.1:', re.MULTILINE)
956
self.assertNotContainsRe(log, '^4:', re.MULTILINE)
815
self.assertLogRevnos(['-r..4', 'file3'], ['3'])
818
class TestLogMultiple(TestLogWithLogCatcher):
820
def prepare_tree(self):
821
tree = self.make_branch_and_tree('parent')
828
'parent/dir1/dir2/file3',
831
tree.commit('add file1')
833
tree.commit('add file2')
834
tree.add(['dir1', 'dir1/dir2', 'dir1/dir2/file3'])
835
tree.commit('add file3')
837
tree.commit('add file4')
838
tree.add('dir1/file5')
839
tree.commit('add file5')
840
child_tree = tree.bzrdir.sprout('child').open_workingtree()
841
self.build_tree_contents([('child/file2', 'hello')])
842
child_tree.commit(message='branch 1')
843
tree.merge_from_branch(child_tree.branch)
844
tree.commit(message='merge child branch')
847
def test_log_files(self):
848
"""The log for multiple file should only list revs for those files"""
850
self.assertLogRevnos(['file1', 'file2', 'dir1/dir2/file3'],
851
['6', '5.1.1', '3', '2', '1'])
853
def test_log_directory(self):
854
"""The log for a directory should show all nested files."""
856
self.assertLogRevnos(['dir1'], ['5', '3'])
858
def test_log_nested_directory(self):
859
"""The log for a directory should show all nested files."""
861
self.assertLogRevnos(['dir1/dir2'], ['3'])
863
def test_log_in_nested_directory(self):
864
"""The log for a directory should show all nested files."""
867
self.assertLogRevnos(['.'], ['5', '3'])
869
def test_log_files_and_directories(self):
870
"""Logging files and directories together should be fine."""
872
self.assertLogRevnos(['file4', 'dir1/dir2'], ['4', '3'])
874
def test_log_files_and_dirs_in_nested_directory(self):
875
"""The log for a directory should show all nested files."""
878
self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
added
removed
bzrlib/tests/blackbox/test_log.py
