Mercurial > hg
diff mercurial/cmdutil.py @ 4550:6ed91894261e
dispatch: hoist debugging hook to runcatch
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 11 Jun 2007 21:09:24 -0500 |
parents | 0c61124ad877 |
children | 61e33f1d44a8 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Jun 11 21:09:24 2007 -0500 +++ b/mercurial/cmdutil.py Mon Jun 11 21:09:24 2007 -0500 @@ -29,7 +29,21 @@ if num: signal.signal(num, catchterm) try: - return dispatch(u, args) + try: + # enter the debugger before command execution + if '--debugger' in args: + pdb.set_trace() + try: + return dispatch(u, args) + finally: + u.flush() + except: + # enter the debugger when we hit an exception + if '--debugger' in args: + pdb.post_mortem(sys.exc_info()[2]) + u.print_exc() + raise + except ParseError, inst: if inst.args[0]: u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) @@ -281,57 +295,43 @@ return runcommand(u, options, d) def runcommand(u, options, d): - # enter the debugger before command execution - if options['debugger']: - pdb.set_trace() - - try: + if options['profile']: + import hotshot, hotshot.stats + prof = hotshot.Profile("hg.prof") try: - if options['profile']: - import hotshot, hotshot.stats - prof = hotshot.Profile("hg.prof") + try: + return prof.runcall(d) + except: try: - try: - return prof.runcall(d) - except: - try: - u.warn(_('exception raised - generating ' - 'profile anyway\n')) - except: - pass - raise - finally: - prof.close() - stats = hotshot.stats.load("hg.prof") - stats.strip_dirs() - stats.sort_stats('time', 'calls') - stats.print_stats(40) - elif options['lsprof']: - try: - from mercurial import lsprof - except ImportError: - raise util.Abort(_( - 'lsprof not available - install from ' - 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) - p = lsprof.Profiler() - p.enable(subcalls=True) - try: - return d() - finally: - p.disable() - stats = lsprof.Stats(p.getstats()) - stats.sort() - stats.pprint(top=10, file=sys.stderr, climit=5) - else: - return d() + u.warn(_('exception raised - generating ' + 'profile anyway\n')) + except: + pass + raise finally: - u.flush() - except: - # enter the debugger when we hit an exception - if options['debugger']: - pdb.post_mortem(sys.exc_info()[2]) - u.print_exc() - raise + prof.close() + stats = hotshot.stats.load("hg.prof") + stats.strip_dirs() + stats.sort_stats('time', 'calls') + stats.print_stats(40) + elif options['lsprof']: + try: + from mercurial import lsprof + except ImportError: + raise util.Abort(_( + 'lsprof not available - install from ' + 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) + p = lsprof.Profiler() + p.enable(subcalls=True) + try: + return d() + finally: + p.disable() + stats = lsprof.Stats(p.getstats()) + stats.sort() + stats.pprint(top=10, file=sys.stderr, climit=5) + else: + return d() def bail_if_changed(repo): modified, added, removed, deleted = repo.status()[:4]