~abentley/bzr/status

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Aaron Bentley
  • Date: 2009-05-05 18:16:33 UTC
  • mfrom: (1731.1744.1078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: aaron@aaronbentley.com-20090505181633-3qtq1skwjzed0kug
Merge bzr.dev into composite-tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
lazy_import(globals(), """
36
36
import codecs
37
37
import errno
 
38
import threading
38
39
from warnings import warn
39
40
 
40
41
import bzrlib
682
683
 
683
684
    tracer = trace.Trace(count=1, trace=0)
684
685
    sys.settrace(tracer.globaltrace)
 
686
    threading.settrace(tracer.globaltrace)
685
687
 
686
688
    try:
687
689
        return exception_to_return_code(the_callable, *args, **kwargs)