##// END OF EJS Templates
pager: break always out of command check loop
Matt Mackall -
r21278:e1f5f38f default
parent child Browse files
Show More
@@ -117,19 +117,20 b' def uisetup(ui):'
117 def pagecmd(orig, ui, options, cmd, cmdfunc):
117 def pagecmd(orig, ui, options, cmd, cmdfunc):
118 p = ui.config("pager", "pager", os.environ.get("PAGER"))
118 p = ui.config("pager", "pager", os.environ.get("PAGER"))
119 usepager = False
119 usepager = False
120 always = util.parsebool(options['pager'])
120
121
121 if not p:
122 if not p:
122 pass
123 pass
124 elif always:
125 usepager = True
123 else:
126 else:
124 attend = ui.configlist('pager', 'attend', attended)
127 attend = ui.configlist('pager', 'attend', attended)
125 auto = options['pager'] == 'auto'
128 auto = options['pager'] == 'auto'
126 always = util.parsebool(options['pager'])
127
128 cmds, _ = cmdutil.findcmd(cmd, commands.table)
129 cmds, _ = cmdutil.findcmd(cmd, commands.table)
129
130
130 ignore = ui.configlist('pager', 'ignore')
131 ignore = ui.configlist('pager', 'ignore')
131 for cmd in cmds:
132 for cmd in cmds:
132 if (always or auto and
133 if (auto and
133 (cmd in attend or
134 (cmd in attend or
134 (cmd not in ignore and not attend))):
135 (cmd not in ignore and not attend))):
135 usepager = True
136 usepager = True
General Comments 0
You need to be logged in to leave comments. Login now