2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
16 |
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
17 |
"""Messages and logging for bazaar-ng.
|
18 |
||
19 |
Messages are supplied by callers as a string-formatting template, plus values
|
|
20 |
to be inserted into it. The actual %-formatting is deferred to the log
|
|
21 |
library so that it doesn't need to be done for messages that won't be emitted.
|
|
22 |
||
23 |
Messages are classified by severity levels: critical, error, warning, info,
|
|
24 |
and debug.
|
|
25 |
||
26 |
They can be sent to two places: to stderr, and to ~/.bzr.log. For purposes
|
|
27 |
such as running the test suite, they can also be redirected away from both of
|
|
28 |
those two places to another location.
|
|
29 |
||
30 |
~/.bzr.log gets all messages, and full tracebacks for uncaught exceptions.
|
|
1185.33.51
by Martin Pool
Fix trace of non-ascii messages, and add test. |
31 |
This trace file is always in UTF-8, regardless of the user's default encoding,
|
32 |
so that we can always rely on writing any message.
|
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
33 |
|
34 |
Output to stderr depends on the mode chosen by the user. By default, messages
|
|
35 |
of info and above are sent out, which results in progress messages such as the
|
|
36 |
list of files processed by add and commit. In quiet mode, only warnings and
|
|
37 |
above are shown. In debug mode, stderr gets debug messages too.
|
|
38 |
||
39 |
Errors that terminate an operation are generally passed back as exceptions;
|
|
40 |
others may be just emitted as messages.
|
|
41 |
||
42 |
Exceptions are reported in a brief form to stderr so as not to look scary.
|
|
43 |
BzrErrors are required to be able to format themselves into a properly
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
44 |
explanatory message. This is not true for builtin exceptions such as
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
45 |
KeyError, which typically just str to "0". They're printed in a different
|
46 |
form.
|
|
344
by Martin Pool
- It's not an error to use the library without |
47 |
"""
|
48 |
||
1185.16.74
by Martin Pool
doc |
49 |
# FIXME: Unfortunately it turns out that python's logging module
|
50 |
# is quite expensive, even when the message is not printed by any handlers.
|
|
51 |
# We should perhaps change back to just simply doing it here.
|
|
52 |
||
2978.1.1
by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173) |
53 |
import codecs |
54 |
import logging |
|
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
55 |
import os |
1551.9.3
by Aaron Bentley
Revert buggy apport changes |
56 |
import sys |
2123.1.1
by Robert Collins
(Robert Collins) Extend the problem reporting command line UI to use |
57 |
import re |
1996.3.29
by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace |
58 |
|
59 |
from bzrlib.lazy_import import lazy_import |
|
60 |
lazy_import(globals(), """ |
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
61 |
from cStringIO import StringIO
|
1996.3.29
by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace |
62 |
import errno
|
2842.1.1
by Martin Pool
Report locale, encodings and plugins in traceback |
63 |
import locale
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
64 |
import traceback
|
1996.3.29
by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace |
65 |
""") |
1097
by Martin Pool
- send trace messages out through python logging module |
66 |
|
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
67 |
import bzrlib |
1097
by Martin Pool
- send trace messages out through python logging module |
68 |
|
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
69 |
lazy_import(globals(), """ |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
70 |
from bzrlib import (
|
71 |
debug,
|
|
72 |
errors,
|
|
2842.1.1
by Martin Pool
Report locale, encodings and plugins in traceback |
73 |
osutils,
|
74 |
plugin,
|
|
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
75 |
)
|
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
76 |
""") |
77 |
||
1101
by Martin Pool
- add global definition to quieten pychecker |
78 |
_file_handler = None |
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
79 |
_stderr_handler = None |
2768.1.2
by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py |
80 |
_verbosity_level = 0 |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
81 |
_trace_file = None |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
82 |
_trace_depth = 0 |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
83 |
_bzr_log_file = None |
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
84 |
_bzr_log_filename = None |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
85 |
|
1185.49.17
by John Arbash Meinel
[merge] Robey Pointer - some sftp fixes, and an http patch |
86 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
87 |
# configure convenient aliases for output routines
|
88 |
||
89 |
_bzr_logger = logging.getLogger('bzr') |
|
90 |
||
2978.1.1
by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173) |
91 |
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
92 |
def note(*args, **kwargs): |
1793.2.16
by Aaron Bentley
More notes on 'note' |
93 |
# FIXME note always emits utf-8, regardless of the terminal encoding
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
94 |
import bzrlib.ui |
95 |
bzrlib.ui.ui_factory.clear_term() |
|
96 |
_bzr_logger.info(*args, **kwargs) |
|
97 |
||
98 |
def warning(*args, **kwargs): |
|
99 |
import bzrlib.ui |
|
100 |
bzrlib.ui.ui_factory.clear_term() |
|
101 |
_bzr_logger.warning(*args, **kwargs) |
|
102 |
||
103 |
info = note |
|
1097
by Martin Pool
- send trace messages out through python logging module |
104 |
log_error = _bzr_logger.error |
105 |
error = _bzr_logger.error |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
106 |
|
107 |
||
108 |
def mutter(fmt, *args): |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
109 |
if _trace_file is None: |
110 |
return
|
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
111 |
if (getattr(_trace_file, 'closed', None) is not None) and _trace_file.closed: |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
112 |
return
|
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
113 |
|
114 |
if isinstance(fmt, unicode): |
|
115 |
fmt = fmt.encode('utf8') |
|
116 |
||
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
117 |
if len(args) > 0: |
1685.1.2
by John Arbash Meinel
Re-enabling the non_ascii tests after fixing trace.py, bzr ignore also does the right thing now |
118 |
# It seems that if we do ascii % (unicode, ascii) we can
|
119 |
# get a unicode cannot encode ascii error, so make sure that "fmt"
|
|
120 |
# is a unicode string
|
|
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
121 |
real_args = [] |
122 |
for arg in args: |
|
123 |
if isinstance(arg, unicode): |
|
124 |
arg = arg.encode('utf8') |
|
125 |
real_args.append(arg) |
|
126 |
out = fmt % tuple(real_args) |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
127 |
else: |
1185.33.51
by Martin Pool
Fix trace of non-ascii messages, and add test. |
128 |
out = fmt |
129 |
out += '\n' |
|
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
130 |
_trace_file.write(out) |
1185.85.5
by John Arbash Meinel
mutter() should not fail because of unicode errors |
131 |
# TODO: jam 20051227 Consider flushing the trace file to help debugging
|
132 |
#_trace_file.flush()
|
|
1097
by Martin Pool
- send trace messages out through python logging module |
133 |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
134 |
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
135 |
def mutter_callsite(stacklevel, fmt, *args): |
136 |
"""Perform a mutter of fmt and args, logging the call trace.
|
|
137 |
||
138 |
:param stacklevel: The number of frames to show. None will show all
|
|
139 |
frames.
|
|
140 |
:param fmt: The format string to pass to mutter.
|
|
141 |
:param args: A list of substitution variables.
|
|
142 |
"""
|
|
143 |
outf = StringIO() |
|
144 |
traceback.print_stack(limit=stacklevel + 1, file=outf) |
|
145 |
formatted_lines = outf.getvalue().splitlines() |
|
146 |
formatted_stack = '\n'.join(formatted_lines[:-2]) |
|
147 |
mutter(fmt + "\nCalled from:\n%s", *(args + (formatted_stack,))) |
|
148 |
||
149 |
||
261
by Martin Pool
- auto-rollover of .bzr.log |
150 |
def _rollover_trace_maybe(trace_fname): |
359
by Martin Pool
- pychecker fixups |
151 |
import stat |
261
by Martin Pool
- auto-rollover of .bzr.log |
152 |
try: |
153 |
size = os.stat(trace_fname)[stat.ST_SIZE] |
|
333
by Martin Pool
- allow trace file to grow up to 4MB |
154 |
if size <= 4 << 20: |
261
by Martin Pool
- auto-rollover of .bzr.log |
155 |
return
|
156 |
old_fname = trace_fname + '.old' |
|
2851.3.1
by Martin Pool
Add unit test for _rollover_trace_maybe |
157 |
osutils.rename(trace_fname, old_fname) |
261
by Martin Pool
- auto-rollover of .bzr.log |
158 |
except OSError: |
159 |
return
|
|
160 |
||
161 |
||
2245.4.2
by Alexander Belchenko
trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log |
162 |
def open_tracefile(tracefilename=None): |
59
by mbp at sourcefrog
lift out tracefile creation code |
163 |
# Messages are always written to here, so that we have some
|
164 |
# information if something goes wrong. In a future version this
|
|
165 |
# file will be removed on successful completion.
|
|
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
166 |
global _file_handler, _bzr_log_file, _bzr_log_filename |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
167 |
import codecs |
59
by mbp at sourcefrog
lift out tracefile creation code |
168 |
|
2245.4.2
by Alexander Belchenko
trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log |
169 |
if tracefilename is None: |
170 |
if sys.platform == 'win32': |
|
171 |
from bzrlib import win32utils |
|
172 |
home = win32utils.get_home_location() |
|
173 |
else: |
|
174 |
home = os.path.expanduser('~') |
|
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
175 |
_bzr_log_filename = os.path.join(home, '.bzr.log') |
2684.1.1
by Andrew Bennetts
Fix bzrlib.opentracefile('foo'). |
176 |
else: |
177 |
_bzr_log_filename = tracefilename |
|
2245.4.2
by Alexander Belchenko
trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log |
178 |
|
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
179 |
_bzr_log_filename = os.path.expanduser(_bzr_log_filename) |
180 |
_rollover_trace_maybe(_bzr_log_filename) |
|
403
by Martin Pool
- Don't give an error if the trace file can't be opened |
181 |
try: |
1185.33.11
by Martin Pool
Code format cleanups |
182 |
LINE_BUFFERED = 1 |
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
183 |
#tf = codecs.open(trace_fname, 'at', 'utf8', buffering=LINE_BUFFERED)
|
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
184 |
tf = open(_bzr_log_filename, 'at', LINE_BUFFERED) |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
185 |
_bzr_log_file = tf |
2245.4.2
by Alexander Belchenko
trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log |
186 |
# tf.tell() on windows always return 0 until some writing done
|
187 |
tf.write('\n') |
|
188 |
if tf.tell() <= 2: |
|
189 |
tf.write("this is a debug log for diagnosing/reporting problems in bzr\n") |
|
1100
by Martin Pool
- fix name error reported by Andrew Bennetts |
190 |
tf.write("you can delete or truncate this file, or include sections in\n") |
2234.5.1
by Wouter van Heyst
Update the mailing list address. |
191 |
tf.write("bug reports to bazaar@lists.canonical.com\n\n") |
1097
by Martin Pool
- send trace messages out through python logging module |
192 |
_file_handler = logging.StreamHandler(tf) |
193 |
fmt = r'[%(process)5d] %(asctime)s.%(msecs)03d %(levelname)s: %(message)s' |
|
194 |
datefmt = r'%a %H:%M:%S' |
|
195 |
_file_handler.setFormatter(logging.Formatter(fmt, datefmt)) |
|
196 |
_file_handler.setLevel(logging.DEBUG) |
|
197 |
logging.getLogger('').addHandler(_file_handler) |
|
403
by Martin Pool
- Don't give an error if the trace file can't be opened |
198 |
except IOError, e: |
199 |
warning("failed to open trace file: %s" % (e)) |
|
260
by Martin Pool
- remove atexit() dependency for writing out execution times |
200 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
201 |
|
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
202 |
def log_exception_quietly(): |
203 |
"""Log the last exception to the trace file only.
|
|
204 |
||
205 |
Used for exceptions that occur internally and that may be
|
|
206 |
interesting to developers but not to users. For example,
|
|
207 |
errors loading plugins.
|
|
208 |
"""
|
|
1185.33.11
by Martin Pool
Code format cleanups |
209 |
import traceback |
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
210 |
mutter(traceback.format_exc()) |
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
211 |
|
212 |
||
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
213 |
def enable_default_logging(): |
214 |
"""Configure default logging to stderr and .bzr.log"""
|
|
1185.43.9
by Martin Pool
Make logging of errors go through our trace functions |
215 |
# FIXME: if this is run twice, things get confused
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
216 |
global _stderr_handler, _file_handler, _trace_file, _bzr_log_file |
2978.1.1
by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173) |
217 |
# create encoded wrapper around stderr
|
218 |
stderr = codecs.getwriter(osutils.get_terminal_encoding())(sys.stderr, |
|
219 |
errors='replace') |
|
220 |
_stderr_handler = logging.StreamHandler(stderr) |
|
1185.34.2
by Jelmer Vernooij
Don't quite when tracefile can't be opened. Display warning |
221 |
logging.getLogger('').addHandler(_stderr_handler) |
1359
by Martin Pool
- merge in new BZR_NOISY vs BZR_DEBUG stuff from main |
222 |
_stderr_handler.setLevel(logging.INFO) |
1185.34.2
by Jelmer Vernooij
Don't quite when tracefile can't be opened. Display warning |
223 |
if not _file_handler: |
224 |
open_tracefile() |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
225 |
_trace_file = _bzr_log_file |
1185.34.2
by Jelmer Vernooij
Don't quite when tracefile can't be opened. Display warning |
226 |
if _file_handler: |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
227 |
_file_handler.setLevel(logging.DEBUG) |
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
228 |
_bzr_logger.setLevel(logging.DEBUG) |
1359
by Martin Pool
- merge in new BZR_NOISY vs BZR_DEBUG stuff from main |
229 |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
230 |
|
2768.1.2
by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py |
231 |
def set_verbosity_level(level): |
232 |
"""Set the verbosity level.
|
|
233 |
||
234 |
:param level: -ve for quiet, 0 for normal, +ve for verbose
|
|
235 |
"""
|
|
236 |
global _verbosity_level |
|
237 |
_verbosity_level = level |
|
238 |
_update_logging_level(level < 0) |
|
239 |
||
240 |
||
241 |
def get_verbosity_level(): |
|
242 |
"""Get the verbosity level.
|
|
243 |
||
244 |
See set_verbosity_level() for values.
|
|
245 |
"""
|
|
2768.1.10
by Ian Clatworthy
Add tests for new methods in trace.py |
246 |
return _verbosity_level |
2768.1.2
by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py |
247 |
|
248 |
||
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
249 |
def be_quiet(quiet=True): |
2768.1.2
by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py |
250 |
# Perhaps this could be deprecated now ...
|
251 |
if quiet: |
|
252 |
set_verbosity_level(-1) |
|
253 |
else: |
|
254 |
set_verbosity_level(0) |
|
255 |
||
256 |
||
257 |
def _update_logging_level(quiet=True): |
|
258 |
"""Hide INFO messages if quiet."""
|
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
259 |
if quiet: |
260 |
_stderr_handler.setLevel(logging.WARNING) |
|
261 |
else: |
|
262 |
_stderr_handler.setLevel(logging.INFO) |
|
263 |
||
264 |
||
265 |
def is_quiet(): |
|
2768.1.2
by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py |
266 |
"""Is the verbosity level negative?"""
|
267 |
return _verbosity_level < 0 |
|
268 |
||
269 |
||
270 |
def is_verbose(): |
|
271 |
"""Is the verbosity level positive?"""
|
|
272 |
return _verbosity_level > 0 |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
273 |
|
274 |
||
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
275 |
def disable_default_logging(): |
276 |
"""Turn off default log handlers.
|
|
277 |
||
278 |
This is intended to be used by the test framework, which doesn't
|
|
279 |
want leakage from the code-under-test into the main logs.
|
|
280 |
"""
|
|
1112
by Martin Pool
- disable standard logging to .bzr.log and stderr while running |
281 |
|
282 |
l = logging.getLogger('') |
|
283 |
l.removeHandler(_stderr_handler) |
|
284 |
if _file_handler: |
|
285 |
l.removeHandler(_file_handler) |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
286 |
_trace_file = None |
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
287 |
|
288 |
||
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
289 |
def enable_test_log(to_file): |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
290 |
"""Redirect logging to a temporary file for a test
|
291 |
|
|
292 |
returns an opaque reference that should be passed to disable_test_log
|
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
293 |
after the test completes.
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
294 |
"""
|
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
295 |
disable_default_logging() |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
296 |
global _trace_file |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
297 |
global _trace_depth |
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
298 |
hdlr = logging.StreamHandler(to_file) |
299 |
hdlr.setLevel(logging.DEBUG) |
|
300 |
hdlr.setFormatter(logging.Formatter('%(levelname)8s %(message)s')) |
|
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
301 |
_bzr_logger.addHandler(hdlr) |
302 |
_bzr_logger.setLevel(logging.DEBUG) |
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
303 |
result = hdlr, _trace_file, _trace_depth |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
304 |
_trace_file = to_file |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
305 |
_trace_depth += 1 |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
306 |
return result |
307 |
||
308 |
||
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
309 |
def disable_test_log((test_log_hdlr, old_trace_file, old_trace_depth)): |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
310 |
_bzr_logger.removeHandler(test_log_hdlr) |
1641.2.1
by Olaf Conradi
Close logging handler on disabling the test log. This will remove the |
311 |
test_log_hdlr.close() |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
312 |
global _trace_file |
313 |
global _trace_depth |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
314 |
_trace_file = old_trace_file |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
315 |
_trace_depth = old_trace_depth |
316 |
if not _trace_depth: |
|
317 |
enable_default_logging() |
|
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
318 |
|
319 |
||
1740.5.2
by Martin Pool
Improved tests for display of exceptions. |
320 |
def report_exception(exc_info, err_file): |
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
321 |
"""Report an exception to err_file (typically stderr) and to .bzr.log.
|
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
322 |
|
323 |
This will show either a full traceback or a short message as appropriate.
|
|
324 |
||
325 |
:return: The appropriate exit code for this error.
|
|
326 |
"""
|
|
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
327 |
exc_type, exc_object, exc_tb = exc_info |
1711.2.86
by John Arbash Meinel
Restore logging of full traceback. Helps with debugging tests. |
328 |
# Log the full traceback to ~/.bzr.log
|
329 |
log_exception_quietly() |
|
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
330 |
if (isinstance(exc_object, IOError) |
331 |
and getattr(exc_object, 'errno', None) == errno.EPIPE): |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
332 |
err_file.write("bzr: broken pipe\n") |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
333 |
return errors.EXIT_ERROR |
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
334 |
elif isinstance(exc_object, KeyboardInterrupt): |
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
335 |
err_file.write("bzr: interrupted\n") |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
336 |
return errors.EXIT_ERROR |
2067.3.2
by Martin Pool
Error cleanup review comments: |
337 |
elif not getattr(exc_object, 'internal_error', True): |
1740.5.6
by Martin Pool
Clean up many exception classes. |
338 |
report_user_error(exc_info, err_file) |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
339 |
return errors.EXIT_ERROR |
1740.5.6
by Martin Pool
Clean up many exception classes. |
340 |
elif isinstance(exc_object, (OSError, IOError)): |
341 |
# Might be nice to catch all of these and show them as something more
|
|
342 |
# specific, but there are too many cases at the moment.
|
|
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
343 |
report_user_error(exc_info, err_file) |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
344 |
return errors.EXIT_ERROR |
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
345 |
else: |
1551.9.3
by Aaron Bentley
Revert buggy apport changes |
346 |
report_bug(exc_info, err_file) |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
347 |
return errors.EXIT_INTERNAL_ERROR |
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
348 |
|
349 |
||
350 |
# TODO: Should these be specially encoding the output?
|
|
351 |
def report_user_error(exc_info, err_file): |
|
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
352 |
"""Report to err_file an error that's not an internal error.
|
353 |
||
354 |
These don't get a traceback unless -Derror was given.
|
|
355 |
"""
|
|
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
356 |
if 'error' in debug.debug_flags: |
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
357 |
report_bug(exc_info, err_file) |
358 |
return
|
|
2911.6.3
by Blake Winton
Implemented suggestions from John Arbash Meinel. |
359 |
err_file.write("bzr: ERROR: %s\n" % (exc_info[1],)) |
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
360 |
|
361 |
||
362 |
def report_bug(exc_info, err_file): |
|
1740.5.2
by Martin Pool
Improved tests for display of exceptions. |
363 |
"""Report an exception that probably indicates a bug in bzr"""
|
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
364 |
import traceback |
365 |
exc_type, exc_object, exc_tb = exc_info |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
366 |
err_file.write("bzr: ERROR: %s.%s: %s\n" % ( |
367 |
exc_type.__module__, exc_type.__name__, exc_object)) |
|
368 |
err_file.write('\n') |
|
1740.5.2
by Martin Pool
Improved tests for display of exceptions. |
369 |
traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file) |
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
370 |
err_file.write('\n') |
371 |
err_file.write('bzr %s on python %s (%s)\n' % \ |
|
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
372 |
(bzrlib.__version__, |
373 |
'.'.join(map(str, sys.version_info)), |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
374 |
sys.platform)) |
375 |
err_file.write('arguments: %r\n' % sys.argv) |
|
2842.1.1
by Martin Pool
Report locale, encodings and plugins in traceback |
376 |
err_file.write( |
377 |
'encoding: %r, fsenc: %r, lang: %r\n' % ( |
|
378 |
osutils.get_user_encoding(), sys.getfilesystemencoding(), |
|
379 |
os.environ.get('LANG'))) |
|
2842.1.2
by Martin Pool
Also include plugin path and version in traceback |
380 |
err_file.write("plugins:\n") |
381 |
for name, a_plugin in sorted(plugin.plugins().items()): |
|
382 |
err_file.write(" %-20s %s [%s]\n" % |
|
383 |
(name, a_plugin.path(), a_plugin.__version__)) |
|
2842.1.1
by Martin Pool
Report locale, encodings and plugins in traceback |
384 |
err_file.write( |
385 |
"\n" |
|
386 |
"** Please send this report to bazaar@lists.ubuntu.com\n" |
|
387 |
" with a description of what you were doing when the\n" |
|
388 |
" error occurred.\n" |
|
389 |
)
|