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