# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2017-02-20 01:16:11
# Node ID 04344226b3ce8e3a1199067d9e38b33844f5fbcb
# Parent  9c827087df388d5547e94b952ebbeac25aaeb484

dispatch: consolidate pager flag handling to a single place

This makes a little more sense, thanks to Martin for suggesting it.

diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -749,7 +749,9 @@ def _dispatch(req):
             for ui_ in uis:
                 ui_.setconfig('ui', 'interactive', 'off', '-y')
 
-        if options['pager'] != 'auto' and not util.parsebool(options['pager']):
+        if util.parsebool(options['pager']):
+            ui.pager('internal-always-' + cmd)
+        elif options['pager'] != 'auto':
             ui.disablepager()
 
         if cmdoptions.get('insecure', False):
@@ -822,8 +824,6 @@ def _dispatch(req):
 
 def _runcommand(ui, options, cmd, cmdfunc):
     """Run a command function, possibly with profiling enabled."""
-    if util.parsebool(options['pager']):
-        ui.pager('internal-always-' + cmd)
     try:
         return cmdfunc()
     except error.SignatureError: