89
87
log = self.runbzr("log -r 1..3")[0]
90
88
self.assertEquals(self.full_log, log)
92
def test_log_revno_n_path(self):
101
log = self.runbzr("log -r revno:2:branch1..revno:3:branch2",
103
log = self.runbzr("log -r revno:1:branch2..revno:3:branch2")[0]
104
self.assertEquals(self.full_log, log)
105
log = self.runbzr("log -r revno:1:branch2")[0]
106
self.assertTrue('revno: 1\n' in log)
107
self.assertTrue('revno: 2\n' not in log)
108
self.assertTrue('branch nick: branch2\n' in log)
109
self.assertTrue('branch nick: branch1\n' not in log)
111
def test_log_nonexistent_file(self):
112
# files that don't exist in either the basis tree or working tree
113
# should give an error
114
wt = self.make_branch_and_tree('.')
115
out, err = self.run_bzr('log', 'does-not-exist', retcode=3)
116
self.assertContainsRe(
117
err, 'Path does not have any revision history: does-not-exist')
119
class TestLogMerges(ExternalBase):
121
def test_merges_are_indented_by_level(self):
122
self.build_tree(['parent/'])
123
self.run_bzr('init', 'parent')
124
self.run_bzr('commit', '-m', 'first post', '--unchanged', 'parent')
125
self.run_bzr('branch', 'parent', 'child')
126
self.run_bzr('commit', '-m', 'branch 1', '--unchanged', 'child')
127
self.run_bzr('branch', 'child', 'smallerchild')
128
self.run_bzr('commit', '-m', 'branch 2', '--unchanged', 'smallerchild')
130
self.run_bzr('merge', '../smallerchild')
131
self.run_bzr('commit', '-m', 'merge branch 2')
132
os.chdir('../parent')
133
self.run_bzr('merge', '../child')
134
self.run_bzr('commit', '-m', 'merge branch 1')
135
out,err = self.run_bzr('log')
136
# the log will look something like:
137
# self.assertEqual("""\
138
#------------------------------------------------------------
140
#committer: Robert Collins <foo@example.com>
142
#timestamp: Tue 2006-03-28 22:31:40 +1100
145
# ------------------------------------------------------------
147
# merged: foo@example.com-20060328113140-91f43cfb46dc2863
148
# committer: Robert Collins <foo@example.com>
150
# timestamp: Tue 2006-03-28 22:31:40 +1100
153
# ------------------------------------------------------------
155
# merged: foo@example.com-20060328113140-1ba24f850a0ef573
156
# committer: Robert Collins <foo@example.com>
157
# branch nick: smallerchild
158
# timestamp: Tue 2006-03-28 22:31:40 +1100
161
# ------------------------------------------------------------
163
# merged: foo@example.com-20060328113140-5749a4757a8ac792
164
# committer: Robert Collins <foo@example.com>
166
# timestamp: Tue 2006-03-28 22:31:40 +1100
169
#------------------------------------------------------------
171
#committer: Robert Collins <foo@example.com>
173
#timestamp: Tue 2006-03-28 22:31:39 +1100
177
# but we dont have a nice pattern matcher hooked up yet, so:
178
# we check for the indenting of the commit message and the
180
self.assertTrue('revno: 2' in out)
181
self.assertTrue(' merge branch 1' in out)
182
self.assertTrue(' revno: 1.1.2' in out)
183
self.assertTrue(' merge branch 2' in out)
184
self.assertTrue(' revno: 1.1.1.1' in out)
185
self.assertTrue(' branch 2' in out)
186
self.assertTrue(' revno: 1.1.1' in out)
187
self.assertTrue(' branch 1' in out)
188
self.assertTrue('revno: 1' in out)
189
self.assertTrue(' first post' in out)
190
self.assertEqual('', err)
193
class TestLogEncodings(TestCaseInTempDir):
196
_message = u'Message with \xb5'
198
# Encodings which can encode mu
203
'cp437', # Common windows encoding
204
'cp1251', # Alexander Belchenko's windows encoding
205
'cp1258', # Common windows encoding
207
# Encodings which cannot encode mu
215
TestCaseInTempDir.setUp(self)
216
self.user_encoding = bzrlib.user_encoding
219
bzrlib.user_encoding = self.user_encoding
220
TestCaseInTempDir.tearDown(self)
222
def create_branch(self):
225
open('a', 'wb').write('some stuff\n')
227
bzr('commit', '-m', self._message)
229
def try_encoding(self, encoding, fail=False):
232
self.assertRaises(UnicodeEncodeError,
233
self._mu.encode, encoding)
234
encoded_msg = self._message.encode(encoding, 'replace')
236
encoded_msg = self._message.encode(encoding)
238
old_encoding = bzrlib.user_encoding
239
# This test requires that 'run_bzr' uses the current
240
# bzrlib, because we override user_encoding, and expect
243
bzrlib.user_encoding = 'ascii'
244
# We should be able to handle any encoding
245
out, err = bzr('log', encoding=encoding)
247
# Make sure we wrote mu as we expected it to exist
248
self.assertNotEqual(-1, out.find(encoded_msg))
249
out_unicode = out.decode(encoding)
250
self.assertNotEqual(-1, out_unicode.find(self._message))
252
self.assertNotEqual(-1, out.find('Message with ?'))
254
bzrlib.user_encoding = old_encoding
256
def test_log_handles_encoding(self):
259
for encoding in self.good_encodings:
260
self.try_encoding(encoding)
262
def test_log_handles_bad_encoding(self):
265
for encoding in self.bad_encodings:
266
self.try_encoding(encoding, fail=True)
268
def test_stdout_encoding(self):
270
bzrlib.user_encoding = "cp1251"
273
self.build_tree(['a'])
275
bzr('commit', '-m', u'\u0422\u0435\u0441\u0442')
276
stdout, stderr = self.run_bzr('log', encoding='cp866')
278
message = stdout.splitlines()[-1]
280
# explanation of the check:
281
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
282
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
283
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
284
# This test should check that output of log command
285
# encoded to sys.stdout.encoding
286
test_in_cp866 = '\x92\xa5\xe1\xe2'
287
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
288
# Make sure the log string is encoded in cp866
289
self.assertEquals(test_in_cp866, message[2:])
290
# Make sure the cp1251 string is not found anywhere
291
self.assertEquals(-1, stdout.find(test_in_cp1251))
294
class TestLogFile(TestCaseWithTransport):
296
def test_log_local_branch_file(self):
297
"""We should be able to log files in local treeless branches"""
298
tree = self.make_branch_and_tree('tree')
299
self.build_tree(['tree/file'])
301
tree.commit('revision 1')
302
tree.bzrdir.destroy_workingtree()
303
self.run_bzr('log', 'tree/file')
added
removed
bzrlib/tests/blackbox/test_log.py
