/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
2
# -*- coding: utf-8 -*-
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
3
#
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
8
#
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
13
#
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
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
17
18
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
19
"""Black-box tests for bzr log."""
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
20
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
21
import os
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
22
1685.1.5 by John Arbash Meinel
Merged test_log.py.moved into test_log.py
23
import bzrlib
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
24
from bzrlib.tests.blackbox import ExternalBase
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
25
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
26
27
28
class TestLog(ExternalBase):
29
2388.1.3 by Erik Bagfors
tests for tags in log output
30
    def _prepare(self, format=None):
31
        if format:
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
32
            self.run_bzr(["init", "--format="+format])
2388.1.3 by Erik Bagfors
tests for tags in log output
33
        else:
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
34
            self.run_bzr("init")
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
35
        self.build_tree(['hello.txt', 'goodbye.txt', 'meep.txt'])
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
36
        self.run_bzr("add hello.txt")
37
        self.run_bzr("commit -m message1 hello.txt")
38
        self.run_bzr("add goodbye.txt")
39
        self.run_bzr("commit -m message2 goodbye.txt")
40
        self.run_bzr("add meep.txt")
41
        self.run_bzr("commit -m message3 meep.txt")
42
        self.full_log = self.run_bzr("log")[0]
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
43
44
    def test_log_null_end_revspec(self):
45
        self._prepare()
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)
52
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
53
        log = self.run_bzr("log -r 1..")[0]
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
54
        self.assertEqualDiff(log, self.full_log)
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
55
56
    def test_log_null_begin_revspec(self):
57
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
58
        log = self.run_bzr("log -r ..3")[0]
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
59
        self.assertEqualDiff(self.full_log, log)
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
60
61
    def test_log_null_both_revspecs(self):
62
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
63
        log = self.run_bzr("log -r ..")[0]
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
64
        self.assertEquals(self.full_log, log)
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
65
        self.assertEqualDiff(self.full_log, log)
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
66
67
    def test_log_negative_begin_revspec_full_log(self):
68
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
69
        log = self.run_bzr("log -r -3..")[0]
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
70
        self.assertEqualDiff(self.full_log, log)
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
71
72
    def test_log_negative_both_revspec_full_log(self):
73
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
74
        log = self.run_bzr("log -r -3..-1")[0]
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
75
        self.assertEqualDiff(self.full_log, log)
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
76
77
    def test_log_negative_both_revspec_partial(self):
78
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
79
        log = self.run_bzr("log -r -3..-2")[0]
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
80
        self.assertTrue('revno: 1\n' in log)
81
        self.assertTrue('revno: 2\n' in log)
82
        self.assertTrue('revno: 3\n' not in log)
83
84
    def test_log_negative_begin_revspec(self):
85
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
86
        log = self.run_bzr("log -r -2..")[0]
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
87
        self.assertTrue('revno: 1\n' not in log)
88
        self.assertTrue('revno: 2\n' in log)
89
        self.assertTrue('revno: 3\n' in log)
90
91
    def test_log_postive_revspecs(self):
92
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
93
        log = self.run_bzr("log -r 1..3")[0]
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
94
        self.assertEqualDiff(self.full_log, log)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
95
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
96
    def test_log_reversed_revspecs(self):
97
        self._prepare()
98
        self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
99
                            'the end revision.\n',),
100
                           'log', '-r3..1')
101
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
102
    def test_log_revno_n_path(self):
103
        os.mkdir('branch1')
104
        os.chdir('branch1')
105
        self._prepare()
106
        os.chdir('..')
107
        os.mkdir('branch2')
108
        os.chdir('branch2')
109
        self._prepare()
110
        os.chdir('..')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
111
        log = self.run_bzr("log -r revno:2:branch1..revno:3:branch2",
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
112
                          retcode=3)[0]
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
113
        log = self.run_bzr("log -r revno:1:branch2..revno:3:branch2")[0]
2466.11.2 by Kent Gibson
Add tests for deltas in merge revisions
114
        self.assertEqualDiff(self.full_log, log)
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
115
        log = self.run_bzr("log -r revno:1:branch2")[0]
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
116
        self.assertTrue('revno: 1\n' in log)
117
        self.assertTrue('revno: 2\n' not in log)
118
        self.assertTrue('branch nick: branch2\n' in log)
119
        self.assertTrue('branch nick: branch1\n' not in log)
120
        
2100.1.1 by wang
Running ``bzr log`` on nonexistent file gives an error instead of the
121
    def test_log_nonexistent_file(self):
122
        # files that don't exist in either the basis tree or working tree
123
        # should give an error
124
        wt = self.make_branch_and_tree('.')
125
        out, err = self.run_bzr('log', 'does-not-exist', retcode=3)
126
        self.assertContainsRe(
127
            err, 'Path does not have any revision history: does-not-exist')
2388.1.11 by Alexander Belchenko
changes after John's review
128
2388.1.3 by Erik Bagfors
tests for tags in log output
129
    def test_log_with_tags(self):
130
        self._prepare(format='dirstate-tags')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
131
        self.run_bzr('tag -r1 tag1')
132
        self.run_bzr('tag -r1 tag1.1')
133
        self.run_bzr('tag tag3')
2388.1.3 by Erik Bagfors
tests for tags in log output
134
        
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
135
        log = self.run_bzr("log -r-1")[0]
2388.1.3 by Erik Bagfors
tests for tags in log output
136
        self.assertTrue('tags: tag3' in log)
137
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
138
        log = self.run_bzr("log -r1")[0]
2388.1.3 by Erik Bagfors
tests for tags in log output
139
        # I guess that we can't know the order of tags in the output
140
        # since dicts are unordered, need to check both possibilities
2388.1.11 by Alexander Belchenko
changes after John's review
141
        self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
142
2388.1.9 by Erik Bagfors
test for merges with tags in log
143
    def test_merged_log_with_tags(self):
144
        os.mkdir('branch1')
145
        os.chdir('branch1')
146
        self._prepare(format='dirstate-tags')
147
        os.chdir('..')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
148
        self.run_bzr('branch branch1 branch2')
2388.1.9 by Erik Bagfors
test for merges with tags in log
149
        os.chdir('branch1')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
150
        self.run_bzr('commit -m foobar --unchanged')
151
        self.run_bzr('tag tag1')
2388.1.9 by Erik Bagfors
test for merges with tags in log
152
        os.chdir('../branch2')
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
153
        self.run_bzr('merge ../branch1')
154
        self.run_bzr('commit -m merge_branch_1')
155
        log = self.run_bzr("log -r-1")[0]
2388.1.11 by Alexander Belchenko
changes after John's review
156
        self.assertContainsRe(log, r'    tags: tag1')
2578.2.1 by Andrew Bennetts
Merge Kent Gibson's fix for bug #4663, resolving conflicts.
157
        log = self.run_bzr("log -r3.1.1")[0]
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
158
        self.assertContainsRe(log, r'    tags: tag1')
2388.1.3 by Erik Bagfors
tests for tags in log output
159
2466.9.1 by Kent Gibson
add bzr log --limit
160
    def test_log_limit(self):
161
        self._prepare()
2530.3.1 by Martin Pool
Cleanup old variations on run_bzr in the test suite
162
        log = self.run_bzr("log --limit 2")[0]
2466.9.1 by Kent Gibson
add bzr log --limit
163
        self.assertTrue('revno: 1\n' not in log)
164
        self.assertTrue('revno: 2\n' in log)
165
        self.assertTrue('revno: 3\n' in log)
166
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
167
class TestLogMerges(ExternalBase):
168
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
169
    def _prepare(self):
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
170
        self.build_tree(['parent/'])
171
        self.run_bzr('init', 'parent')
172
        self.run_bzr('commit', '-m', 'first post', '--unchanged', 'parent')
173
        self.run_bzr('branch', 'parent', 'child')
174
        self.run_bzr('commit', '-m', 'branch 1', '--unchanged', 'child')
175
        self.run_bzr('branch', 'child', 'smallerchild')
176
        self.run_bzr('commit', '-m', 'branch 2', '--unchanged', 'smallerchild')
177
        os.chdir('child')
178
        self.run_bzr('merge', '../smallerchild')
179
        self.run_bzr('commit', '-m', 'merge branch 2')
180
        os.chdir('../parent')
181
        self.run_bzr('merge', '../child')
182
        self.run_bzr('commit', '-m', 'merge branch 1')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
183
184
    def test_merges_are_indented_by_level(self):
185
        self._prepare()
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
186
        out,err = self.run_bzr('log')
187
        # the log will look something like:
188
#        self.assertEqual("""\
189
#------------------------------------------------------------
190
#revno: 2
191
#committer: Robert Collins <foo@example.com>
192
#branch nick: parent
193
#timestamp: Tue 2006-03-28 22:31:40 +1100
194
#message:
195
#  merge branch 1
196
#    ------------------------------------------------------------
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
197
#    revno: 1.1.2  
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
198
#    committer: Robert Collins <foo@example.com>
199
#    branch nick: child
200
#    timestamp: Tue 2006-03-28 22:31:40 +1100
201
#    message:
202
#      merge branch 2
203
#        ------------------------------------------------------------
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
204
#        revno: 1.1.1.1
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
205
#        committer: Robert Collins <foo@example.com>
206
#        branch nick: smallerchild
207
#        timestamp: Tue 2006-03-28 22:31:40 +1100
208
#        message:
209
#          branch 2
210
#    ------------------------------------------------------------
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
211
#    revno: 1.1.1
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
212
#    committer: Robert Collins <foo@example.com>
213
#    branch nick: child
214
#    timestamp: Tue 2006-03-28 22:31:40 +1100
215
#    message:
216
#      branch 1
217
#------------------------------------------------------------
218
#revno: 1
219
#committer: Robert Collins <foo@example.com>
220
#branch nick: parent
221
#timestamp: Tue 2006-03-28 22:31:39 +1100
222
#message:
223
#  first post
224
#""", out)
225
        # but we dont have a nice pattern matcher hooked up yet, so:
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
226
        # we check for the indenting of the commit message and the 
227
        # revision numbers 
228
        self.assertTrue('revno: 2' in out)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
229
        self.assertTrue('  merge branch 1' in out)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
230
        self.assertTrue('    revno: 1.1.2' in out)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
231
        self.assertTrue('      merge branch 2' in out)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
232
        self.assertTrue('        revno: 1.1.1.1' in out)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
233
        self.assertTrue('          branch 2' in out)
1988.4.2 by Robert Collins
``bzr log`` Now shows dotted-decimal revision numbers for all revisions,
234
        self.assertTrue('    revno: 1.1.1' in out)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
235
        self.assertTrue('      branch 1' in out)
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
236
        self.assertTrue('revno: 1\n' in out)
1624.1.3 by Robert Collins
Convert log to use the new tsort.merge_sort routine.
237
        self.assertTrue('  first post' in out)
238
        self.assertEqual('', err)
1685.1.5 by John Arbash Meinel
Merged test_log.py.moved into test_log.py
239
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
240
    def test_merges_single_merge_rev(self):
241
        self._prepare()
242
        out,err = self.run_bzr('log', '-r1.1.2')
243
        # the log will look something like:
244
#        self.assertEqual("""\
245
#    ------------------------------------------------------------
246
#    revno: 1.1.2  
247
#    committer: Robert Collins <foo@example.com>
248
#    branch nick: child
249
#    timestamp: Tue 2006-03-28 22:31:40 +1100
250
#    message:
251
#      merge branch 2
252
#        ------------------------------------------------------------
253
#        revno: 1.1.1.1
254
#        committer: Robert Collins <foo@example.com>
255
#        branch nick: smallerchild
256
#        timestamp: Tue 2006-03-28 22:31:40 +1100
257
#        message:
258
#          branch 2
259
#""", out)
260
        # but we dont have a nice pattern matcher hooked up yet, so:
261
        # we check for the indenting of the commit message and the 
262
        # revision numbers 
263
        self.assertTrue('revno: 2' not in out)
264
        self.assertTrue('  merge branch 1' not in out)
265
        self.assertTrue('    revno: 1.1.2' in out)
266
        self.assertTrue('      merge branch 2' in out)
267
        self.assertTrue('        revno: 1.1.1.1' in out)
268
        self.assertTrue('          branch 2' in out)
269
        self.assertTrue('    revno: 1.1.1\n' not in out)
270
        self.assertTrue('      branch 1' not in out)
271
        self.assertTrue('revno: 1\n' not in out)
272
        self.assertTrue('  first post' not in out)
273
        self.assertEqual('', err)
274
275
    def test_merges_partial_range(self):
276
        self._prepare()
277
        out,err = self.run_bzr('log', '-r1.1.1..1.1.2')
278
        # the log will look something like:
279
#        self.assertEqual("""\
280
#    ------------------------------------------------------------
281
#    revno: 1.1.2  
282
#    committer: Robert Collins <foo@example.com>
283
#    branch nick: child
284
#    timestamp: Tue 2006-03-28 22:31:40 +1100
285
#    message:
286
#      merge branch 2
287
#        ------------------------------------------------------------
288
#        revno: 1.1.1.1
289
#        committer: Robert Collins <foo@example.com>
290
#        branch nick: smallerchild
291
#        timestamp: Tue 2006-03-28 22:31:40 +1100
292
#        message:
293
#          branch 2
294
#    ------------------------------------------------------------
295
#    revno: 1.1.1
296
#    committer: Robert Collins <foo@example.com>
297
#    branch nick: child
298
#    timestamp: Tue 2006-03-28 22:31:40 +1100
299
#    message:
300
#      branch 1
301
#""", out)
302
        # but we dont have a nice pattern matcher hooked up yet, so:
303
        # we check for the indenting of the commit message and the 
304
        # revision numbers 
305
        self.assertTrue('revno: 2' not in out)
306
        self.assertTrue('  merge branch 1' not in out)
307
        self.assertTrue('    revno: 1.1.2' in out)
308
        self.assertTrue('      merge branch 2' in out)
309
        self.assertTrue('        revno: 1.1.1.1' in out)
310
        self.assertTrue('          branch 2' in out)
311
        self.assertTrue('    revno: 1.1.1' in out)
312
        self.assertTrue('      branch 1' in out)
313
        self.assertTrue('revno: 1\n' not in out)
314
        self.assertTrue('  first post' not in out)
315
        self.assertEqual('', err)
316
317
 
1685.1.5 by John Arbash Meinel
Merged test_log.py.moved into test_log.py
318
class TestLogEncodings(TestCaseInTempDir):
319
320
    _mu = u'\xb5'
321
    _message = u'Message with \xb5'
322
323
    # Encodings which can encode mu
324
    good_encodings = [
325
        'utf-8',
326
        'latin-1',
327
        'iso-8859-1',
328
        'cp437', # Common windows encoding
329
        'cp1251', # Alexander Belchenko's windows encoding
330
        'cp1258', # Common windows encoding
331
    ]
332
    # Encodings which cannot encode mu
333
    bad_encodings = [
334
        'ascii',
335
        'iso-8859-2',
336
        'koi8_r',
337
    ]
338
339
    def setUp(self):
340
        TestCaseInTempDir.setUp(self)
341
        self.user_encoding = bzrlib.user_encoding
342
343
    def tearDown(self):
344
        bzrlib.user_encoding = self.user_encoding
345
        TestCaseInTempDir.tearDown(self)
346
347
    def create_branch(self):
348
        bzr = self.run_bzr
349
        bzr('init')
350
        open('a', 'wb').write('some stuff\n')
351
        bzr('add', 'a')
352
        bzr('commit', '-m', self._message)
353
354
    def try_encoding(self, encoding, fail=False):
355
        bzr = self.run_bzr
356
        if fail:
357
            self.assertRaises(UnicodeEncodeError,
358
                self._mu.encode, encoding)
359
            encoded_msg = self._message.encode(encoding, 'replace')
360
        else:
361
            encoded_msg = self._message.encode(encoding)
362
363
        old_encoding = bzrlib.user_encoding
364
        # This test requires that 'run_bzr' uses the current
365
        # bzrlib, because we override user_encoding, and expect
366
        # it to be used
367
        try:
368
            bzrlib.user_encoding = 'ascii'
369
            # We should be able to handle any encoding
370
            out, err = bzr('log', encoding=encoding)
371
            if not fail:
372
                # Make sure we wrote mu as we expected it to exist
373
                self.assertNotEqual(-1, out.find(encoded_msg))
374
                out_unicode = out.decode(encoding)
375
                self.assertNotEqual(-1, out_unicode.find(self._message))
376
            else:
377
                self.assertNotEqual(-1, out.find('Message with ?'))
378
        finally:
379
            bzrlib.user_encoding = old_encoding
380
381
    def test_log_handles_encoding(self):
382
        self.create_branch()
383
384
        for encoding in self.good_encodings:
385
            self.try_encoding(encoding)
386
387
    def test_log_handles_bad_encoding(self):
388
        self.create_branch()
389
390
        for encoding in self.bad_encodings:
391
            self.try_encoding(encoding, fail=True)
392
393
    def test_stdout_encoding(self):
394
        bzr = self.run_bzr
395
        bzrlib.user_encoding = "cp1251"
396
397
        bzr('init')
398
        self.build_tree(['a'])
399
        bzr('add', 'a')
400
        bzr('commit', '-m', u'\u0422\u0435\u0441\u0442')
401
        stdout, stderr = self.run_bzr('log', encoding='cp866')
402
403
        message = stdout.splitlines()[-1]
404
405
        # explanation of the check:
406
        # u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
407
        # in cp866  encoding this is string '\x92\xa5\xe1\xe2'
408
        # in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
409
        # This test should check that output of log command
410
        # encoded to sys.stdout.encoding
411
        test_in_cp866 = '\x92\xa5\xe1\xe2'
412
        test_in_cp1251 = '\xd2\xe5\xf1\xf2'
413
        # Make sure the log string is encoded in cp866
414
        self.assertEquals(test_in_cp866, message[2:])
415
        # Make sure the cp1251 string is not found anywhere
416
        self.assertEquals(-1, stdout.find(test_in_cp1251))
417
1551.10.18 by Aaron Bentley
Log works in local treeless branches (#84247)
418
419
class TestLogFile(TestCaseWithTransport):
420
421
    def test_log_local_branch_file(self):
422
        """We should be able to log files in local treeless branches"""
423
        tree = self.make_branch_and_tree('tree')
424
        self.build_tree(['tree/file'])
425
        tree.add('file')
426
        tree.commit('revision 1')
427
        tree.bzrdir.destroy_workingtree()
428
        self.run_bzr('log', 'tree/file')
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
429
430
    def test_log_file(self):
431
        """The log for a particular file should only list revs for that file"""
432
        tree = self.make_branch_and_tree('parent')
433
        self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
434
        tree.add('file1')
435
        tree.commit('add file1')
436
        tree.add('file2')
437
        tree.commit('add file2')
438
        tree.add('file3')
439
        tree.commit('add file3')
440
        self.run_bzr('branch', 'parent', 'child')
441
        print >> file('child/file2', 'wb'), 'hello'
442
        self.run_bzr('commit', '-m', 'branch 1', 'child')
443
        os.chdir('parent')
444
        self.run_bzr('merge', '../child')
2359.1.2 by Kent Gibson
add logging of merge revisions
445
        self.run_bzr('commit', '-m', 'merge child branch')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
446
       
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
447
        log = self.run_bzr('log', 'file1')[0]
448
        self.assertContainsRe(log, 'revno: 1\n')
449
        self.assertNotContainsRe(log, 'revno: 2\n')
450
        self.assertNotContainsRe(log, 'revno: 3\n')
451
        self.assertNotContainsRe(log, 'revno: 3.1.1\n')
452
        self.assertNotContainsRe(log, 'revno: 4\n')
453
        log = self.run_bzr('log', 'file2')[0]
454
        self.assertNotContainsRe(log, 'revno: 1\n')
455
        self.assertContainsRe(log, 'revno: 2\n')
456
        self.assertNotContainsRe(log, 'revno: 3\n')
457
        self.assertContainsRe(log, 'revno: 3.1.1\n')
2359.1.2 by Kent Gibson
add logging of merge revisions
458
        self.assertContainsRe(log, 'revno: 4\n')
2359.1.1 by Kent Gibson
Fix ``bzr log <file>`` so it only logs the revisions that changed the file, and does it faster.
459
        log = self.run_bzr('log', 'file3')[0]
460
        self.assertNotContainsRe(log, 'revno: 1\n')
461
        self.assertNotContainsRe(log, 'revno: 2\n')
462
        self.assertContainsRe(log, 'revno: 3\n')
463
        self.assertNotContainsRe(log, 'revno: 3.1.1\n')
464
        self.assertNotContainsRe(log, 'revno: 4\n')
2466.12.1 by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions.
465
        log = self.run_bzr('log', '-r3.1.1', 'file2')[0]
466
        self.assertNotContainsRe(log, 'revno: 1\n')
467
        self.assertNotContainsRe(log, 'revno: 2\n')
468
        self.assertNotContainsRe(log, 'revno: 3\n')
469
        self.assertContainsRe(log, 'revno: 3.1.1\n')
470
        self.assertNotContainsRe(log, 'revno: 4\n')
471
        log = self.run_bzr('log', '-r4', 'file2')[0]
472
        self.assertNotContainsRe(log, 'revno: 1\n')
473
        self.assertNotContainsRe(log, 'revno: 2\n')
474
        self.assertNotContainsRe(log, 'revno: 3\n')
475
        self.assertContainsRe(log, 'revno: 3.1.1\n')
476
        self.assertContainsRe(log, 'revno: 4\n')
477
        log = self.run_bzr('log', '-r3..', 'file2')[0]
478
        self.assertNotContainsRe(log, 'revno: 1\n')
479
        self.assertNotContainsRe(log, 'revno: 2\n')
480
        self.assertNotContainsRe(log, 'revno: 3\n')
481
        self.assertContainsRe(log, 'revno: 3.1.1\n')
482
        self.assertContainsRe(log, 'revno: 4\n')
483
        log = self.run_bzr('log', '-r..3', 'file2')[0]
484
        self.assertNotContainsRe(log, 'revno: 1\n')
485
        self.assertContainsRe(log, 'revno: 2\n')
486
        self.assertNotContainsRe(log, 'revno: 3\n')
487
        self.assertNotContainsRe(log, 'revno: 3.1.1\n')
488
        self.assertNotContainsRe(log, 'revno: 4\n')