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, format=None):
32
self.runbzr("init --format="+format)
35
self.build_tree(['hello.txt', 'goodbye.txt', 'meep.txt'])
36
self.runbzr("add hello.txt")
37
self.runbzr("commit -m message1 hello.txt")
38
self.runbzr("add goodbye.txt")
39
self.runbzr("commit -m message2 goodbye.txt")
40
self.runbzr("add meep.txt")
41
self.runbzr("commit -m message3 meep.txt")
42
self.full_log = self.runbzr("log")[0]
44
def test_log_null_end_revspec(self):
46
self.assertTrue('revno: 1\n' in self.full_log)
47
self.assertTrue('revno: 2\n' in self.full_log)
48
self.assertTrue('revno: 3\n' in self.full_log)
49
self.assertTrue('message:\n message1\n' in self.full_log)
50
self.assertTrue('message:\n message2\n' in self.full_log)
51
self.assertTrue('message:\n message3\n' in self.full_log)
53
log = self.runbzr("log -r 1..")[0]
54
self.assertEquals(log, self.full_log)
56
def test_log_null_begin_revspec(self):
58
log = self.runbzr("log -r ..3")[0]
59
self.assertEquals(self.full_log, log)
61
def test_log_null_both_revspecs(self):
63
log = self.runbzr("log -r ..")[0]
64
self.assertEquals(self.full_log, log)
66
def test_log_negative_begin_revspec_full_log(self):
68
log = self.runbzr("log -r -3..")[0]
69
self.assertEquals(self.full_log, log)
71
def test_log_negative_both_revspec_full_log(self):
73
log = self.runbzr("log -r -3..-1")[0]
74
self.assertEquals(self.full_log, log)
76
def test_log_negative_both_revspec_partial(self):
78
log = self.runbzr("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.runbzr("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.runbzr("log -r 1..3")[0]
93
self.assertEquals(self.full_log, log)
95
def test_log_revno_n_path(self):
104
log = self.runbzr("log -r revno:2:branch1..revno:3:branch2",
106
log = self.runbzr("log -r revno:1:branch2..revno:3:branch2")[0]
107
self.assertEquals(self.full_log, log)
108
log = self.runbzr("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
self._prepare(format='dirstate-tags')
124
self.runbzr('tag -r1 tag1')
125
self.runbzr('tag -r1 tag1.1')
126
self.runbzr('tag tag3')
128
log = self.runbzr("log -r-1")[0]
129
self.assertTrue('tags: tag3' in log)
131
log = self.runbzr("log -r1")[0]
132
# I guess that we can't know the order of tags in the output
133
# since dicts are unordered, need to check both possibilities
134
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
136
def test_merged_log_with_tags(self):
139
self._prepare(format='dirstate-tags')
141
self.runbzr('branch branch1 branch2')
143
self.runbzr('commit -m foobar --unchanged')
144
self.runbzr('tag tag1')
145
os.chdir('../branch2')
146
self.runbzr('merge ../branch1')
147
self.runbzr('commit -m merge_branch_1')
148
log = self.runbzr("log -r-1")[0]
149
self.assertContainsRe(log, r' tags: tag1')
152
class TestLogMerges(ExternalBase):
154
def test_merges_are_indented_by_level(self):
155
self.build_tree(['parent/'])
156
self.run_bzr('init', 'parent')
157
self.run_bzr('commit', '-m', 'first post', '--unchanged', 'parent')
158
self.run_bzr('branch', 'parent', 'child')
159
self.run_bzr('commit', '-m', 'branch 1', '--unchanged', 'child')
160
self.run_bzr('branch', 'child', 'smallerchild')
161
self.run_bzr('commit', '-m', 'branch 2', '--unchanged', 'smallerchild')
163
self.run_bzr('merge', '../smallerchild')
164
self.run_bzr('commit', '-m', 'merge branch 2')
165
os.chdir('../parent')
166
self.run_bzr('merge', '../child')
167
self.run_bzr('commit', '-m', 'merge branch 1')
168
out,err = self.run_bzr('log')
169
# the log will look something like:
170
# self.assertEqual("""\
171
#------------------------------------------------------------
173
#committer: Robert Collins <foo@example.com>
175
#timestamp: Tue 2006-03-28 22:31:40 +1100
178
# ------------------------------------------------------------
180
# merged: foo@example.com-20060328113140-91f43cfb46dc2863
181
# committer: Robert Collins <foo@example.com>
183
# timestamp: Tue 2006-03-28 22:31:40 +1100
186
# ------------------------------------------------------------
188
# merged: foo@example.com-20060328113140-1ba24f850a0ef573
189
# committer: Robert Collins <foo@example.com>
190
# branch nick: smallerchild
191
# timestamp: Tue 2006-03-28 22:31:40 +1100
194
# ------------------------------------------------------------
196
# merged: foo@example.com-20060328113140-5749a4757a8ac792
197
# committer: Robert Collins <foo@example.com>
199
# timestamp: Tue 2006-03-28 22:31:40 +1100
202
#------------------------------------------------------------
204
#committer: Robert Collins <foo@example.com>
206
#timestamp: Tue 2006-03-28 22:31:39 +1100
210
# but we dont have a nice pattern matcher hooked up yet, so:
211
# we check for the indenting of the commit message and the
213
self.assertTrue('revno: 2' in out)
214
self.assertTrue(' merge branch 1' in out)
215
self.assertTrue(' revno: 1.1.2' in out)
216
self.assertTrue(' merge branch 2' in out)
217
self.assertTrue(' revno: 1.1.1.1' in out)
218
self.assertTrue(' branch 2' in out)
219
self.assertTrue(' revno: 1.1.1' in out)
220
self.assertTrue(' branch 1' in out)
221
self.assertTrue('revno: 1' in out)
222
self.assertTrue(' first post' in out)
223
self.assertEqual('', err)
226
class TestLogEncodings(TestCaseInTempDir):
229
_message = u'Message with \xb5'
231
# Encodings which can encode mu
236
'cp437', # Common windows encoding
237
'cp1251', # Alexander Belchenko's windows encoding
238
'cp1258', # Common windows encoding
240
# Encodings which cannot encode mu
248
TestCaseInTempDir.setUp(self)
249
self.user_encoding = bzrlib.user_encoding
252
bzrlib.user_encoding = self.user_encoding
253
TestCaseInTempDir.tearDown(self)
255
def create_branch(self):
258
open('a', 'wb').write('some stuff\n')
260
bzr('commit', '-m', self._message)
262
def try_encoding(self, encoding, fail=False):
265
self.assertRaises(UnicodeEncodeError,
266
self._mu.encode, encoding)
267
encoded_msg = self._message.encode(encoding, 'replace')
269
encoded_msg = self._message.encode(encoding)
271
old_encoding = bzrlib.user_encoding
272
# This test requires that 'run_bzr' uses the current
273
# bzrlib, because we override user_encoding, and expect
276
bzrlib.user_encoding = 'ascii'
277
# We should be able to handle any encoding
278
out, err = bzr('log', encoding=encoding)
280
# Make sure we wrote mu as we expected it to exist
281
self.assertNotEqual(-1, out.find(encoded_msg))
282
out_unicode = out.decode(encoding)
283
self.assertNotEqual(-1, out_unicode.find(self._message))
285
self.assertNotEqual(-1, out.find('Message with ?'))
287
bzrlib.user_encoding = old_encoding
289
def test_log_handles_encoding(self):
292
for encoding in self.good_encodings:
293
self.try_encoding(encoding)
295
def test_log_handles_bad_encoding(self):
298
for encoding in self.bad_encodings:
299
self.try_encoding(encoding, fail=True)
301
def test_stdout_encoding(self):
303
bzrlib.user_encoding = "cp1251"
306
self.build_tree(['a'])
308
bzr('commit', '-m', u'\u0422\u0435\u0441\u0442')
309
stdout, stderr = self.run_bzr('log', encoding='cp866')
311
message = stdout.splitlines()[-1]
313
# explanation of the check:
314
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
315
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
316
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
317
# This test should check that output of log command
318
# encoded to sys.stdout.encoding
319
test_in_cp866 = '\x92\xa5\xe1\xe2'
320
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
321
# Make sure the log string is encoded in cp866
322
self.assertEquals(test_in_cp866, message[2:])
323
# Make sure the cp1251 string is not found anywhere
324
self.assertEquals(-1, stdout.find(test_in_cp1251))
327
class TestLogFile(TestCaseWithTransport):
329
def test_log_local_branch_file(self):
330
"""We should be able to log files in local treeless branches"""
331
tree = self.make_branch_and_tree('tree')
332
self.build_tree(['tree/file'])
334
tree.commit('revision 1')
335
tree.bzrdir.destroy_workingtree()
336
self.run_bzr('log', 'tree/file')
338
def test_log_file(self):
339
"""The log for a particular file should only list revs for that file"""
340
tree = self.make_branch_and_tree('parent')
341
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
343
tree.commit('add file1')
345
tree.commit('add file2')
347
tree.commit('add file3')
348
self.run_bzr('branch', 'parent', 'child')
349
print >> file('child/file2', 'wb'), 'hello'
350
self.run_bzr('commit', '-m', 'branch 1', 'child')
352
self.run_bzr('merge', '../child')
353
self.run_bzr('commit', '-m', 'merge child branch')
355
log = self.run_bzr('log', 'file1')[0]
356
self.assertContainsRe(log, 'revno: 1\n')
357
self.assertNotContainsRe(log, 'revno: 2\n')
358
self.assertNotContainsRe(log, 'revno: 3\n')
359
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
360
self.assertNotContainsRe(log, 'revno: 4\n')
361
log = self.run_bzr('log', 'file2')[0]
362
self.assertNotContainsRe(log, 'revno: 1\n')
363
self.assertContainsRe(log, 'revno: 2\n')
364
self.assertNotContainsRe(log, 'revno: 3\n')
365
self.assertContainsRe(log, 'revno: 3.1.1\n')
366
self.assertContainsRe(log, 'revno: 4\n')
367
log = self.run_bzr('log', 'file3')[0]
368
self.assertNotContainsRe(log, 'revno: 1\n')
369
self.assertNotContainsRe(log, 'revno: 2\n')
370
self.assertContainsRe(log, 'revno: 3\n')
371
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
372
self.assertNotContainsRe(log, 'revno: 4\n')
added
removed
bzrlib/tests/blackbox/test_log.py
