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