/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(), """
2842.1.1 by Martin Pool
Report locale, encodings and plugins in traceback
67
import locale
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
68
import tempfile
2725.1.1 by Robert Collins
Add -Devil flag to highlight the use of problematic API calls.
69
import traceback
1996.3.29 by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace
70
""")
1097 by Martin Pool
- send trace messages out through python logging module
71
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
72
import breezy
1097 by Martin Pool
- send trace messages out through python logging module
73
2095.5.2 by Martin Pool
save commit message if commit fails (#32054)
74
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
75
from breezy import (
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
76
    debug,
77
    errors,
2842.1.1 by Martin Pool
Report locale, encodings and plugins in traceback
78
    osutils,
4961.1.3 by Martin Pool
trace quietness now controls whether the progress bar appears
79
    ui,
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
80
    )
2095.5.2 by Martin Pool
save commit message if commit fails (#32054)
81
""")
82
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
83
from .sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
84
    BytesIO,
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
1185.43.7 by Martin Pool
Do debug messages not through python logging
139
def mutter(fmt, *args):
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
140
    if _trace_file is None:
141
        return
4792.6.1 by Martin Pool
Avoid time-based flushing of trace file, it's line buffered anyhow
142
    # XXX: Don't check this every time; instead anyone who closes the file
143
    # ought to deregister it.  We can tolerate None.
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
144
    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.
145
        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
146
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
147
    if isinstance(fmt, text_type):
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
148
        fmt = fmt.encode('utf8')
149
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
150
    if len(args) > 0:
1685.1.2 by John Arbash Meinel
Re-enabling the non_ascii tests after fixing trace.py, bzr ignore also does the right thing now
151
        # It seems that if we do ascii % (unicode, ascii) we can
152
        # get a unicode cannot encode ascii error, so make sure that "fmt"
153
        # is a unicode string
1948.1.9 by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually
154
        real_args = []
155
        for arg in args:
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
156
            if isinstance(arg, text_type):
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
157
                arg = arg.encode('utf8')
158
            real_args.append(arg)
159
        out = fmt % tuple(real_args)
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
160
    else:
1185.33.51 by Martin Pool
Fix trace of non-ascii messages, and add test.
161
        out = fmt
3928.2.1 by John Arbash Meinel
Update mutter() to flush occasionally.
162
    now = time.time()
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
163
    out = b'%0.3f  %s\n' % (now - _brz_log_start_time, out)
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
164
    _trace_file.write(out)
4792.6.1 by Martin Pool
Avoid time-based flushing of trace file, it's line buffered anyhow
165
    # there's no explicit flushing; the file is typically line buffered.
1097 by Martin Pool
- send trace messages out through python logging module
166
1185.43.10 by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file.
167
2725.1.1 by Robert Collins
Add -Devil flag to highlight the use of problematic API calls.
168
def mutter_callsite(stacklevel, fmt, *args):
169
    """Perform a mutter of fmt and args, logging the call trace.
170
171
    :param stacklevel: The number of frames to show. None will show all
172
        frames.
173
    :param fmt: The format string to pass to mutter.
174
    :param args: A list of substitution variables.
175
    """
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
176
    outf = BytesIO()
3441.5.1 by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing.
177
    if stacklevel is None:
178
        limit = None
179
    else:
180
        limit = stacklevel + 1
181
    traceback.print_stack(limit=limit, file=outf)
2725.1.1 by Robert Collins
Add -Devil flag to highlight the use of problematic API calls.
182
    formatted_lines = outf.getvalue().splitlines()
183
    formatted_stack = '\n'.join(formatted_lines[:-2])
184
    mutter(fmt + "\nCalled from:\n%s", *(args + (formatted_stack,)))
185
186
261 by Martin Pool
- auto-rollover of .bzr.log
187
def _rollover_trace_maybe(trace_fname):
359 by Martin Pool
- pychecker fixups
188
    import stat
261 by Martin Pool
- auto-rollover of .bzr.log
189
    try:
190
        size = os.stat(trace_fname)[stat.ST_SIZE]
333 by Martin Pool
- allow trace file to grow up to 4MB
191
        if size <= 4 << 20:
261 by Martin Pool
- auto-rollover of .bzr.log
192
            return
193
        old_fname = trace_fname + '.old'
2851.3.1 by Martin Pool
Add unit test for _rollover_trace_maybe
194
        osutils.rename(trace_fname, old_fname)
261 by Martin Pool
- auto-rollover of .bzr.log
195
    except OSError:
196
        return
197
198
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
199
def _get_brz_log_filename():
200
    brz_log = osutils.path_from_environ('BRZ_LOG')
201
    if brz_log:
202
        return brz_log
6622.1.28 by Jelmer Vernooij
More renames; commands in output, environment variables.
203
    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)
204
    if home is None:
6437.26.4 by Martin Packman
Treat path for .bzr.log as unicode
205
        # GZ 2012-02-01: Logging to the home dir is bad, but XDG is unclear
206
        #                over what would be better. On windows, bug 240550
207
        #                suggests LOCALAPPDATA be used instead.
208
        home = osutils._get_home_dir()
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
209
    return os.path.join(home, '.brz.log')
210
211
212
def _open_brz_log():
213
    """Open the .brz.log trace file.
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
214
215
    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?)
216
    .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
217
    existing file.
218
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
219
    This sets the global _brz_log_filename.
3173.1.2 by Martin Pool
bzrlib.trace docs and cleanups
220
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
221
    global _brz_log_filename
5116.2.3 by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz]
222
5116.3.1 by Martin
Rearrange log opening helper function and fix a couple of bugs
223
    def _open_or_create_log_file(filename):
224
        """Open existing log file, or create with ownership and permissions
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
225
226
        It inherits the ownership and permissions (masked by umask) from
227
        the containing directory to cope better with being run under sudo
228
        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]
229
        """
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
230
        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
231
        while True:
232
            try:
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
233
                fd = os.open(filename, flags)
5116.3.1 by Martin
Rearrange log opening helper function and fix a couple of bugs
234
                break
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
235
            except OSError as e:
5116.2.5 by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation
236
                if e.errno != errno.ENOENT:
237
                    raise
238
            try:
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
239
                fd = os.open(filename, flags | os.O_CREAT | os.O_EXCL, 0o666)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
240
            except OSError as e:
5116.2.5 by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation
241
                if e.errno != errno.EEXIST:
242
                    raise
243
            else:
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
244
                osutils.copy_ownership_from_path(filename)
5116.3.1 by Martin
Rearrange log opening helper function and fix a couple of bugs
245
                break
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
246
        return os.fdopen(fd, 'ab', 0) # unbuffered
5116.2.3 by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz]
247
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
248
249
    _brz_log_filename = _get_brz_log_filename()
250
    _rollover_trace_maybe(_brz_log_filename)
403 by Martin Pool
- Don't give an error if the trace file can't be opened
251
    try:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
252
        brz_log_file = _open_or_create_log_file(_brz_log_filename)
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
253
        brz_log_file.write(b'\n')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
254
        if brz_log_file.tell() <= 2:
255
            brz_log_file.write("this is a debug log for diagnosing/reporting problems in brz\n")
256
            brz_log_file.write("you can delete or truncate this file, or include sections in\n")
257
            brz_log_file.write("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
258
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
259
        return brz_log_file
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
260
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
261
    except EnvironmentError as e:
4634.118.1 by John Arbash Meinel
Fix bug #503886, errors setting up logging go to stderr.
262
        # If we are failing to open the log, then most likely logging has not
263
        # been set up yet. So we just write to stderr rather than using
264
        # 'warning()'. If we using warning(), users get the unhelpful 'no
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
265
        # 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.
266
        # server. (bug #503886)
267
        sys.stderr.write("failed to open trace file: %s\n" % (e,))
3173.1.5 by Martin Pool
Remove global _bzr_log_file
268
    # TODO: What should happen if we fail to open the trace file?  Maybe the
269
    # objects should be pointed at /dev/null or the equivalent?  Currently
270
    # returns None which will cause failures later.
3805.2.4 by John Arbash Meinel
Handle when _open_bzr_log returns None.
271
    return None
260 by Martin Pool
- remove atexit() dependency for writing out execution times
272
1097 by Martin Pool
- send trace messages out through python logging module
273
1111 by Martin Pool
- add functions to enable and disable default logging, so that we can
274
def enable_default_logging():
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
275
    """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.
276
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
277
    This should only be called once per process.
3173.1.6 by Martin Pool
Remove _stderr_handler global
278
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
279
    Non-command-line programs embedding breezy do not need to call this.  They
3173.1.6 by Martin Pool
Remove _stderr_handler global
280
    can instead either pass a file to _push_log_file, or act directly on
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
281
    logging.getLogger("brz").
3805.2.1 by John Arbash Meinel
Update trace to log when the process started.
282
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
283
    Output can be redirected away by calling _push_log_file.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
284
285
    :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
286
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
287
    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()
288
                                           timezone='local')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
289
    brz_log_file = _open_brz_log()
290
    if brz_log_file is not None:
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
291
        brz_log_file.write(start_time.encode('utf-8') + b'\n')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
292
    memento = push_log_file(brz_log_file,
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
293
        r'[%(process)5d] %(asctime)s.%(msecs)03d %(levelname)s: %(message)s',
294
        r'%Y-%m-%d %H:%M:%S')
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
295
    # after hooking output into brz_log, we also need to attach a stderr
3173.1.6 by Martin Pool
Remove _stderr_handler global
296
    # handler, writing only at level info and with encoding
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
297
    stderr_handler = EncodedStreamHandler(sys.stderr,
298
        osutils.get_terminal_encoding(), 'replace', level=logging.INFO)
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
299
    logging.getLogger('brz').addHandler(stderr_handler)
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
300
    return memento
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
301
302
3173.1.7 by Martin Pool
Rename push/pop_log_file, and deprecate enable/disable_test_log
303
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
304
    """Intercept log and trace messages and send them to a file.
305
3173.1.11 by Martin Pool
Fix up renaming of push_log_file
306
    :param to_file: A file-like object to which messages will be sent.
307
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
308
    :returns: A memento that should be passed to _pop_log_file to restore the
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
309
        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
310
    """
311
    global _trace_file
312
    # make a new handler
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
313
    new_handler = EncodedStreamHandler(to_file, "utf-8", level=logging.DEBUG)
3173.1.4 by Martin Pool
Rearrange and clean up bzr trace/logging
314
    if log_format is None:
315
        log_format = '%(levelname)8s  %(message)s'
316
    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
317
    # save and remove any existing log handlers
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
318
    brz_logger = logging.getLogger('brz')
319
    old_handlers = brz_logger.handlers[:]
320
    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
321
    # set that as the default logger
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
322
    brz_logger.addHandler(new_handler)
323
    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
324
    # TODO: check if any changes are needed to the root logger
325
    #
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
326
    # 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
327
    # but maybe we can avoid setting the logger level altogether, and just set
328
    # the level on the handler?
329
    #
330
    # save the old trace file
331
    old_trace_file = _trace_file
332
    # send traces to the new one
333
    _trace_file = to_file
334
    result = new_handler, _trace_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
423
def _debug_memory_proc(message='', short=True):
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
424
    try:
425
        status_file = file('/proc/%s/status' % os.getpid(), 'rb')
426
    except IOError:
427
        return
428
    try:
429
        status = status_file.read()
430
    finally:
431
        status_file.close()
3698.1.2 by John Arbash Meinel
Make message optional, don't check the memory flag directly.
432
    if message:
433
        note(message)
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
434
    for line in status.splitlines():
435
        if not short:
436
            note(line)
437
        else:
438
            for field in _short_fields:
439
                if line.startswith(field):
440
                    note(line)
441
                    break
442
5448.5.2 by Karl Bielefeldt
Incorporated suggestions from code review:
443
def _dump_memory_usage(err_file):
5448.5.1 by Karl Bielefeldt
Use meliae to dump memory to a file upon MemoryError.
444
    try:
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
445
        try:
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
446
            fd, name = tempfile.mkstemp(prefix="brz_memdump", suffix=".json")
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
447
            dump_file = os.fdopen(fd, 'w')
448
            from meliae import scanner
449
            scanner.dump_gc_objects(dump_file)
450
            err_file.write("Memory dumped to %s\n" % name)
451
        except ImportError:
452
            err_file.write("Dumping memory requires meliae module.\n")
453
            log_exception_quietly()
454
        except:
455
            err_file.write("Exception while dumping memory.\n")
456
            log_exception_quietly()
5448.5.2 by Karl Bielefeldt
Incorporated suggestions from code review:
457
    finally:
5448.5.4 by Karl Bielefeldt
Fix Python 2.4 incompatibilities
458
        if dump_file is not None:
459
            dump_file.close()
460
        elif fd is not None:
461
            os.close(fd)
3698.1.1 by John Arbash Meinel
Move the memory debugging into a helper function.
462
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
463
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
464
def _qualified_exception_name(eclass, unqualified_breezy_errors=False):
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
465
    """Give name of error class including module for non-builtin exceptions
466
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
467
    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
468
    also omit the module prefix.
469
    """
470
    class_name = eclass.__name__
471
    module_name = eclass.__module__
5677.2.10 by Martin
Omit '__main__' from exception names as well now they're purely decorative
472
    if module_name in ("exceptions", "__main__") or (
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
473
            unqualified_breezy_errors and module_name == "breezy.errors"):
5677.3.1 by Martin
Add helper for getting qualified exception name to bzrlib.trace
474
        return class_name
475
    return "%s.%s" % (module_name, class_name)
476
477
1740.5.2 by Martin Pool
Improved tests for display of exceptions.
478
def report_exception(exc_info, err_file):
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
479
    """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
480
481
    This will show either a full traceback or a short message as appropriate.
482
483
    :return: The appropriate exit code for this error.
484
    """
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
485
    # 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.
486
    log_exception_quietly()
4805.3.1 by Benoît Pierre
Always honor 'error' debug flag.
487
    if 'error' in debug.debug_flags:
488
        print_exception(exc_info, err_file)
489
        return errors.EXIT_ERROR
1740.5.3 by Martin Pool
Cleanup more exception-formatting code
490
    exc_type, exc_object, exc_tb = exc_info
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
491
    if isinstance(exc_object, KeyboardInterrupt):
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
492
        err_file.write("brz: interrupted\n")
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
493
        return errors.EXIT_ERROR
4634.26.1 by Martin Pool
Cleaner message when out of memory
494
    elif isinstance(exc_object, MemoryError):
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
495
        err_file.write("brz: out of memory\n")
5448.5.2 by Karl Bielefeldt
Incorporated suggestions from code review:
496
        if 'mem_dump' in debug.debug_flags:
497
            _dump_memory_usage(err_file)
498
        else:
499
            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
500
        return errors.EXIT_ERROR
3497.3.2 by Martin Pool
Show short error for missing libraries
501
    elif isinstance(exc_object, ImportError) \
502
        and str(exc_object).startswith("No module named "):
503
        report_user_error(exc_info, err_file,
504
            'You may need to install this Python library separately.')
505
        return errors.EXIT_ERROR
2067.3.2 by Martin Pool
Error cleanup review comments:
506
    elif not getattr(exc_object, 'internal_error', True):
1740.5.6 by Martin Pool
Clean up many exception classes.
507
        report_user_error(exc_info, err_file)
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
508
        return errors.EXIT_ERROR
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
509
    elif osutils.is_environment_error(exc_object):
510
        if getattr(exc_object, 'errno', None) == errno.EPIPE:
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
511
            err_file.write("brz: broken pipe\n")
6336.2.1 by Martin Packman
Add is_environment_error() and switch trace to using it
512
            return errors.EXIT_ERROR
1740.5.6 by Martin Pool
Clean up many exception classes.
513
        # Might be nice to catch all of these and show them as something more
514
        # 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.
515
        report_user_error(exc_info, err_file)
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
516
        return errors.EXIT_ERROR
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
517
    else:
1551.9.3 by Aaron Bentley
Revert buggy apport changes
518
        report_bug(exc_info, err_file)
2713.2.1 by Martin Pool
Return exitcode 4 if an internal error occurs
519
        return errors.EXIT_INTERNAL_ERROR
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
520
521
3427.2.2 by James Westby
Just print the exception, keeping the API of log_exception_quietly the same.
522
def print_exception(exc_info, err_file):
523
    exc_type, exc_object, exc_tb = exc_info
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
524
    err_file.write("brz: ERROR: %s.%s: %s\n" % (
3427.2.2 by James Westby
Just print the exception, keeping the API of log_exception_quietly the same.
525
        exc_type.__module__, exc_type.__name__, exc_object))
526
    err_file.write('\n')
527
    traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file)
528
529
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
530
# TODO: Should these be specially encoding the output?
3497.3.2 by Martin Pool
Show short error for missing libraries
531
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
532
    """Report to err_file an error that's not an internal error.
533
534
    These don't get a traceback unless -Derror was given.
3497.3.2 by Martin Pool
Show short error for missing libraries
535
536
    :param exc_info: 3-tuple from sys.exc_info()
537
    :param advice: Extra advice to the user to be printed following the
538
        exception.
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
539
    """
6622.1.27 by Jelmer Vernooij
s/bzr/brz/
540
    err_file.write("brz: ERROR: %s\n" % (exc_info[1],))
3497.3.2 by Martin Pool
Show short error for missing libraries
541
    if advice:
542
        err_file.write("%s\n" % (advice,))
1740.5.1 by Martin Pool
When an unhandled exception occurs, write the traceback to stderr.
543
544
545
def report_bug(exc_info, err_file):
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
546
    """Report an exception that probably indicates a bug in brz"""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
547
    from breezy.crash import report_bug
4584.3.6 by Martin Pool
Move apport integration to bzrlib.crash and send output to a file.
548
    report_bug(exc_info, err_file)
5017.1.1 by Martin Pool
Add bzrlib.initialize
549
550
551
def _flush_stdout_stderr():
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
552
    # called from the breezy library finalizer returned by breezy.initialize()
5017.1.1 by Martin Pool
Add bzrlib.initialize
553
    try:
554
        sys.stdout.flush()
555
        sys.stderr.flush()
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
556
    except ValueError as e:
6133.4.62 by John Arbash Meinel
Add a nicer repr for shutting down.
557
        # On Windows, I get ValueError calling stdout.flush() on a closed
558
        # handle
559
        pass
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
560
    except IOError as e:
5017.1.1 by Martin Pool
Add bzrlib.initialize
561
        import errno
562
        if e.errno in [errno.EINVAL, errno.EPIPE]:
563
            pass
564
        else:
565
            raise
566
567
568
def _flush_trace():
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
569
    # called from the breezy library finalizer returned by breezy.initialize()
5017.1.1 by Martin Pool
Add bzrlib.initialize
570
    global _trace_file
571
    if _trace_file:
572
        _trace_file.flush()
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
573
574
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
575
class EncodedStreamHandler(logging.Handler):
576
    """Robustly write logging events to a stream using the specified encoding
577
578
    Messages are expected to be formatted to unicode, but UTF-8 byte strings
579
    are also accepted. An error during formatting or a str message in another
580
    encoding will be quitely noted as an error in the Bazaar log file.
581
582
    The stream is not closed so sys.stdout or sys.stderr may be passed.
583
    """
584
585
    def __init__(self, stream, encoding=None, errors='strict', level=0):
586
        logging.Handler.__init__(self, level)
587
        self.stream = stream
588
        if encoding is None:
589
            encoding = getattr(stream, "encoding", "ascii")
590
        self.encoding = encoding
591
        self.errors = errors
592
593
    def flush(self):
594
        flush = getattr(self.stream, "flush", None)
595
        if flush is not None:
596
            flush()
597
598
    def emit(self, record):
599
        try:
600
            line = self.format(record)
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
601
            if not isinstance(line, text_type):
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
602
                line = line.decode("utf-8")
6621.2.26 by Martin
Misc set of changes to get started with selftest on Python 3
603
            self.stream.write(line.encode(self.encoding, self.errors) + b"\n")
6015.52.2 by Martin Packman
Add EncodedStreamHandler as more robust logging class
604
        except Exception:
605
            log_exception_quietly()
606
            # Try saving the details that would have been logged in some form
607
            msg = args = "<Unformattable>"
608
            try:
609
                msg = repr(record.msg).encode("ascii")
610
                args = repr(record.args).encode("ascii")
611
            except Exception:
612
                pass
613
            # Using mutter() bypasses the logging module and writes directly
614
            # to the file so there's no danger of getting into a loop here.
615
            mutter("Logging record unformattable: %s %% %s", msg, args)
616
617
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
618
class Config(object):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
619
    """Configuration of message tracing in breezy.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
620
621
    This implements the context manager protocol and should manage any global
622
    variables still used. The default config used is DefaultConfig, but
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
623
    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.
624
    """
625
626
    def __enter__(self):
627
        return self # This is bound to the 'as' clause in a with statement.
628
629
    def __exit__(self, exc_type, exc_val, exc_tb):
630
        return False # propogate exceptions.
631
632
633
class DefaultConfig(Config):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
634
    """A default configuration for tracing of messages in breezy.
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
635
636
    This implements the context manager protocol.
637
    """
638
639
    def __enter__(self):
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
640
        self._original_filename = _brz_log_filename
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
641
        self._original_state = enable_default_logging()
642
        return self # This is bound to the 'as' clause in a with statement.
643
644
    def __exit__(self, exc_type, exc_val, exc_tb):
645
        pop_log_file(self._original_state)
6622.1.33 by Jelmer Vernooij
Fix more tests (all?)
646
        global _brz_log_filename
647
        _brz_log_filename = self._original_filename
5320.2.5 by Robert Collins
Make bzrlib startup use a trace context manager.
648
        return False # propogate exceptions.