dispatch: start profiling earlier

This makes it possible to profile extension loading and setup, which
takes a substantial fraction of overall execution time for fast
commands.

(99% of this commit is simply changes of indentation to reflect the
hoisting of the two calls to maybeprofile to a single one that
happens earlier.)

# no-check-commit

mercurial/dispatch.py

@@ -668,6 +668,7 b' def _dispatch(req):'
         for ui_ in uis:
             ui_.setconfig('profiling', 'enabled', 'true', '--profile')
 
+    with profiling.maybeprofile(lui):
     # Configure extensions in phases: uisetup, extsetup, cmdtable, and
     # reposetup. Programs like TortoiseHg will call _dispatch several
     # times so we keep track of configured extensions in _loaded.
@@ -693,7 +694,6 b' def _dispatch(req):'
     # Check abbreviation/ambiguity of shell alias.
     shellaliasfn = _checkshellalias(lui, ui, args)
     if shellaliasfn:
-        with profiling.maybeprofile(lui):
             return shellaliasfn()
 
     # check for fallback encoding
@@ -710,8 +710,8 b' def _dispatch(req):'
         raise error.Abort(_("option --cwd may not be abbreviated!"))
     if options["repository"]:
         raise error.Abort(_(
-            "option -R has to be separated from other options (e.g. not -qR) "
-            "and --repository may only be abbreviated as --repo!"))
+                "option -R has to be separated from other options (e.g. not "
+                "-qR) and --repository may only be abbreviated as --repo!"))
 
     if options["encoding"]:
         encoding.encoding = options["encoding"]
@@ -720,13 +720,15 b' def _dispatch(req):'
     if options["time"]:
         def get_times():
             t = os.times()
-            if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
+                if t[4] == 0.0:
+                    # Windows leaves this as zero, so use time.clock()
                 t = (t[0], t[1], t[2], t[3], time.clock())
             return t
         s = get_times()
         def print_time():
             t = get_times()
-            ui.warn(_("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
+                ui.warn(
+                    _("time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
                 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
         atexit.register(print_time)
 
@@ -755,7 +757,6 b' def _dispatch(req):'
     elif not cmd:
         return commands.help_(ui, 'shortlist')
 
-    with profiling.maybeprofile(lui):
         repo = None
         cmdpats = args[:]
         if not func.norepo: