← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-10-02 06:54:04 UTC
  • mfrom: (3755.1.2 various)
  • Revision ID: pqm@pqm.ubuntu.com-20081002065404-0sjc6vwukw26m5wo
(vila) Fix --verbose leaking into blackbox tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
671
671
def run_bzr(argv):
672
672
    """Execute a command.
673
673
 
674
 
    This is similar to main(), but without all the trappings for
675
 
    logging and error handling.  
676
 
    
677
674
    argv
678
675
       The command-line arguments, without the program name from argv[0]
679
676
       These should already be decoded. All library/test code calling
751
748
        from bzrlib.builtins import cmd_version
752
749
        cmd_version().run_argv_aliases([])
753
750
        return 0
754
 
        
 
751
 
755
752
    if not opt_no_plugins:
756
753
        from bzrlib.plugin import load_plugins
757
754
        load_plugins()
778
775
    run_argv = [argv, alias_argv]
779
776
 
780
777
    try:
 
778
        # We can be called recursively (tests for example), but we don't want
 
779
        # the verbosity level to propagate.
 
780
        saved_verbosity_level = option._verbosity_level
 
781
        option._verbosity_level = 0
781
782
        if opt_lsprof:
782
783
            if opt_coverage_dir:
783
784
                trace.warning(
796
797
            trace.debug_memory('Process status after command:', short=False)
797
798
        return ret or 0
798
799
    finally:
799
 
        # reset, in case we may do other commands later within the same process
800
 
        option._verbosity_level = 0
 
800
        # reset, in case we may do other commands later within the same
 
801
        # process. Commands that want to execute sub-commands must propagate
 
802
        # --verbose in their own way.
 
803
        option._verbosity_level = saved_verbosity_level
801
804
 
802
805
def display_command(func):
803
806
    """Decorator that suppresses pipe/interrupt errors."""
823
826
    import bzrlib.ui
824
827
    from bzrlib.ui.text import TextUIFactory
825
828
    bzrlib.ui.ui_factory = TextUIFactory()
826
 
     
 
829
 
827
830
    # Is this a final release version? If so, we should suppress warnings
828
831
    if bzrlib.version_info[3] == 'final':
829
832
        from bzrlib import symbol_versioning