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."""
24
from bzrlib.tests.blackbox import ExternalBase
25
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
26
from bzrlib.tests.test_log import (
31
class TestLog(ExternalBase):
33
def _prepare(self, path='.', format=None):
34
tree = self.make_branch_and_tree(path, format=format)
36
[path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])
38
tree.commit(message='message1')
39
tree.add('goodbye.txt')
40
tree.commit(message='message2')
42
tree.commit(message='message3')
43
self.full_log = self.run_bzr(["log", path])[0]
46
def test_log_null_end_revspec(self):
48
self.assertTrue('revno: 1\n' in self.full_log)
49
self.assertTrue('revno: 2\n' in self.full_log)
50
self.assertTrue('revno: 3\n' in self.full_log)
51
self.assertTrue('message:\n message1\n' in self.full_log)
52
self.assertTrue('message:\n message2\n' in self.full_log)
53
self.assertTrue('message:\n message3\n' in self.full_log)
55
log = self.run_bzr("log -r 1..")[0]
56
self.assertEqualDiff(log, self.full_log)
58
def test_log_null_begin_revspec(self):
60
log = self.run_bzr("log -r ..3")[0]
61
self.assertEqualDiff(self.full_log, log)
63
def test_log_null_both_revspecs(self):
65
log = self.run_bzr("log -r ..")[0]
66
self.assertEqualDiff(self.full_log, log)
68
def test_log_zero_revspec(self):
70
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
73
def test_log_zero_begin_revspec(self):
75
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
78
def test_log_zero_end_revspec(self):
80
self.run_bzr_error('bzr: ERROR: Logging revision 0 is invalid.',
83
def test_log_unsupported_timezone(self):
85
self.run_bzr_error('bzr: ERROR: Unsupported timezone format "foo", '
86
'options are "utc", "original", "local".',
87
['log', '--timezone', 'foo'])
89
def test_log_negative_begin_revspec_full_log(self):
91
log = self.run_bzr("log -r -3..")[0]
92
self.assertEqualDiff(self.full_log, log)
94
def test_log_negative_both_revspec_full_log(self):
96
log = self.run_bzr("log -r -3..-1")[0]
97
self.assertEqualDiff(self.full_log, log)
99
def test_log_negative_both_revspec_partial(self):
101
log = self.run_bzr("log -r -3..-2")[0]
102
self.assertTrue('revno: 1\n' in log)
103
self.assertTrue('revno: 2\n' in log)
104
self.assertTrue('revno: 3\n' not in log)
106
def test_log_negative_begin_revspec(self):
108
log = self.run_bzr("log -r -2..")[0]
109
self.assertTrue('revno: 1\n' not in log)
110
self.assertTrue('revno: 2\n' in log)
111
self.assertTrue('revno: 3\n' in log)
113
def test_log_positive_revspecs(self):
115
log = self.run_bzr("log -r 1..3")[0]
116
self.assertEqualDiff(self.full_log, log)
118
def test_log_reversed_revspecs(self):
120
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
121
'the end revision.\n',),
124
def test_log_revno_n_path(self):
125
self._prepare(path='branch1')
126
self._prepare(path='branch2')
127
log = self.run_bzr("log -r revno:2:branch1..revno:3:branch2",
129
log = self.run_bzr("log -r revno:1:branch2..revno:3:branch2")[0]
130
self.assertEqualDiff(self.full_log, log)
131
log = self.run_bzr("log -r revno:1:branch2")[0]
132
self.assertTrue('revno: 1\n' in log)
133
self.assertTrue('revno: 2\n' not in log)
134
self.assertTrue('branch nick: branch2\n' in log)
135
self.assertTrue('branch nick: branch1\n' not in log)
137
def test_log_nonexistent_file(self):
138
# files that don't exist in either the basis tree or working tree
139
# should give an error
140
wt = self.make_branch_and_tree('.')
141
out, err = self.run_bzr('log does-not-exist', retcode=3)
142
self.assertContainsRe(
143
err, 'Path does not have any revision history: does-not-exist')
145
def test_log_with_tags(self):
146
tree = self._prepare(format='dirstate-tags')
148
branch.tags.set_tag('tag1', branch.get_rev_id(1))
149
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
150
branch.tags.set_tag('tag3', branch.last_revision())
152
log = self.run_bzr("log -r-1")[0]
153
self.assertTrue('tags: tag3' in log)
155
log = self.run_bzr("log -r1")[0]
156
# I guess that we can't know the order of tags in the output
157
# since dicts are unordered, need to check both possibilities
158
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
160
def test_merged_log_with_tags(self):
161
branch1_tree = self._prepare(path='branch1', format='dirstate-tags')
162
branch1 = branch1_tree.branch
163
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
164
branch1_tree.commit(message='foobar', allow_pointless=True)
165
branch1.tags.set_tag('tag1', branch1.last_revision())
167
self.run_bzr('merge ../branch1') # tags don't propagate otherwise
168
branch2_tree.commit(message='merge branch 1')
169
log = self.run_bzr("log -r-1")[0]
170
self.assertContainsRe(log, r' tags: tag1')
171
log = self.run_bzr("log -r3.1.1")[0]
172
self.assertContainsRe(log, r'tags: tag1')
174
def test_log_limit(self):
176
log = self.run_bzr("log --limit 2")[0]
177
self.assertNotContainsRe(log, r'revno: 1\n')
178
self.assertContainsRe(log, r'revno: 2\n')
179
self.assertContainsRe(log, r'revno: 3\n')
181
def test_log_limit_short(self):
183
log = self.run_bzr("log -l 2")[0]
184
self.assertNotContainsRe(log, r'revno: 1\n')
185
self.assertContainsRe(log, r'revno: 2\n')
186
self.assertContainsRe(log, r'revno: 3\n')
188
class TestLogMerges(ExternalBase):
191
parent_tree = self.make_branch_and_tree('parent')
192
parent_tree.commit(message='first post', allow_pointless=True)
193
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
194
child_tree.commit(message='branch 1', allow_pointless=True)
196
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
197
smaller_tree.commit(message='branch 2', allow_pointless=True)
198
child_tree.merge_from_branch(smaller_tree.branch)
199
child_tree.commit(message='merge branch 2')
200
parent_tree.merge_from_branch(child_tree.branch)
201
parent_tree.commit(message='merge branch 1')
204
def test_merges_are_indented_by_level(self):
206
out,err = self.run_bzr('log')
207
self.assertEqual('', err)
208
log = normalize_log(out)
209
self.assertEqualDiff(log, """\
210
------------------------------------------------------------
212
committer: Lorem Ipsum <test@example.com>
217
------------------------------------------------------------
219
committer: Lorem Ipsum <test@example.com>
224
------------------------------------------------------------
226
committer: Lorem Ipsum <test@example.com>
227
branch nick: smallerchild
231
------------------------------------------------------------
233
committer: Lorem Ipsum <test@example.com>
238
------------------------------------------------------------
240
committer: Lorem Ipsum <test@example.com>
247
def test_merges_single_merge_rev(self):
249
out,err = self.run_bzr('log -r1.1.2')
250
self.assertEqual('', err)
251
log = normalize_log(out)
252
self.assertEqualDiff(log, """\
253
------------------------------------------------------------
255
committer: Lorem Ipsum <test@example.com>
260
------------------------------------------------------------
262
committer: Lorem Ipsum <test@example.com>
263
branch nick: smallerchild
269
def test_merges_partial_range(self):
271
out,err = self.run_bzr('log -r1.1.1..1.1.2')
272
self.assertEqual('', err)
273
log = normalize_log(out)
274
self.assertEqualDiff(log, """\
275
------------------------------------------------------------
277
committer: Lorem Ipsum <test@example.com>
282
------------------------------------------------------------
284
committer: Lorem Ipsum <test@example.com>
285
branch nick: smallerchild
289
------------------------------------------------------------
291
committer: Lorem Ipsum <test@example.com>
298
def test_merges_nonsupporting_formatter(self):
300
err_msg = 'Selected log formatter only supports mainline revisions.'
301
# The single revision case is tested in the core tests
302
# since all standard formatters support single merge revisions.
303
out,err = self.run_bzr('log --short -r1..1.1.2', retcode=3)
304
self.assertContainsRe(err, err_msg)
305
out,err = self.run_bzr('log --short -r1.1.1..1.1.2', retcode=3)
306
self.assertContainsRe(err, err_msg)
309
class TestLogEncodings(TestCaseInTempDir):
312
_message = u'Message with \xb5'
314
# Encodings which can encode mu
319
'cp437', # Common windows encoding
320
'cp1251', # Alexander Belchenko's windows encoding
321
'cp1258', # Common windows encoding
323
# Encodings which cannot encode mu
331
TestCaseInTempDir.setUp(self)
332
self.user_encoding = bzrlib.user_encoding
335
bzrlib.user_encoding = self.user_encoding
336
TestCaseInTempDir.tearDown(self)
338
def create_branch(self):
341
open('a', 'wb').write('some stuff\n')
343
bzr(['commit', '-m', self._message])
345
def try_encoding(self, encoding, fail=False):
348
self.assertRaises(UnicodeEncodeError,
349
self._mu.encode, encoding)
350
encoded_msg = self._message.encode(encoding, 'replace')
352
encoded_msg = self._message.encode(encoding)
354
old_encoding = bzrlib.user_encoding
355
# This test requires that 'run_bzr' uses the current
356
# bzrlib, because we override user_encoding, and expect
359
bzrlib.user_encoding = 'ascii'
360
# We should be able to handle any encoding
361
out, err = bzr('log', encoding=encoding)
363
# Make sure we wrote mu as we expected it to exist
364
self.assertNotEqual(-1, out.find(encoded_msg))
365
out_unicode = out.decode(encoding)
366
self.assertNotEqual(-1, out_unicode.find(self._message))
368
self.assertNotEqual(-1, out.find('Message with ?'))
370
bzrlib.user_encoding = old_encoding
372
def test_log_handles_encoding(self):
375
for encoding in self.good_encodings:
376
self.try_encoding(encoding)
378
def test_log_handles_bad_encoding(self):
381
for encoding in self.bad_encodings:
382
self.try_encoding(encoding, fail=True)
384
def test_stdout_encoding(self):
386
bzrlib.user_encoding = "cp1251"
389
self.build_tree(['a'])
391
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
392
stdout, stderr = self.run_bzr('log', encoding='cp866')
394
message = stdout.splitlines()[-1]
396
# explanation of the check:
397
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
398
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
399
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
400
# This test should check that output of log command
401
# encoded to sys.stdout.encoding
402
test_in_cp866 = '\x92\xa5\xe1\xe2'
403
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
404
# Make sure the log string is encoded in cp866
405
self.assertEquals(test_in_cp866, message[2:])
406
# Make sure the cp1251 string is not found anywhere
407
self.assertEquals(-1, stdout.find(test_in_cp1251))
410
class TestLogFile(TestCaseWithTransport):
412
def test_log_local_branch_file(self):
413
"""We should be able to log files in local treeless branches"""
414
tree = self.make_branch_and_tree('tree')
415
self.build_tree(['tree/file'])
417
tree.commit('revision 1')
418
tree.bzrdir.destroy_workingtree()
419
self.run_bzr('log tree/file')
421
def test_log_file(self):
422
"""The log for a particular file should only list revs for that file"""
423
tree = self.make_branch_and_tree('parent')
424
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
426
tree.commit('add file1')
428
tree.commit('add file2')
430
tree.commit('add file3')
431
child_tree = tree.bzrdir.sprout('child').open_workingtree()
432
self.build_tree_contents([('child/file2', 'hello')])
433
child_tree.commit(message='branch 1')
434
tree.merge_from_branch(child_tree.branch)
435
tree.commit(message='merge child branch')
437
log = self.run_bzr('log file1')[0]
438
self.assertContainsRe(log, 'revno: 1\n')
439
self.assertNotContainsRe(log, 'revno: 2\n')
440
self.assertNotContainsRe(log, 'revno: 3\n')
441
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
442
self.assertNotContainsRe(log, 'revno: 4\n')
443
log = self.run_bzr('log file2')[0]
444
self.assertNotContainsRe(log, 'revno: 1\n')
445
self.assertContainsRe(log, 'revno: 2\n')
446
self.assertNotContainsRe(log, 'revno: 3\n')
447
self.assertContainsRe(log, 'revno: 3.1.1\n')
448
self.assertContainsRe(log, 'revno: 4\n')
449
log = self.run_bzr('log file3')[0]
450
self.assertNotContainsRe(log, 'revno: 1\n')
451
self.assertNotContainsRe(log, 'revno: 2\n')
452
self.assertContainsRe(log, 'revno: 3\n')
453
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
454
self.assertNotContainsRe(log, 'revno: 4\n')
455
log = self.run_bzr('log -r3.1.1 file2')[0]
456
self.assertNotContainsRe(log, 'revno: 1\n')
457
self.assertNotContainsRe(log, 'revno: 2\n')
458
self.assertNotContainsRe(log, 'revno: 3\n')
459
self.assertContainsRe(log, 'revno: 3.1.1\n')
460
self.assertNotContainsRe(log, 'revno: 4\n')
461
log = self.run_bzr('log -r4 file2')[0]
462
self.assertNotContainsRe(log, 'revno: 1\n')
463
self.assertNotContainsRe(log, 'revno: 2\n')
464
self.assertNotContainsRe(log, 'revno: 3\n')
465
self.assertContainsRe(log, 'revno: 3.1.1\n')
466
self.assertContainsRe(log, 'revno: 4\n')
467
log = self.run_bzr('log -r3.. file2')[0]
468
self.assertNotContainsRe(log, 'revno: 1\n')
469
self.assertNotContainsRe(log, 'revno: 2\n')
470
self.assertNotContainsRe(log, 'revno: 3\n')
471
self.assertContainsRe(log, 'revno: 3.1.1\n')
472
self.assertContainsRe(log, 'revno: 4\n')
473
log = self.run_bzr('log -r..3 file2')[0]
474
self.assertNotContainsRe(log, 'revno: 1\n')
475
self.assertContainsRe(log, 'revno: 2\n')
476
self.assertNotContainsRe(log, 'revno: 3\n')
477
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
478
self.assertNotContainsRe(log, 'revno: 4\n')
added
removed
bzrlib/tests/blackbox/test_log.py
