← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Robert Collins
  • Date: 2005-10-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
355
355
    'root':                   str,
356
356
    'no-backup':              None,
357
357
    'pattern':                str,
 
358
    'remember':               None,
358
359
    }
359
360
 
360
361
SHORT_OPTIONS = {
624
625
def run_bzr_catch_errors(argv):
625
626
    try:
626
627
        try:
627
 
            try:
628
 
                return run_bzr(argv)
629
 
            finally:
630
 
                # do this here inside the exception wrappers to catch EPIPE
631
 
                sys.stdout.flush()
632
 
        #wrap common errors as CommandErrors.
633
 
        except (NotBranchError,), e:
634
 
            raise BzrCommandError(str(e))
 
628
            return run_bzr(argv)
 
629
        finally:
 
630
            # do this here inside the exception wrappers to catch EPIPE
 
631
            sys.stdout.flush()
635
632
    except BzrCommandError, e:
636
633
        # command line syntax error, etc
637
634
        log_error(str(e))
653
650
            bzrlib.trace.note('broken pipe')
654
651
            return 2
655
652
        else:
 
653
            ## import pdb
 
654
            ## pdb.pm()
656
655
            bzrlib.trace.log_exception()
657
656
            return 2
658
657