/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/benchmarks/bench_knit.py

terminal_width can now returns None.

* bzrlib/win32utils.py:
(get_console_size): Fix typo in comment.

* bzrlib/ui/text.py:
(TextProgressView._show_line): Handle the no terminal present case.

* bzrlib/tests/test_osutils.py:
(TestTerminalWidth): Update tests.

* bzrlib/tests/blackbox/test_too_much.py:
Fix some imports.
(OldTests.test_bzr): Handle the no terminal present case.

* bzrlib/tests/__init__.py:
(VerboseTestResult.report_test_start): Handle the no terminal
present case.

* bzrlib/status.py:
(show_pending_merges): Handle the no terminal present case.
(show_pending_merges.show_log_message): Factor out some
code. Handle the no terminal present case.

* bzrlib/osutils.py:
(terminal_width): Return None if no precise value can be found.

* bzrlib/log.py:
(LineLogFormatter.__init__): Handle the no terminal present case.
(LineLogFormatter.truncate): Accept None as max_len meaning no
truncation.
(LineLogFormatter.log_string): 

* bzrlib/help.py:
(_help_commands_to_text): Handle the no terminal present case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/benchmarks/bench_knit.py
61
61
 
62
62
    def setup_load_data_c(self):
63
63
        self.requireFeature(CompiledKnitFeature)
 
64
        orig = knit._load_data
 
65
        def reset():
 
66
            knit._load_data = orig
 
67
        self.addCleanup(reset)
64
68
        from bzrlib._knit_load_data_pyx import _load_data_c
65
 
        self.overrideAttr(knit, '_load_data', _load_data_c)
 
69
        knit._load_data = _load_data_c
66
70
 
67
71
    def setup_load_data_py(self):
 
72
        orig = knit._load_data
 
73
        def reset():
 
74
            knit._load_data = orig
 
75
        self.addCleanup(reset)
68
76
        from bzrlib._knit_load_data_py import _load_data_py
69
 
        self.overrideAttr(knit, '_load_data', _load_data_py)
 
77
        knit._load_data = _load_data_py
70
78
 
71
79
    def test_read_50k_index_c(self):
72
80
        self.setup_load_data_c()