/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: Jan Balster
  • Date: 2006-08-15 12:39:42 UTC
  • mfrom: (1923 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1928.
  • Revision ID: jan@merlinux.de-20060815123942-22c388c6e9a8ac91
merge bzr.dev 1923

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
44
44
import bzrlib.osutils
45
45
from bzrlib.revisionspec import RevisionSpec
46
46
from bzrlib.symbol_versioning import (deprecated_method, zero_eight)
47
 
from bzrlib import trace
 
47
import bzrlib.trace
48
48
from bzrlib.trace import mutter, note, log_error, warning, be_quiet
49
49
 
50
50
plugin_cmds = {}
368
368
            if argsover:
369
369
                args.append(a)
370
370
                continue
 
371
            elif a == '-':
 
372
                args.append(a)
 
373
                continue
371
374
            elif a == '--':
372
375
                # We've received a standalone -- No more flags
373
376
                argsover = True
596
599
        elif a == '--lsprof':
597
600
            opt_lsprof = True
598
601
        elif a == '--lsprof-file':
 
602
            opt_lsprof = True
599
603
            opt_lsprof_file = argv[i + 1]
600
604
            i += 1
601
605
        elif a == '--no-plugins':
669
673
            if not hasattr(e, 'errno'):
670
674
                raise
671
675
            if e.errno != errno.EPIPE:
672
 
                raise
 
676
                # Win32 raises IOError with errno=0 on a broken pipe
 
677
                if sys.platform != 'win32' or e.errno != 0:
 
678
                    raise
673
679
            pass
674
680
        except KeyboardInterrupt:
675
681
            pass
688
694
 
689
695
def run_bzr_catch_errors(argv):
690
696
    try:
691
 
        try:
692
 
            return run_bzr(argv)
693
 
        finally:
694
 
            # do this here inside the exception wrappers to catch EPIPE
695
 
            sys.stdout.flush()
 
697
        return run_bzr(argv)
 
698
        # do this here inside the exception wrappers to catch EPIPE
 
699
        sys.stdout.flush()
696
700
    except Exception, e:
697
701
        # used to handle AssertionError and KeyboardInterrupt
698
702
        # specially here, but hopefully they're handled ok by the logger now