/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
4961.1.1 by Martin Pool
doc
17
"""Messages and logging.
1185.33.6 by Martin Pool
Code and tests for shorter formatting of error messages
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
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
26
They can be sent to two places: to stderr, and to ~/.brz.log.  For purposes
1185.33.6 by Martin Pool
Code and tests for shorter formatting of error messages
27
such as running the test suite, they can also be redirected away from both of
28
those two places to another location.
29
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
30
~/.brz.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
4961.1.1 by Martin Pool
doc
36
list of files processed by add and commit.  In debug mode, stderr gets debug messages too.
1185.33.6 by Martin Pool
Code and tests for shorter formatting of error messages
37
38
Errors that terminate an operation are generally passed back as exceptions;
39
others may be just emitted as messages.
40
41
Exceptions are reported in a brief form to stderr so as not to look scary.
42
BzrErrors are required to be able to format themselves into a properly
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
43
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
44
KeyError, which typically just str to "0".  They're printed in a different
45
form.
344 by Martin Pool
- It's not an error to use the library without
46
"""
47
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
48
from __future__ import absolute_import
49
1185.16.74 by Martin Pool
doc
50
# FIXME: Unfortunately it turns out that python's logging module
51
# is quite expensive, even when the message is not printed by any handlers.
52
# We should perhaps change back to just simply doing it here.
3173.1.6 by Martin Pool
Remove _stderr_handler global
53
#
54
# On the other hand, as of 1.2 we generally only call the mutter() statement
55
# if (according to debug_flags) we actually intend to write it.  So the
56
# increased cost of logging.py is not so bad, and we could standardize on
57
# that.
1185.16.74 by Martin Pool
doc
58
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
59
import errno
2978.1.1 by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173)
60
import logging
1740.5.3 by Martin Pool
Cleanup more exception-formatting code
61
import os
1551.9.3 by Aaron Bentley
Revert buggy apport changes
62
import sys
3170.1.1 by Andrew Bennetts
Add -Dtimes, which adds a timestamp to mutters (using the time since the first mutter).
63
import time
1996.3.29 by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace
64
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
65
from .lazy_import import lazy_import
1996.3.29 by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace
66
lazy_import(globals(), """
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
67
import tempfile
2725.1.1 by Robert Collins
Add -Devil flag to highlight the use of problematic API calls.
68
import traceback
1996.3.29 by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace
69
""")
1097 by Martin Pool
- send trace messages out through python logging module
70
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
71
import breezy
1097 by Martin Pool
- send trace messages out through python logging module
72
2095.5.2 by Martin Pool
save commit message if commit fails (#32054)
73
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
74
from breezy import (
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
75
    debug,
76
    errors,
2842.1.1 by Martin Pool
Report locale, encodings and plugins in traceback
77
    osutils,
4961.1.3 by Martin Pool
trace quietness now controls whether the progress bar appears
78
    ui,
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
79
    )
2095.5.2 by Martin Pool
save commit message if commit fails (#32054)
80
""")
81
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
82
from .sixish import (
6677.1.5 by Martin
Make crash debug and trace modules pass on Python 3
83
    PY3,
84
    StringIO,
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
85
    text_type,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
86
    )
87
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
88
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
89
# global verbosity for breezy; controls the log level for stderr; 0=normal; <0
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
90
# is quiet; >0 is verbose.
2768.1.2 by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py
91
_verbosity_level = 0
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
92
93
# File-like object where mutter/debug output is currently sent.  Can be
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
94
# changed by _push_log_file etc.  This is directly manipulated by some
95
# external code; maybe there should be functions to do that more precisely
96
# than push/pop_log_file.
1185.43.7 by Martin Pool
Do debug messages not through python logging
97
_trace_file = None
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
98
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
99
# Absolute path for ~/.brz.log.  Not changed even if the log/trace output is
3173.1.5 by Martin Pool
Remove global _bzr_log_file
100
# redirected elsewhere.  Used to show the location in --version.
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
101
_brz_log_filename = None
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
102
103
# The time the first message was written to the trace file, so that we can
104
# show relative times since startup.
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
105
_brz_log_start_time = breezy._start_time
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
106
1097 by Martin Pool
- send trace messages out through python logging module
107
3173.1.5 by Martin Pool
Remove global _bzr_log_file
108
# held in a global for quick reference
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
109
_brz_logger = logging.getLogger('brz')
1097 by Martin Pool
- send trace messages out through python logging module
110
2978.1.1 by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173)
111
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
112
def note(*args, **kwargs):
5200.2.2 by Robert Collins
Document what note does a little.
113
    """Output a note to the user.
114
115
    Takes the same parameters as logging.info.
5200.2.4 by Robert Collins
Review feedback.
116
5200.2.2 by Robert Collins
Document what note does a little.
117
    :return: None
118
    """
3173.1.7 by Martin Pool
Rename push/pop_log_file, and deprecate enable/disable_test_log
119
    # FIXME: clearing the ui and then going through the abstract logging
120
    # framework is whack; we should probably have a logging Handler that
121
    # deals with terminal output if needed.
5582.10.6 by Jelmer Vernooij
Fix ui imports.
122
    ui.ui_factory.clear_term()
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
123
    _brz_logger.info(*args, **kwargs)
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
124
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
125
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
126
def warning(*args, **kwargs):
5582.10.6 by Jelmer Vernooij
Fix ui imports.
127
    ui.ui_factory.clear_term()
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
128
    _brz_logger.warning(*args, **kwargs)
1558.8.1 by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning'
129
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
130
5055.4.1 by Gordon Tyler
Fixed show_error args and added test for show_error.
131
def show_error(*args, **kwargs):
4695.5.9 by Martin Pool
Restore info, log_error and error, as deprecated functions
132
    """Show an error message to the user.
133
134
    Don't use this for exceptions, use report_exception instead.
135
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
136
    _brz_logger.error(*args, **kwargs)
4695.5.9 by Martin Pool
Restore info, log_error and error, as deprecated functions
137
138
7008.2.1 by Martin
Make mutter saner with string interpolation
139
class _Bytes(str):
140
    """Compat class for displaying bytes on Python 2."""
141
142
    def __repr__(self):
143
        return 'b' + str.__repr__(self)
144
145
    def __unicode__(self):
146
        return self.decode('ascii', 'replace')
147
148
1185.43.7 by Martin Pool
Do debug messages not through python logging
149
def mutter(fmt, *args):
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
150
    if _trace_file is None:
151
        return
4792.6.1 by Martin Pool
Avoid time-based flushing of trace file, it's line buffered anyhow
152
    # XXX: Don't check this every time; instead anyone who closes the file
153
    # ought to deregister it.  We can tolerate None.
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
154
    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.
155
        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
156
7008.2.1 by Martin
Make mutter saner with string interpolation
157
    # Let format strings be specified as ascii bytes to help Python 2
158
    if isinstance(fmt, bytes):
159
        fmt = fmt.decode('ascii', 'replace')
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
160
7008.2.1 by Martin
Make mutter saner with string interpolation
161
    if args:
162
        if not PY3:
163
            args = tuple(
164
                _Bytes(arg) if isinstance(arg, bytes) else arg for arg in args)
165
        out = fmt % args
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
166
    else:
1185.33.51 by Martin Pool
Fix trace of non-ascii messages, and add test.
167
        out = fmt
3928.2.1 by John Arbash Meinel
Update mutter() to flush occasionally.
168
    now = time.time()
7008.2.1 by Martin
Make mutter saner with string interpolation
169
    out = '%0.3f  %s\n' % (now - _brz_log_start_time, out)
170
    _trace_file.write(out.encode('utf-8'))
4792.6.1 by Martin Pool
Avoid time-based flushing of trace file, it's line buffered anyhow
171
    # there's no explicit flushing; the file is typically line buffered.
1097 by Martin Pool
- send trace messages out through python logging module
172
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
173
2725.1.1 by Robert Collins
Add -Devil flag to highlight the use of problematic API calls.
174
def mutter_callsite(stacklevel, fmt, *args):
175
    """Perform a mutter of fmt and args, logging the call trace.
176
177
    :param stacklevel: The number of frames to show. None will show all
178
        frames.
179
    :param fmt: The format string to pass to mutter.
180
    :param args: A list of substitution variables.
181
    """
6677.1.5 by Martin
Make crash debug and trace modules pass on Python 3
182
    outf = StringIO()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
183
    if stacklevel is None:
184
        limit = None
185
    else:
186
        limit = stacklevel + 1
187
    traceback.print_stack(limit=limit, file=outf)
2725.1.1 by Robert Collins
Add -Devil flag to highlight the use of problematic API calls.
188
    formatted_lines = outf.getvalue().splitlines()
189
    formatted_stack = '\n'.join(formatted_lines[:-2])
190
    mutter(fmt + "\nCalled from:\n%s", *(args + (formatted_stack,)))
191
192
261 by Martin Pool
- auto-rollover of .bzr.log
193
def _rollover_trace_maybe(trace_fname):
359 by Martin Pool
- pychecker fixups
194
    import stat
261 by Martin Pool
- auto-rollover of .bzr.log
195
    try:
196
        size = os.stat(trace_fname)[stat.ST_SIZE]
333 by Martin Pool
- allow trace file to grow up to 4MB
197
        if size <= 4 << 20:
261 by Martin Pool
- auto-rollover of .bzr.log
198
            return
199
        old_fname = trace_fname + '.old'
2851.3.1 by Martin Pool
Add unit test for _rollover_trace_maybe
200
        osutils.rename(trace_fname, old_fname)
261 by Martin Pool
- auto-rollover of .bzr.log
201
    except OSError:
202
        return
203
204
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
205
def _get_brz_log_filename():
206
    brz_log = osutils.path_from_environ('BRZ_LOG')
207
    if brz_log:
208
        return brz_log
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
209
    home = osutils.path_from_environ('BRZ_HOME')
3193.6.8 by Alexander Belchenko
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)
210
    if home is None:
6437.26.4 by Martin Packman
Treat path for .bzr.log as unicode
211
        # GZ 2012-02-01: Logging to the home dir is bad, but XDG is unclear
212
        #                over what would be better. On windows, bug 240550
213
        #                suggests LOCALAPPDATA be used instead.
214
        home = osutils._get_home_dir()
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
215
    return os.path.join(home, '.brz.log')
216
217
218
def _open_brz_log():
219
    """Open the .brz.log trace file.
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
220
221
    If the log is more than a particular length, the old file is renamed to
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
222
    .brz.log.old and a new file is started.  Otherwise, we append to the
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
223
    existing file.
224
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
225
    This sets the global _brz_log_filename.
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
226
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
227
    global _brz_log_filename
5116.2.3 by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz]
228
5116.3.1 by Martin
Rearrange log opening helper function and fix a couple of bugs
229
    def _open_or_create_log_file(filename):
230
        """Open existing log file, or create with ownership and permissions
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
231
232
        It inherits the ownership and permissions (masked by umask) from
233
        the containing directory to cope better with being run under sudo
234
        with $HOME still set to the user's homedir.
5116.2.3 by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz]
235
        """
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
236
        flags = os.O_WRONLY | os.O_APPEND | osutils.O_TEXT
5116.2.5 by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation
237
        while True:
238
            try:
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
239
                fd = os.open(filename, flags)
5116.3.1 by Martin
Rearrange log opening helper function and fix a couple of bugs
240
                break
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
241
            except OSError as e:
5116.2.5 by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation
242
                if e.errno != errno.ENOENT:
243
                    raise
244
            try:
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
245
                fd = os.open(filename, flags | os.O_CREAT | os.O_EXCL, 0o666)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
246
            except OSError as e:
5116.2.5 by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation
247
                if e.errno != errno.EEXIST:
248
                    raise
249
            else:
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
250
                osutils.copy_ownership_from_path(filename)
5116.3.1 by Martin
Rearrange log opening helper function and fix a couple of bugs
251
                break
7143.15.2 by Jelmer Vernooij
Run autopep8.
252
        return os.fdopen(fd, 'ab', 0)  # unbuffered
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
253
254
    _brz_log_filename = _get_brz_log_filename()
255
    _rollover_trace_maybe(_brz_log_filename)
403 by Martin Pool
- Don't give an error if the trace file can't be opened
256
    try:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
257
        brz_log_file = _open_or_create_log_file(_brz_log_filename)
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
258
        brz_log_file.write(b'\n')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
259
        if brz_log_file.tell() <= 2:
7143.15.2 by Jelmer Vernooij
Run autopep8.
260
            brz_log_file.write(
261
                b"this is a debug log for diagnosing/reporting problems in brz\n")
262
            brz_log_file.write(
263
                b"you can delete or truncate this file, or include sections in\n")
264
            brz_log_file.write(
265
                b"bug reports to https://bugs.launchpad.net/brz/+filebug\n\n")
4634.143.2 by Parth Malwankar
fixed test cases to handle special .bzr.log files
266
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
267
        return brz_log_file
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
268
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
269
    except EnvironmentError as e:
4634.118.1 by John Arbash Meinel
Fix bug #503886, errors setting up logging go to stderr.
270
        # If we are failing to open the log, then most likely logging has not
271
        # been set up yet. So we just write to stderr rather than using
272
        # 'warning()'. If we using warning(), users get the unhelpful 'no
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
273
        # handlers registered for "brz"' when something goes wrong on the
4634.118.1 by John Arbash Meinel
Fix bug #503886, errors setting up logging go to stderr.
274
        # server. (bug #503886)
275
        sys.stderr.write("failed to open trace file: %s\n" % (e,))
3173.1.5 by Martin Pool
Remove global _bzr_log_file
276
    # TODO: What should happen if we fail to open the trace file?  Maybe the
277
    # objects should be pointed at /dev/null or the equivalent?  Currently
278
    # returns None which will cause failures later.
3805.2.4 by John Arbash Meinel
Handle when _open_bzr_log returns None.
279
    return None
260 by Martin Pool
- remove atexit() dependency for writing out execution times
280
1097 by Martin Pool
- send trace messages out through python logging module
281
1111 by Martin Pool
- add functions to enable and disable default logging, so that we can
282
def enable_default_logging():
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
283
    """Configure default logging: messages to stderr and debug to .brz.log
3805.2.1 by John Arbash Meinel
Update trace to log when the process started.
284
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
285
    This should only be called once per process.
3173.1.6 by Martin Pool
Remove _stderr_handler global
286
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
287
    Non-command-line programs embedding breezy do not need to call this.  They
3173.1.6 by Martin Pool
Remove _stderr_handler global
288
    can instead either pass a file to _push_log_file, or act directly on
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
289
    logging.getLogger("brz").
3805.2.1 by John Arbash Meinel
Update trace to log when the process started.
290
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
291
    Output can be redirected away by calling _push_log_file.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
292
293
    :return: A memento from push_log_file for restoring the log state.
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
294
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
295
    start_time = osutils.format_local_date(_brz_log_start_time,
3805.2.3 by John Arbash Meinel
Use osutils.format_local_date() instead of time.strftime()
296
                                           timezone='local')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
297
    brz_log_file = _open_brz_log()
298
    if brz_log_file is not None:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
299
        brz_log_file.write(start_time.encode('utf-8') + b'\n')
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
300
    memento = push_log_file(
301
        brz_log_file,
302
        r'[%(process)5d] %(asctime)s.%(msecs)03d %(levelname)s: %(message)s',
303
        r'%Y-%m-%d %H:%M:%S')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
304
    # after hooking output into brz_log, we also need to attach a stderr
3173.1.6 by Martin Pool
Remove _stderr_handler global
305
    # handler, writing only at level info and with encoding
6973.12.9 by Jelmer Vernooij
More fixes.
306
    if sys.version_info[0] == 2:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
307
        stderr_handler = EncodedStreamHandler(
308
            sys.stderr, osutils.get_terminal_encoding(), 'replace',
309
            level=logging.INFO)
6973.12.9 by Jelmer Vernooij
More fixes.
310
    else:
311
        stderr_handler = logging.StreamHandler(stream=sys.stderr)
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
312
    logging.getLogger('brz').addHandler(stderr_handler)
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
313
    return memento
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
314
315
3173.1.7 by Martin Pool
Rename push/pop_log_file, and deprecate enable/disable_test_log
316
def push_log_file(to_file, log_format=None, date_format=None):
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
317
    """Intercept log and trace messages and send them to a file.
318
3173.1.11 by Martin Pool
Fix up renaming of push_log_file
319
    :param to_file: A file-like object to which messages will be sent.
320
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
321
    :returns: A memento that should be passed to _pop_log_file to restore the
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
322
        previously active logging.
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
323
    """
324
    global _trace_file
325
    # make a new handler
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
326
    new_handler = EncodedStreamHandler(to_file, "utf-8", level=logging.DEBUG)
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
327
    if log_format is None:
328
        log_format = '%(levelname)8s  %(message)s'
329
    new_handler.setFormatter(logging.Formatter(log_format, date_format))
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
330
    # save and remove any existing log handlers
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
331
    brz_logger = logging.getLogger('brz')
332
    old_handlers = brz_logger.handlers[:]
333
    del brz_logger.handlers[:]
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
334
    # set that as the default logger
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
335
    brz_logger.addHandler(new_handler)
336
    brz_logger.setLevel(logging.DEBUG)
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
337
    # TODO: check if any changes are needed to the root logger
338
    #
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
339
    # TODO: also probably need to save and restore the level on brz_logger.
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
340
    # but maybe we can avoid setting the logger level altogether, and just set
341
    # the level on the handler?
342
    #
343
    # save the old trace file
344
    old_trace_file = _trace_file
345
    # send traces to the new one
346
    _trace_file = to_file
347
    return ('log_memento', old_handlers, new_handler, old_trace_file, to_file)
348
349
6619.3.15 by Jelmer Vernooij
Avoid tuple in function args.
350
def pop_log_file(entry):
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
351
    """Undo changes to logging/tracing done by _push_log_file.
352
5320.2.7 by Robert Collins
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.
353
    This flushes, but does not close the trace file (so that anything that was
354
    in it is output.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
355
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
356
    Takes the memento returned from _push_log_file."""
6619.3.15 by Jelmer Vernooij
Avoid tuple in function args.
357
    (magic, old_handlers, new_handler, old_trace_file, new_trace_file) = entry
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
358
    global _trace_file
359
    _trace_file = old_trace_file
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
360
    brz_logger = logging.getLogger('brz')
361
    brz_logger.removeHandler(new_handler)
5222.2.7 by Robert Collins
Document bzrlib.initialize a little better, and explicitly propogate exceptions in the new __exit__ methods.
362
    # must be closed, otherwise logging will try to close it at exit, and the
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
363
    # file will likely already be closed underneath.
364
    new_handler.close()
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
365
    brz_logger.handlers = old_handlers
5320.2.7 by Robert Collins
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.
366
    if new_trace_file is not None:
367
        new_trace_file.flush()
3173.1.1 by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153
368
369
3427.2.2 by James Westby
Just print the exception, keeping the API of log_exception_quietly the same.
370
def log_exception_quietly():
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
371
    """Log the last exception to the trace file only.
372
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
373
    Used for exceptions that occur internally and that may be
374
    interesting to developers but not to users.  For example,
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
375
    errors loading plugins.
376
    """
3427.2.2 by James Westby
Just print the exception, keeping the API of log_exception_quietly the same.
377
    mutter(traceback.format_exc())
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
378
379
380
def set_verbosity_level(level):
381
    """Set the verbosity level.
382
383
    :param level: -ve for quiet, 0 for normal, +ve for verbose
384
    """
385
    global _verbosity_level
386
    _verbosity_level = level
387
    _update_logging_level(level < 0)
4961.1.3 by Martin Pool
trace quietness now controls whether the progress bar appears
388
    ui.ui_factory.be_quiet(level < 0)
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
389
390
391
def get_verbosity_level():
392
    """Get the verbosity level.
393
394
    See set_verbosity_level() for values.
395
    """
396
    return _verbosity_level
397
398
399
def be_quiet(quiet=True):
400
    if quiet:
401
        set_verbosity_level(-1)
402
    else:
403
        set_verbosity_level(0)
404
405
406
def _update_logging_level(quiet=True):
407
    """Hide INFO messages if quiet."""
408
    if quiet:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
409
        _brz_logger.setLevel(logging.WARNING)
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
410
    else:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
411
        _brz_logger.setLevel(logging.INFO)
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
412
413
414
def is_quiet():
415
    """Is the verbosity level negative?"""
416
    return _verbosity_level < 0
417
418
419
def is_verbose():
420
    """Is the verbosity level positive?"""
421
    return _verbosity_level > 0
422
423
3698.1.2 by John Arbash Meinel
Make message optional, don't check the memory flag directly.
424
def debug_memory(message='', short=True):
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
425
    """Write out a memory dump."""
4011.1.1 by John Arbash Meinel
Implement -Dmemory for win32
426
    if sys.platform == 'win32':
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
427
        from breezy import win32utils
4011.1.1 by John Arbash Meinel
Implement -Dmemory for win32
428
        win32utils.debug_memory_win32api(message=message, short=short)
429
    else:
430
        _debug_memory_proc(message=message, short=short)
431
432
433
_short_fields = ('VmPeak', 'VmSize', 'VmRSS')
434
7143.15.2 by Jelmer Vernooij
Run autopep8.
435
4011.1.1 by John Arbash Meinel
Implement -Dmemory for win32
436
def _debug_memory_proc(message='', short=True):
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
437
    try:
6973.7.5 by Jelmer Vernooij
s/file/open.
438
        status_file = open('/proc/%s/status' % os.getpid(), 'rb')
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
439
    except IOError:
440
        return
441
    try:
442
        status = status_file.read()
443
    finally:
444
        status_file.close()
3698.1.2 by John Arbash Meinel
Make message optional, don't check the memory flag directly.
445
    if message:
446
        note(message)
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
447
    for line in status.splitlines():
448
        if not short:
449
            note(line)
450
        else:
451
            for field in _short_fields:
452
                if line.startswith(field):
453
                    note(line)
454
                    break
455
7143.15.2 by Jelmer Vernooij
Run autopep8.
456
5448.5.2 by Karl Bielefeldt
Incorporated suggestions from code review:
457
def _dump_memory_usage(err_file):
5448.5.1 by Karl Bielefeldt
Use meliae to dump memory to a file upon MemoryError.
458
    try:
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
459
        try:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
460
            fd, name = tempfile.mkstemp(prefix="brz_memdump", suffix=".json")
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
461
            dump_file = os.fdopen(fd, 'w')
462
            from meliae import scanner
463
            scanner.dump_gc_objects(dump_file)
464
            err_file.write("Memory dumped to %s\n" % name)
465
        except ImportError:
466
            err_file.write("Dumping memory requires meliae module.\n")
467
            log_exception_quietly()
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
468
        except BaseException:
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
469
            err_file.write("Exception while dumping memory.\n")
470
            log_exception_quietly()
5448.5.2 by Karl Bielefeldt
Incorporated suggestions from code review:
471
    finally:
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
472
        if dump_file is not None:
473
            dump_file.close()
474
        elif fd is not None:
475
            os.close(fd)
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
476
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
477
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
478
def _qualified_exception_name(eclass, unqualified_breezy_errors=False):
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
479
    """Give name of error class including module for non-builtin exceptions
480
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
481
    If `unqualified_breezy_errors` is True, errors specific to breezy will
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
482
    also omit the module prefix.
483
    """
484
    class_name = eclass.__name__
485
    module_name = eclass.__module__
6677.1.5 by Martin
Make crash debug and trace modules pass on Python 3
486
    if module_name in ("builtins", "exceptions", "__main__") or (
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
487
            unqualified_breezy_errors and module_name == "breezy.errors"):
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
488
        return class_name
489
    return "%s.%s" % (module_name, class_name)
490
491
1740.5.2 by Martin Pool
Improved tests for display of exceptions.
492
def report_exception(exc_info, err_file):
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
493
    """Report an exception to err_file (typically stderr) and to .brz.log.
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
494
495
    This will show either a full traceback or a short message as appropriate.
496
497
    :return: The appropriate exit code for this error.
498
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
499
    # Log the full traceback to ~/.brz.log
4805.3.2 by Benoît Pierre
Always log the full traceback to ~/.bzr.log, even when -Derror is used.
500
    log_exception_quietly()
4805.3.1 by Benoît Pierre
Always honor 'error' debug flag.
501
    if 'error' in debug.debug_flags:
502
        print_exception(exc_info, err_file)
503
        return errors.EXIT_ERROR
1740.5.3 by Martin Pool
Cleanup more exception-formatting code
504
    exc_type, exc_object, exc_tb = exc_info
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
505
    if isinstance(exc_object, KeyboardInterrupt):
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
506
        err_file.write("brz: interrupted\n")
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
507
        return errors.EXIT_ERROR
4634.26.1 by Martin Pool
Cleaner message when out of memory
508
    elif isinstance(exc_object, MemoryError):
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
509
        err_file.write("brz: out of memory\n")
5448.5.2 by Karl Bielefeldt
Incorporated suggestions from code review:
510
        if 'mem_dump' in debug.debug_flags:
511
            _dump_memory_usage(err_file)
512
        else:
513
            err_file.write("Use -Dmem_dump to dump memory to a file.\n")
4634.26.1 by Martin Pool
Cleaner message when out of memory
514
        return errors.EXIT_ERROR
3497.3.2 by Martin Pool
Show short error for missing libraries
515
    elif isinstance(exc_object, ImportError) \
7143.15.2 by Jelmer Vernooij
Run autopep8.
516
            and str(exc_object).startswith("No module named "):
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
517
        report_user_error(
518
            exc_info, err_file,
519
            'You may need to install this Python library separately.')
3497.3.2 by Martin Pool
Show short error for missing libraries
520
        return errors.EXIT_ERROR
2067.3.2 by Martin Pool
Error cleanup review comments:
521
    elif not getattr(exc_object, 'internal_error', True):
1740.5.6 by Martin Pool
Clean up many exception classes.
522
        report_user_error(exc_info, err_file)
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
523
        return errors.EXIT_ERROR
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
524
    elif osutils.is_environment_error(exc_object):
525
        if getattr(exc_object, 'errno', None) == errno.EPIPE:
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
526
            err_file.write("brz: broken pipe\n")
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
527
            return errors.EXIT_ERROR
1740.5.6 by Martin Pool
Clean up many exception classes.
528
        # Might be nice to catch all of these and show them as something more
529
        # 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.
530
        report_user_error(exc_info, err_file)
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
531
        return errors.EXIT_ERROR
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
532
    else:
1551.9.3 by Aaron Bentley
Revert buggy apport changes
533
        report_bug(exc_info, err_file)
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
534
        return errors.EXIT_INTERNAL_ERROR
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
535
536
3427.2.2 by James Westby
Just print the exception, keeping the API of log_exception_quietly the same.
537
def print_exception(exc_info, err_file):
538
    exc_type, exc_object, exc_tb = exc_info
6677.1.5 by Martin
Make crash debug and trace modules pass on Python 3
539
    err_file.write("brz: ERROR: %s: %s\n" % (
540
        _qualified_exception_name(exc_type), exc_object))
3427.2.2 by James Westby
Just print the exception, keeping the API of log_exception_quietly the same.
541
    err_file.write('\n')
542
    traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file)
543
544
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
545
# TODO: Should these be specially encoding the output?
3497.3.2 by Martin Pool
Show short error for missing libraries
546
def report_user_error(exc_info, err_file, advice=None):
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
547
    """Report to err_file an error that's not an internal error.
548
549
    These don't get a traceback unless -Derror was given.
3497.3.2 by Martin Pool
Show short error for missing libraries
550
551
    :param exc_info: 3-tuple from sys.exc_info()
552
    :param advice: Extra advice to the user to be printed following the
553
        exception.
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
554
    """
6973.7.5 by Jelmer Vernooij
s/file/open.
555
    err_file.write(("brz: ERROR: %s\n" % (str(exc_info[1]),)))
3497.3.2 by Martin Pool
Show short error for missing libraries
556
    if advice:
6973.5.11 by Jelmer Vernooij
Fix tests under python2.
557
        err_file.write(("%s\n" % advice))
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
558
559
560
def report_bug(exc_info, err_file):
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
561
    """Report an exception that probably indicates a bug in brz"""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
562
    from breezy.crash import report_bug
4584.3.6 by Martin Pool
Move apport integration to bzrlib.crash and send output to a file.
563
    report_bug(exc_info, err_file)
5017.1.1 by Martin Pool
Add bzrlib.initialize
564
565
566
def _flush_stdout_stderr():
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
567
    # called from the breezy library finalizer returned by breezy.initialize()
5017.1.1 by Martin Pool
Add bzrlib.initialize
568
    try:
569
        sys.stdout.flush()
570
        sys.stderr.flush()
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
571
    except ValueError:
6133.4.62 by John Arbash Meinel
Add a nicer repr for shutting down.
572
        # On Windows, I get ValueError calling stdout.flush() on a closed
573
        # handle
574
        pass
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
575
    except IOError as e:
5017.1.1 by Martin Pool
Add bzrlib.initialize
576
        import errno
577
        if e.errno in [errno.EINVAL, errno.EPIPE]:
578
            pass
579
        else:
580
            raise
581
582
583
def _flush_trace():
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
584
    # called from the breezy library finalizer returned by breezy.initialize()
5017.1.1 by Martin Pool
Add bzrlib.initialize
585
    global _trace_file
586
    if _trace_file:
587
        _trace_file.flush()
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
588
589
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
590
class EncodedStreamHandler(logging.Handler):
591
    """Robustly write logging events to a stream using the specified encoding
592
593
    Messages are expected to be formatted to unicode, but UTF-8 byte strings
594
    are also accepted. An error during formatting or a str message in another
595
    encoding will be quitely noted as an error in the Bazaar log file.
596
597
    The stream is not closed so sys.stdout or sys.stderr may be passed.
598
    """
599
600
    def __init__(self, stream, encoding=None, errors='strict', level=0):
601
        logging.Handler.__init__(self, level)
602
        self.stream = stream
603
        if encoding is None:
604
            encoding = getattr(stream, "encoding", "ascii")
605
        self.encoding = encoding
606
        self.errors = errors
607
608
    def flush(self):
609
        flush = getattr(self.stream, "flush", None)
610
        if flush is not None:
611
            flush()
612
613
    def emit(self, record):
614
        try:
6677.1.5 by Martin
Make crash debug and trace modules pass on Python 3
615
            if not isinstance(record.msg, text_type):
616
                msg = record.msg.decode("utf-8")
617
                if PY3:
618
                    record.msg = msg
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
619
            line = self.format(record)
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
620
            if not isinstance(line, text_type):
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
621
                line = line.decode("utf-8")
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
622
            self.stream.write(line.encode(self.encoding, self.errors) + b"\n")
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
623
        except Exception:
624
            log_exception_quietly()
625
            # Try saving the details that would have been logged in some form
626
            msg = args = "<Unformattable>"
627
            try:
7008.2.1 by Martin
Make mutter saner with string interpolation
628
                msg = repr(record.msg)
629
                args = repr(record.args)
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
630
            except Exception:
631
                pass
632
            # Using mutter() bypasses the logging module and writes directly
633
            # to the file so there's no danger of getting into a loop here.
634
            mutter("Logging record unformattable: %s %% %s", msg, args)
635
636
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
637
class Config(object):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
638
    """Configuration of message tracing in breezy.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
639
640
    This implements the context manager protocol and should manage any global
641
    variables still used. The default config used is DefaultConfig, but
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
642
    embedded uses of breezy may wish to use a custom manager.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
643
    """
644
645
    def __enter__(self):
7143.15.2 by Jelmer Vernooij
Run autopep8.
646
        return self  # This is bound to the 'as' clause in a with statement.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
647
648
    def __exit__(self, exc_type, exc_val, exc_tb):
7143.15.2 by Jelmer Vernooij
Run autopep8.
649
        return False  # propogate exceptions.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
650
651
652
class DefaultConfig(Config):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
653
    """A default configuration for tracing of messages in breezy.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
654
655
    This implements the context manager protocol.
656
    """
657
658
    def __enter__(self):
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
659
        self._original_filename = _brz_log_filename
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
660
        self._original_state = enable_default_logging()
7143.15.2 by Jelmer Vernooij
Run autopep8.
661
        return self  # This is bound to the 'as' clause in a with statement.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
662
663
    def __exit__(self, exc_type, exc_val, exc_tb):
664
        pop_log_file(self._original_state)
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
665
        global _brz_log_filename
666
        _brz_log_filename = self._original_filename
7143.15.2 by Jelmer Vernooij
Run autopep8.
667
        return False  # propogate exceptions.