/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-20 15:35:17 UTC
  • mto: (1185.50.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1518.
  • Revision ID: john@arbash-meinel.com-20051120153517-2ef7391005322069
[unmerge] removed --quiet work from Robey's patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
35
35
 
36
36
import bzrlib
37
37
import bzrlib.trace
38
 
from bzrlib.trace import mutter, note, log_error, warning, be_quiet
 
38
from bzrlib.trace import mutter, note, log_error, warning
39
39
from bzrlib.errors import (BzrError, 
40
40
                           BzrCheckError,
41
41
                           BzrCommandError,
486
486
            opt_no_plugins = True
487
487
        elif a == '--builtin':
488
488
            opt_builtin = True
489
 
        elif a in ('--quiet', '-q'):
490
 
            be_quiet()
491
489
        else:
492
 
            continue
 
490
            break
493
491
        argv.remove(a)
494
492
 
495
493
    if (not argv) or (argv[0] == '--help'):
513
511
 
514
512
    cmd_obj = get_cmd_object(cmd, plugins_override=not opt_builtin)
515
513
 
516
 
    try:
517
 
        if opt_profile:
518
 
            ret = apply_profiled(cmd_obj.run_argv, argv)
519
 
        else:
520
 
            ret = cmd_obj.run_argv(argv)
521
 
        return ret or 0
522
 
    finally:
523
 
        # reset, in case we may do other commands later within the same process
524
 
        be_quiet(False)
 
514
    if opt_profile:
 
515
        ret = apply_profiled(cmd_obj.run_argv, argv)
 
516
    else:
 
517
        ret = cmd_obj.run_argv(argv)
 
518
    return ret or 0
525
519
 
526
520
def display_command(func):
527
521
    """Decorator that suppresses pipe/interrupt errors."""