##// END OF EJS Templates
pager: break auto out of command check loop
Matt Mackall -
r21279:19b8cfe4 default
parent child Browse files
Show More
@@ -118,21 +118,22 b' def uisetup(ui):'
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 always = util.parsebool(options['pager'])
121 auto = options['pager'] == 'auto'
121
122
122 if not p:
123 if not p:
123 pass
124 pass
124 elif always:
125 elif always:
125 usepager = True
126 usepager = True
127 elif not auto:
128 usepager = False
126 else:
129 else:
127 attend = ui.configlist('pager', 'attend', attended)
130 attend = ui.configlist('pager', 'attend', attended)
128 auto = options['pager'] == 'auto'
129 cmds, _ = cmdutil.findcmd(cmd, commands.table)
131 cmds, _ = cmdutil.findcmd(cmd, commands.table)
130
132
131 ignore = ui.configlist('pager', 'ignore')
133 ignore = ui.configlist('pager', 'ignore')
132 for cmd in cmds:
134 for cmd in cmds:
133 if (auto and
135 if (cmd in attend or
134 (cmd in attend or
136 (cmd not in ignore and not attend)):
135 (cmd not in ignore and not attend))):
136 usepager = True
137 usepager = True
137 break
138 break
138
139
General Comments 0
You need to be logged in to leave comments. Login now