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
28
class TestLog(ExternalBase):
30
def _prepare(self, path='.', format=None):
31
tree = self.make_branch_and_tree(path, format=format)
33
[path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])
35
tree.commit(message='message1')
36
tree.add('goodbye.txt')
37
tree.commit(message='message2')
39
tree.commit(message='message3')
40
self.full_log = self.run_bzr(["log", path])[0]
43
def test_log_null_end_revspec(self):
45
self.assertTrue('revno: 1\n' in self.full_log)
46
self.assertTrue('revno: 2\n' in self.full_log)
47
self.assertTrue('revno: 3\n' in self.full_log)
48
self.assertTrue('message:\n message1\n' in self.full_log)
49
self.assertTrue('message:\n message2\n' in self.full_log)
50
self.assertTrue('message:\n message3\n' in self.full_log)
52
log = self.run_bzr("log -r 1..")[0]
53
self.assertEqualDiff(log, self.full_log)
55
def test_log_null_begin_revspec(self):
57
log = self.run_bzr("log -r ..3")[0]
58
self.assertEqualDiff(self.full_log, log)
60
def test_log_null_both_revspecs(self):
62
log = self.run_bzr("log -r ..")[0]
63
self.assertEquals(self.full_log, log)
64
self.assertEqualDiff(self.full_log, log)
66
def test_log_negative_begin_revspec_full_log(self):
68
log = self.run_bzr("log -r -3..")[0]
69
self.assertEqualDiff(self.full_log, log)
71
def test_log_negative_both_revspec_full_log(self):
73
log = self.run_bzr("log -r -3..-1")[0]
74
self.assertEqualDiff(self.full_log, log)
76
def test_log_negative_both_revspec_partial(self):
78
log = self.run_bzr("log -r -3..-2")[0]
79
self.assertTrue('revno: 1\n' in log)
80
self.assertTrue('revno: 2\n' in log)
81
self.assertTrue('revno: 3\n' not in log)
83
def test_log_negative_begin_revspec(self):
85
log = self.run_bzr("log -r -2..")[0]
86
self.assertTrue('revno: 1\n' not in log)
87
self.assertTrue('revno: 2\n' in log)
88
self.assertTrue('revno: 3\n' in log)
90
def test_log_postive_revspecs(self):
92
log = self.run_bzr("log -r 1..3")[0]
93
self.assertEqualDiff(self.full_log, log)
95
def test_log_reversed_revspecs(self):
97
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
98
'the end revision.\n',),
101
def test_log_revno_n_path(self):
102
self._prepare(path='branch1')
103
self._prepare(path='branch2')
104
log = self.run_bzr("log -r revno:2:branch1..revno:3:branch2",
106
log = self.run_bzr("log -r revno:1:branch2..revno:3:branch2")[0]
107
self.assertEqualDiff(self.full_log, log)
108
log = self.run_bzr("log -r revno:1:branch2")[0]
109
self.assertTrue('revno: 1\n' in log)
110
self.assertTrue('revno: 2\n' not in log)
111
self.assertTrue('branch nick: branch2\n' in log)
112
self.assertTrue('branch nick: branch1\n' not in log)
114
def test_log_nonexistent_file(self):
115
# files that don't exist in either the basis tree or working tree
116
# should give an error
117
wt = self.make_branch_and_tree('.')
118
out, err = self.run_bzr('log does-not-exist', retcode=3)
119
self.assertContainsRe(
120
err, 'Path does not have any revision history: does-not-exist')
122
def test_log_with_tags(self):
123
tree = self._prepare(format='dirstate-tags')
125
branch.tags.set_tag('tag1', branch.get_rev_id(1))
126
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
127
branch.tags.set_tag('tag3', branch.last_revision())
129
log = self.run_bzr("log -r-1")[0]
130
self.assertTrue('tags: tag3' in log)
132
log = self.run_bzr("log -r1")[0]
133
# I guess that we can't know the order of tags in the output
134
# since dicts are unordered, need to check both possibilities
135
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
137
def test_merged_log_with_tags(self):
138
branch1_tree = self._prepare(path='branch1', format='dirstate-tags')
139
branch1 = branch1_tree.branch
140
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
141
branch1_tree.commit(message='foobar', allow_pointless=True)
142
branch1.tags.set_tag('tag1', branch1.last_revision())
144
self.run_bzr('merge ../branch1') # tags don't propagate otherwise
145
branch2_tree.commit(message='merge branch 1')
146
log = self.run_bzr("log -r-1")[0]
147
self.assertContainsRe(log, r' tags: tag1')
148
log = self.run_bzr("log -r3.1.1")[0]
149
self.assertContainsRe(log, r'tags: tag1')
151
def test_log_limit(self):
153
log = self.run_bzr("log --limit 2")[0]
154
self.assertTrue('revno: 1\n' not in log)
155
self.assertTrue('revno: 2\n' in log)
156
self.assertTrue('revno: 3\n' in log)
158
class TestLogMerges(ExternalBase):
161
parent_tree = self.make_branch_and_tree('parent')
162
parent_tree.commit(message='first post', allow_pointless=True)
163
child_tree = parent_tree.bzrdir.sprout('child').open_workingtree()
164
child_tree.commit(message='branch 1', allow_pointless=True)
166
child_tree.bzrdir.sprout('smallerchild').open_workingtree()
167
smaller_tree.commit(message='branch 2', allow_pointless=True)
168
child_tree.merge_from_branch(smaller_tree.branch)
169
child_tree.commit(message='merge branch 2')
170
parent_tree.merge_from_branch(child_tree.branch)
171
parent_tree.commit(message='merge branch 1')
174
def test_merges_are_indented_by_level(self):
176
out,err = self.run_bzr('log')
177
# the log will look something like:
178
# self.assertEqual("""\
179
#------------------------------------------------------------
181
#committer: Robert Collins <foo@example.com>
183
#timestamp: Tue 2006-03-28 22:31:40 +1100
186
# ------------------------------------------------------------
188
# committer: Robert Collins <foo@example.com>
190
# timestamp: Tue 2006-03-28 22:31:40 +1100
193
# ------------------------------------------------------------
195
# committer: Robert Collins <foo@example.com>
196
# branch nick: smallerchild
197
# timestamp: Tue 2006-03-28 22:31:40 +1100
200
# ------------------------------------------------------------
202
# committer: Robert Collins <foo@example.com>
204
# timestamp: Tue 2006-03-28 22:31:40 +1100
207
#------------------------------------------------------------
209
#committer: Robert Collins <foo@example.com>
211
#timestamp: Tue 2006-03-28 22:31:39 +1100
215
# but we dont have a nice pattern matcher hooked up yet, so:
216
# we check for the indenting of the commit message and the
218
self.assertTrue('revno: 2' in out)
219
self.assertTrue(' merge branch 1' in out)
220
self.assertTrue(' revno: 1.1.2' in out)
221
self.assertTrue(' merge branch 2' in out)
222
self.assertTrue(' revno: 1.1.1.1' in out)
223
self.assertTrue(' branch 2' in out)
224
self.assertTrue(' revno: 1.1.1' in out)
225
self.assertTrue(' branch 1' in out)
226
self.assertTrue('revno: 1\n' in out)
227
self.assertTrue(' first post' in out)
228
self.assertEqual('', err)
230
def test_merges_single_merge_rev(self):
232
out,err = self.run_bzr('log -r1.1.2')
233
# the log will look something like:
234
# self.assertEqual("""\
235
#------------------------------------------------------------
237
#committer: Robert Collins <foo@example.com>
239
#timestamp: Tue 2006-03-28 22:31:40 +1100
242
# ------------------------------------------------------------
244
# committer: Robert Collins <foo@example.com>
245
# branch nick: smallerchild
246
# timestamp: Tue 2006-03-28 22:31:40 +1100
250
# but we dont have a nice pattern matcher hooked up yet, so:
251
# we check for the indenting of the commit message and the
253
self.assertTrue('revno: 2' not in out)
254
self.assertTrue(' merge branch 1' not in out)
255
self.assertTrue('revno: 1.1.2' in out)
256
self.assertTrue(' merge branch 2' in out)
257
self.assertTrue(' revno: 1.1.1.1' in out)
258
self.assertTrue(' branch 2' in out)
259
self.assertTrue('revno: 1.1.1\n' not in out)
260
self.assertTrue(' branch 1' not in out)
261
self.assertTrue('revno: 1\n' not in out)
262
self.assertTrue(' first post' not in out)
263
self.assertEqual('', err)
265
def test_merges_partial_range(self):
267
out,err = self.run_bzr('log -r1.1.1..1.1.2')
268
# the log will look something like:
269
# self.assertEqual("""\
270
#------------------------------------------------------------
272
#committer: Robert Collins <foo@example.com>
274
#timestamp: Tue 2006-03-28 22:31:40 +1100
277
# ------------------------------------------------------------
279
# committer: Robert Collins <foo@example.com>
280
# branch nick: smallerchild
281
# timestamp: Tue 2006-03-28 22:31:40 +1100
284
#------------------------------------------------------------
286
#committer: Robert Collins <foo@example.com>
288
#timestamp: Tue 2006-03-28 22:31:40 +1100
292
# but we dont have a nice pattern matcher hooked up yet, so:
293
# we check for the indenting of the commit message and the
295
self.assertTrue('revno: 2' not in out)
296
self.assertTrue(' merge branch 1' not in out)
297
self.assertTrue('revno: 1.1.2' in out)
298
self.assertTrue(' merge branch 2' in out)
299
self.assertTrue(' revno: 1.1.1.1' in out)
300
self.assertTrue(' branch 2' in out)
301
self.assertTrue('revno: 1.1.1' in out)
302
self.assertTrue(' branch 1' in out)
303
self.assertTrue('revno: 1\n' not in out)
304
self.assertTrue(' first post' not in out)
305
self.assertEqual('', err)
308
class TestLogEncodings(TestCaseInTempDir):
311
_message = u'Message with \xb5'
313
# Encodings which can encode mu
318
'cp437', # Common windows encoding
319
'cp1251', # Alexander Belchenko's windows encoding
320
'cp1258', # Common windows encoding
322
# Encodings which cannot encode mu
330
TestCaseInTempDir.setUp(self)
331
self.user_encoding = bzrlib.user_encoding
334
bzrlib.user_encoding = self.user_encoding
335
TestCaseInTempDir.tearDown(self)
337
def create_branch(self):
340
open('a', 'wb').write('some stuff\n')
342
bzr(['commit', '-m', self._message])
344
def try_encoding(self, encoding, fail=False):
347
self.assertRaises(UnicodeEncodeError,
348
self._mu.encode, encoding)
349
encoded_msg = self._message.encode(encoding, 'replace')
351
encoded_msg = self._message.encode(encoding)
353
old_encoding = bzrlib.user_encoding
354
# This test requires that 'run_bzr' uses the current
355
# bzrlib, because we override user_encoding, and expect
358
bzrlib.user_encoding = 'ascii'
359
# We should be able to handle any encoding
360
out, err = bzr('log', encoding=encoding)
362
# Make sure we wrote mu as we expected it to exist
363
self.assertNotEqual(-1, out.find(encoded_msg))
364
out_unicode = out.decode(encoding)
365
self.assertNotEqual(-1, out_unicode.find(self._message))
367
self.assertNotEqual(-1, out.find('Message with ?'))
369
bzrlib.user_encoding = old_encoding
371
def test_log_handles_encoding(self):
374
for encoding in self.good_encodings:
375
self.try_encoding(encoding)
377
def test_log_handles_bad_encoding(self):
380
for encoding in self.bad_encodings:
381
self.try_encoding(encoding, fail=True)
383
def test_stdout_encoding(self):
385
bzrlib.user_encoding = "cp1251"
388
self.build_tree(['a'])
390
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
391
stdout, stderr = self.run_bzr('log', encoding='cp866')
393
message = stdout.splitlines()[-1]
395
# explanation of the check:
396
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
397
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
398
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
399
# This test should check that output of log command
400
# encoded to sys.stdout.encoding
401
test_in_cp866 = '\x92\xa5\xe1\xe2'
402
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
403
# Make sure the log string is encoded in cp866
404
self.assertEquals(test_in_cp866, message[2:])
405
# Make sure the cp1251 string is not found anywhere
406
self.assertEquals(-1, stdout.find(test_in_cp1251))
409
class TestLogFile(TestCaseWithTransport):
411
def test_log_local_branch_file(self):
412
"""We should be able to log files in local treeless branches"""
413
tree = self.make_branch_and_tree('tree')
414
self.build_tree(['tree/file'])
416
tree.commit('revision 1')
417
tree.bzrdir.destroy_workingtree()
418
self.run_bzr('log tree/file')
420
def test_log_file(self):
421
"""The log for a particular file should only list revs for that file"""
422
tree = self.make_branch_and_tree('parent')
423
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
425
tree.commit('add file1')
427
tree.commit('add file2')
429
tree.commit('add file3')
430
child_tree = tree.bzrdir.sprout('child').open_workingtree()
431
self.build_tree_contents([('child/file2', 'hello')])
432
child_tree.commit(message='branch 1')
433
tree.merge_from_branch(child_tree.branch)
434
tree.commit(message='merge child branch')
436
log = self.run_bzr('log file1')[0]
437
self.assertContainsRe(log, 'revno: 1\n')
438
self.assertNotContainsRe(log, 'revno: 2\n')
439
self.assertNotContainsRe(log, 'revno: 3\n')
440
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
441
self.assertNotContainsRe(log, 'revno: 4\n')
442
log = self.run_bzr('log file2')[0]
443
self.assertNotContainsRe(log, 'revno: 1\n')
444
self.assertContainsRe(log, 'revno: 2\n')
445
self.assertNotContainsRe(log, 'revno: 3\n')
446
self.assertContainsRe(log, 'revno: 3.1.1\n')
447
self.assertContainsRe(log, 'revno: 4\n')
448
log = self.run_bzr('log file3')[0]
449
self.assertNotContainsRe(log, 'revno: 1\n')
450
self.assertNotContainsRe(log, 'revno: 2\n')
451
self.assertContainsRe(log, 'revno: 3\n')
452
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
453
self.assertNotContainsRe(log, 'revno: 4\n')
454
log = self.run_bzr('log -r3.1.1 file2')[0]
455
self.assertNotContainsRe(log, 'revno: 1\n')
456
self.assertNotContainsRe(log, 'revno: 2\n')
457
self.assertNotContainsRe(log, 'revno: 3\n')
458
self.assertContainsRe(log, 'revno: 3.1.1\n')
459
self.assertNotContainsRe(log, 'revno: 4\n')
460
log = self.run_bzr('log -r4 file2')[0]
461
self.assertNotContainsRe(log, 'revno: 1\n')
462
self.assertNotContainsRe(log, 'revno: 2\n')
463
self.assertNotContainsRe(log, 'revno: 3\n')
464
self.assertContainsRe(log, 'revno: 3.1.1\n')
465
self.assertContainsRe(log, 'revno: 4\n')
466
log = self.run_bzr('log -r3.. file2')[0]
467
self.assertNotContainsRe(log, 'revno: 1\n')
468
self.assertNotContainsRe(log, 'revno: 2\n')
469
self.assertNotContainsRe(log, 'revno: 3\n')
470
self.assertContainsRe(log, 'revno: 3.1.1\n')
471
self.assertContainsRe(log, 'revno: 4\n')
472
log = self.run_bzr('log -r..3 file2')[0]
473
self.assertNotContainsRe(log, 'revno: 1\n')
474
self.assertContainsRe(log, 'revno: 2\n')
475
self.assertNotContainsRe(log, 'revno: 3\n')
476
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
477
self.assertNotContainsRe(log, 'revno: 4\n')
added
removed
bzrlib/tests/blackbox/test_log.py
