← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

  • Committer: Aaron Bentley
  • Date: 2006-03-18 23:40:51 UTC
  • mto: This revision was merged to the branch mainline in revision 1615.
  • Revision ID: aaron.bentley@utoronto.ca-20060318234051-415e5fcb51da82e4
Allow merge against self, make fetching self a noop

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
52
52
_stderr_handler = None
53
53
_stderr_quiet = False
54
54
_trace_file = None
55
 
_trace_depth = 0
56
55
_bzr_log_file = None
57
56
 
58
57
 
79
78
 
80
79
_bzr_logger = logging.getLogger('bzr')
81
80
 
82
 
def note(*args, **kwargs):
83
 
    import bzrlib.ui
84
 
    bzrlib.ui.ui_factory.clear_term()
85
 
    _bzr_logger.info(*args, **kwargs)
86
 
 
87
 
def warning(*args, **kwargs):
88
 
    import bzrlib.ui
89
 
    bzrlib.ui.ui_factory.clear_term()
90
 
    _bzr_logger.warning(*args, **kwargs)
91
 
 
92
 
info = note
 
81
info = note = _bzr_logger.info
 
82
warning =   _bzr_logger.warning
93
83
log_error = _bzr_logger.error
94
84
error =     _bzr_logger.error
95
85
 
232
222
    """Redirect logging to a temporary file for a test
233
223
    
234
224
    returns an opaque reference that should be passed to disable_test_log
235
 
    after the test completes.
 
225
    after the test complete.
236
226
    """
237
227
    disable_default_logging()
238
228
    global _trace_file
239
 
    global _trace_depth
240
229
    hdlr = logging.StreamHandler(to_file)
241
230
    hdlr.setLevel(logging.DEBUG)
242
231
    hdlr.setFormatter(logging.Formatter('%(levelname)8s  %(message)s'))
243
232
    _bzr_logger.addHandler(hdlr)
244
233
    _bzr_logger.setLevel(logging.DEBUG)
245
 
    result = hdlr, _trace_file, _trace_depth
 
234
    result = hdlr, _trace_file
246
235
    _trace_file = to_file
247
 
    _trace_depth += 1
248
236
    return result
249
237
 
250
238
 
251
 
def disable_test_log((test_log_hdlr, old_trace_file, old_trace_depth)):
 
239
def disable_test_log((test_log_hdlr, old_trace_file)):
252
240
    _bzr_logger.removeHandler(test_log_hdlr)
253
 
    test_log_hdlr.close()
254
 
    global _trace_file
255
 
    global _trace_depth
256
241
    _trace_file = old_trace_file
257
 
    _trace_depth = old_trace_depth
258
 
    if not _trace_depth:
259
 
        enable_default_logging()
 
242
    enable_default_logging()
260
243
 
261
244
 
262
245
def format_exception_short(exc_info):