/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-27 06:14:45 UTC
  • mfrom: (3793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3795.
  • Revision ID: andrew.bennetts@canonical.com-20081027061445-eqt9lz6uw1mbvq4g
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
20
20
 
21
21
import os
22
22
 
23
 
import bzrlib
 
23
from bzrlib import osutils
24
24
from bzrlib.tests.blackbox import ExternalBase
25
25
from bzrlib.tests import TestCaseInTempDir, TestCaseWithTransport
26
26
from bzrlib.tests.test_log import (
138
138
        self.assertTrue('revno: 2\n' not in log)
139
139
        self.assertTrue('branch nick: branch2\n' in log)
140
140
        self.assertTrue('branch nick: branch1\n' not in log)
141
 
        
 
141
 
 
142
    def test_log_change_revno(self):
 
143
        self._prepare()
 
144
        expected_log = self.run_bzr("log -r 1")[0]
 
145
        log = self.run_bzr("log -c 1")[0]
 
146
        self.assertEqualDiff(expected_log, log)
 
147
 
 
148
    def test_log_change_single_revno(self):
 
149
        self._prepare()
 
150
        self.run_bzr_error('bzr: ERROR: Option --change does not'
 
151
                           ' accept revision ranges',
 
152
                           ['log', '--change', '2..3'])
 
153
 
 
154
    def test_log_change_incompatible_with_revision(self):
 
155
        self._prepare()
 
156
        self.run_bzr_error('bzr: ERROR: --revision and --change'
 
157
                           ' are mutually exclusive',
 
158
                           ['log', '--change', '2', '--revision', '3'])
 
159
 
142
160
    def test_log_nonexistent_file(self):
143
161
        # files that don't exist in either the basis tree or working tree
144
162
        # should give an error
345
363
 
346
364
    def setUp(self):
347
365
        TestCaseInTempDir.setUp(self)
348
 
        self.user_encoding = bzrlib.user_encoding
 
366
        self.user_encoding = osutils._cached_user_encoding
349
367
 
350
368
    def tearDown(self):
351
 
        bzrlib.user_encoding = self.user_encoding
 
369
        osutils._cached_user_encoding = self.user_encoding
352
370
        TestCaseInTempDir.tearDown(self)
353
371
 
354
372
    def create_branch(self):
367
385
        else:
368
386
            encoded_msg = self._message.encode(encoding)
369
387
 
370
 
        old_encoding = bzrlib.user_encoding
 
388
        old_encoding = osutils._cached_user_encoding
371
389
        # This test requires that 'run_bzr' uses the current
372
390
        # bzrlib, because we override user_encoding, and expect
373
391
        # it to be used
374
392
        try:
375
 
            bzrlib.user_encoding = 'ascii'
 
393
            osutils._cached_user_encoding = 'ascii'
376
394
            # We should be able to handle any encoding
377
395
            out, err = bzr('log', encoding=encoding)
378
396
            if not fail:
383
401
            else:
384
402
                self.assertNotEqual(-1, out.find('Message with ?'))
385
403
        finally:
386
 
            bzrlib.user_encoding = old_encoding
 
404
            osutils._cached_user_encoding = old_encoding
387
405
 
388
406
    def test_log_handles_encoding(self):
389
407
        self.create_branch()
399
417
 
400
418
    def test_stdout_encoding(self):
401
419
        bzr = self.run_bzr
402
 
        bzrlib.user_encoding = "cp1251"
 
420
        osutils._cached_user_encoding = "cp1251"
403
421
 
404
422
        bzr('init')
405
423
        self.build_tree(['a'])