1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
2
# -*- coding: utf-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Black-box tests for bzr log."""
23
from bzrlib import osutils
24
from bzrlib.tests.blackbox import ExternalBase
25
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
26
from bzrlib.tests.test_log import (
29
from bzrlib.tests import test_log
32
class TestCaseWithoutPropsHandler(ExternalBase,
33
test_log.TestCaseWithoutPropsHandler):
37
class TestLog(ExternalBase):
39
def _prepare(self, path='.', format=None):
40
tree = self.make_branch_and_tree(path, format=format)
42
[path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])
44
tree.commit(message='message1')
45
tree.add('goodbye.txt')
46
tree.commit(message='message2')
48
tree.commit(message='message3')
49
self.full_log = self.run_bzr(["log", path])[0]
52
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)
64
def test_log_null_begin_revspec(self):
66
log = self.run_bzr("log -r ..3")[0]
67
self.assertEqualDiff(self.full_log, log)
69
def test_log_null_both_revspecs(self):
71
log = self.run_bzr("log -r ..")[0]
72
self.assertEqualDiff(self.full_log, log)
74
def test_log_zero_revspec(self):
76
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
79
def test_log_zero_begin_revspec(self):
81
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
84
def test_log_zero_end_revspec(self):
86
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
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
def test_log_change_revno(self):
145
expected_log = self.run_bzr("log -r 1")[0]
146
log = self.run_bzr("log -c 1")[0]
147
self.assertEqualDiff(expected_log, log)
149
def test_log_change_single_revno(self):
151
self.run_bzr_error('bzr: ERROR: Option --change does not'
152
' accept revision ranges',
153
['log', '--change', '2..3'])
155
def test_log_change_incompatible_with_revision(self):
157
self.run_bzr_error('bzr: ERROR: --revision and --change'
158
' are mutually exclusive',
159
['log', '--change', '2', '--revision', '3'])
161
def test_log_nonexistent_file(self):
162
# files that don't exist in either the basis tree or working tree
163
# should give an error
164
wt = self.make_branch_and_tree('.')
165
out, err = self.run_bzr('log does-not-exist', retcode=3)
166
self.assertContainsRe(
167
err, 'Path does not have any revision history: does-not-exist')
169
def test_log_with_tags(self):
170
tree = self._prepare(format='dirstate-tags')
172
branch.tags.set_tag('tag1', branch.get_rev_id(1))
173
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
174
branch.tags.set_tag('tag3', branch.last_revision())
176
log = self.run_bzr("log -r-1")[0]
177
self.assertTrue('tags: tag3' in log)
179
log = self.run_bzr("log -r1")[0]
180
# I guess that we can't know the order of tags in the output
181
# since dicts are unordered, need to check both possibilities
182
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
184
def test_merged_log_with_tags(self):
185
branch1_tree = self._prepare(path='branch1', format='dirstate-tags')
186
branch1 = branch1_tree.branch
187
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
188
branch1_tree.commit(message='foobar', allow_pointless=True)
189
branch1.tags.set_tag('tag1', branch1.last_revision())
191
self.run_bzr('merge ../branch1') # tags don't propagate otherwise
192
branch2_tree.commit(message='merge branch 1')
193
log = self.run_bzr("log -r-1")[0]
194
self.assertContainsRe(log, r' tags: tag1')
195
log = self.run_bzr("log -r3.1.1")[0]
196
self.assertContainsRe(log, r'tags: tag1')
198
def test_log_limit(self):
199
tree = self.make_branch_and_tree('.')
200
# We want more commits than our batch size starts at
201
for pos in range(10):
202
tree.commit("%s" % pos)
203
log = self.run_bzr("log --limit 2")[0]
204
self.assertNotContainsRe(log, r'revno: 1\n')
205
self.assertNotContainsRe(log, r'revno: 2\n')
206
self.assertNotContainsRe(log, r'revno: 3\n')
207
self.assertNotContainsRe(log, r'revno: 4\n')
208
self.assertNotContainsRe(log, r'revno: 5\n')
209
self.assertNotContainsRe(log, r'revno: 6\n')
210
self.assertNotContainsRe(log, r'revno: 7\n')
211
self.assertNotContainsRe(log, r'revno: 8\n')
212
self.assertContainsRe(log, r'revno: 9\n')
213
self.assertContainsRe(log, r'revno: 10\n')
215
def test_log_limit_short(self):
217
log = self.run_bzr("log -l 2")[0]
218
self.assertNotContainsRe(log, r'revno: 1\n')
219
self.assertContainsRe(log, r'revno: 2\n')
220
self.assertContainsRe(log, r'revno: 3\n')
222
def test_log_short_verbose(self):
224
log = self.run_bzr(['log', '--short', '-v', '-r', '1'])[0]
225
# Check that we use the short status format and not the regular one
226
self.assertContainsRe(log, '(?m)^A hello.txt$')
227
self.assertNotContainsRe(log, '(?m)^added:$')
229
def test_log_short_verbose_verbose(self):
231
log = self.run_bzr(['log', '--short', '-vv', '-r', '1'])[0]
232
# Check that we use the long status format and not the short one
233
self.assertNotContainsRe(log, '(?m)^A hello.txt$')
234
self.assertContainsRe(log, '(?m)^added:$')
236
def test_log_long_verbose(self):
238
log = self.run_bzr(['log', '--long', '-v', '-r', '1'])[0]
239
# Check that we use the short status format and not the regular one
240
self.assertContainsRe(log, '(?m)^A hello.txt$')
241
self.assertNotContainsRe(log, '(?m)^added:$')
243
def test_log_long_verbose_verbose(self):
245
log = self.run_bzr(['log', '--long', '-vv', '-r', '1'])[0]
246
# Check that we use the long status format and not the short one
247
self.assertNotContainsRe(log, '(?m)^A hello.txt$')
248
self.assertContainsRe(log, '(?m)^added:$')
251
class TestLogMerges(TestCaseWithoutPropsHandler):
254
parent_tree = self.make_branch_and_tree('parent')
255
parent_tree.commit(message='first post', allow_pointless=True)
256
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
257
child_tree.commit(message='branch 1', allow_pointless=True)
259
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
260
smaller_tree.commit(message='branch 2', allow_pointless=True)
261
child_tree.merge_from_branch(smaller_tree.branch)
262
child_tree.commit(message='merge branch 2')
263
parent_tree.merge_from_branch(child_tree.branch)
264
parent_tree.commit(message='merge branch 1')
267
def test_merges_are_indented_by_level(self):
269
out,err = self.run_bzr('log')
270
self.assertEqual('', err)
271
log = normalize_log(out)
272
self.assertEqualDiff(log, """\
273
------------------------------------------------------------
275
committer: Lorem Ipsum <test@example.com>
280
------------------------------------------------------------
282
committer: Lorem Ipsum <test@example.com>
287
------------------------------------------------------------
289
committer: Lorem Ipsum <test@example.com>
290
branch nick: smallerchild
294
------------------------------------------------------------
296
committer: Lorem Ipsum <test@example.com>
301
------------------------------------------------------------
303
committer: Lorem Ipsum <test@example.com>
310
def test_merges_single_merge_rev(self):
312
out,err = self.run_bzr('log -r1.1.2')
313
self.assertEqual('', err)
314
log = normalize_log(out)
315
self.assertEqualDiff(log, """\
316
------------------------------------------------------------
318
committer: Lorem Ipsum <test@example.com>
323
------------------------------------------------------------
325
committer: Lorem Ipsum <test@example.com>
326
branch nick: smallerchild
332
def test_merges_partial_range(self):
334
out, err = self.run_bzr('log -r1.1.1..1.1.2')
335
self.assertEqual('', err)
336
log = normalize_log(out)
337
self.assertEqualDiff(log, """\
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>
361
def test_merges_nonsupporting_formatter(self):
363
err_msg = 'Selected log formatter only supports mainline revisions.'
364
# The single revision case is tested in the core tests
365
# since all standard formatters support single merge revisions.
366
out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
367
self.assertContainsRe(err, err_msg)
368
out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)
369
self.assertContainsRe(err, err_msg)
372
class TestLogEncodings(TestCaseInTempDir):
375
_message = u'Message with \xb5'
377
# Encodings which can encode mu
382
'cp437', # Common windows encoding
383
'cp1251', # Alexander Belchenko's windows encoding
384
'cp1258', # Common windows encoding
386
# Encodings which cannot encode mu
394
TestCaseInTempDir.setUp(self)
395
self.user_encoding = osutils._cached_user_encoding
398
osutils._cached_user_encoding = self.user_encoding
399
TestCaseInTempDir.tearDown(self)
401
def create_branch(self):
404
open('a', 'wb').write('some stuff\n')
406
bzr(['commit', '-m', self._message])
408
def try_encoding(self, encoding, fail=False):
411
self.assertRaises(UnicodeEncodeError,
412
self._mu.encode, encoding)
413
encoded_msg = self._message.encode(encoding, 'replace')
415
encoded_msg = self._message.encode(encoding)
417
old_encoding = osutils._cached_user_encoding
418
# This test requires that 'run_bzr' uses the current
419
# bzrlib, because we override user_encoding, and expect
422
osutils._cached_user_encoding = 'ascii'
423
# We should be able to handle any encoding
424
out, err = bzr('log', encoding=encoding)
426
# Make sure we wrote mu as we expected it to exist
427
self.assertNotEqual(-1, out.find(encoded_msg))
428
out_unicode = out.decode(encoding)
429
self.assertNotEqual(-1, out_unicode.find(self._message))
431
self.assertNotEqual(-1, out.find('Message with ?'))
433
osutils._cached_user_encoding = old_encoding
435
def test_log_handles_encoding(self):
438
for encoding in self.good_encodings:
439
self.try_encoding(encoding)
441
def test_log_handles_bad_encoding(self):
444
for encoding in self.bad_encodings:
445
self.try_encoding(encoding, fail=True)
447
def test_stdout_encoding(self):
449
osutils._cached_user_encoding = "cp1251"
452
self.build_tree(['a'])
454
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
455
stdout, stderr = self.run_bzr('log', encoding='cp866')
457
message = stdout.splitlines()[-1]
459
# explanation of the check:
460
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
461
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
462
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
463
# This test should check that output of log command
464
# encoded to sys.stdout.encoding
465
test_in_cp866 = '\x92\xa5\xe1\xe2'
466
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
467
# Make sure the log string is encoded in cp866
468
self.assertEquals(test_in_cp866, message[2:])
469
# Make sure the cp1251 string is not found anywhere
470
self.assertEquals(-1, stdout.find(test_in_cp1251))
473
class TestLogFile(TestCaseWithTransport):
475
def test_log_local_branch_file(self):
476
"""We should be able to log files in local treeless branches"""
477
tree = self.make_branch_and_tree('tree')
478
self.build_tree(['tree/file'])
480
tree.commit('revision 1')
481
tree.bzrdir.destroy_workingtree()
482
self.run_bzr('log tree/file')
484
def test_log_file(self):
485
"""The log for a particular file should only list revs for that file"""
486
tree = self.make_branch_and_tree('parent')
487
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
489
tree.commit('add file1')
491
tree.commit('add file2')
493
tree.commit('add file3')
494
child_tree = tree.bzrdir.sprout('child').open_workingtree()
495
self.build_tree_contents([('child/file2', 'hello')])
496
child_tree.commit(message='branch 1')
497
tree.merge_from_branch(child_tree.branch)
498
tree.commit(message='merge child branch')
500
log = self.run_bzr('log file1')[0]
501
self.assertContainsRe(log, 'revno: 1\n')
502
self.assertNotContainsRe(log, 'revno: 2\n')
503
self.assertNotContainsRe(log, 'revno: 3\n')
504
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
505
self.assertNotContainsRe(log, 'revno: 4\n')
506
log = self.run_bzr('log file2')[0]
507
self.assertNotContainsRe(log, 'revno: 1\n')
508
self.assertContainsRe(log, 'revno: 2\n')
509
self.assertNotContainsRe(log, 'revno: 3\n')
510
self.assertContainsRe(log, 'revno: 3.1.1\n')
511
self.assertContainsRe(log, 'revno: 4\n')
512
log = self.run_bzr('log file3')[0]
513
self.assertNotContainsRe(log, 'revno: 1\n')
514
self.assertNotContainsRe(log, 'revno: 2\n')
515
self.assertContainsRe(log, 'revno: 3\n')
516
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
517
self.assertNotContainsRe(log, 'revno: 4\n')
518
log = self.run_bzr('log -r3.1.1 file2')[0]
519
self.assertNotContainsRe(log, 'revno: 1\n')
520
self.assertNotContainsRe(log, 'revno: 2\n')
521
self.assertNotContainsRe(log, 'revno: 3\n')
522
self.assertContainsRe(log, 'revno: 3.1.1\n')
523
self.assertNotContainsRe(log, 'revno: 4\n')
524
log = self.run_bzr('log -r4 file2')[0]
525
self.assertNotContainsRe(log, 'revno: 1\n')
526
self.assertNotContainsRe(log, 'revno: 2\n')
527
self.assertNotContainsRe(log, 'revno: 3\n')
528
self.assertContainsRe(log, 'revno: 3.1.1\n')
529
self.assertContainsRe(log, 'revno: 4\n')
530
log = self.run_bzr('log -r3.. file2')[0]
531
self.assertNotContainsRe(log, 'revno: 1\n')
532
self.assertNotContainsRe(log, 'revno: 2\n')
533
self.assertNotContainsRe(log, 'revno: 3\n')
534
self.assertContainsRe(log, 'revno: 3.1.1\n')
535
self.assertContainsRe(log, 'revno: 4\n')
536
log = self.run_bzr('log -r..3 file2')[0]
537
self.assertNotContainsRe(log, 'revno: 1\n')
538
self.assertContainsRe(log, 'revno: 2\n')
539
self.assertNotContainsRe(log, 'revno: 3\n')
540
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
541
self.assertNotContainsRe(log, 'revno: 4\n')
added
removed
bzrlib/tests/blackbox/test_log.py
