# HG changeset patch # User Arun Kulshreshtha # Date 1474572990 25200 # Node ID b19c2679289cc5e9b51eac84b63c304bda0096dc # Parent dfd97e60044cb00d5b2edc87acfc5f567b1b6544 dispatch: make hg --profile wrap reposetup Move profiling.maybeprofile() from _runcommand to _dispatch() so that profiler output will include reposetup. diff -r dfd97e60044c -r b19c2679289c mercurial/dispatch.py --- a/mercurial/dispatch.py Thu Sep 22 12:19:48 2016 -0700 +++ b/mercurial/dispatch.py Thu Sep 22 12:36:30 2016 -0700 @@ -774,7 +774,8 @@ # Check abbreviation/ambiguity of shell alias. shellaliasfn = _checkshellalias(lui, ui, args) if shellaliasfn: - return shellaliasfn() + with profiling.maybeprofile(lui): + return shellaliasfn() # check for fallback encoding fallback = lui.config('ui', 'fallbackencoding') @@ -844,7 +845,7 @@ elif not cmd: return commands.help_(ui, 'shortlist') - if True: + with profiling.maybeprofile(lui): repo = None cmdpats = args[:] if not _cmdattr(ui, cmd, func, 'norepo'): @@ -904,11 +905,10 @@ def _runcommand(ui, options, cmd, cmdfunc): """Run a command function, possibly with profiling enabled.""" - with profiling.maybeprofile(ui): - try: - return cmdfunc() - except error.SignatureError: - raise error.CommandError(cmd, _('invalid arguments')) + try: + return cmdfunc() + except error.SignatureError: + raise error.CommandError(cmd, _('invalid arguments')) def _exceptionwarning(ui): """Produce a warning message for the current active exception"""