# HG changeset patch # User Matt Mackall # Date 2014-05-09 18:07:50 # Node ID 19b8cfe4396f6939640b4bf6cab5968b9d9bd00f # Parent e1f5f38fd944aa1eab8ee23f87698477da9e60ff pager: break auto out of command check loop diff --git a/hgext/pager.py b/hgext/pager.py --- a/hgext/pager.py +++ b/hgext/pager.py @@ -118,21 +118,22 @@ def uisetup(ui): p = ui.config("pager", "pager", os.environ.get("PAGER")) usepager = False always = util.parsebool(options['pager']) + auto = options['pager'] == 'auto' if not p: pass elif always: usepager = True + elif not auto: + usepager = False else: attend = ui.configlist('pager', 'attend', attended) - auto = options['pager'] == 'auto' cmds, _ = cmdutil.findcmd(cmd, commands.table) ignore = ui.configlist('pager', 'ignore') for cmd in cmds: - if (auto and - (cmd in attend or - (cmd not in ignore and not attend))): + if (cmd in attend or + (cmd not in ignore and not attend)): usepager = True break