Mercurial > hg
changeset 16752:359fda6cb01d
pager: use ui._isatty infrastructure
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 20 May 2012 14:33:49 -0500 |
| parents | 2d432a1fc0db |
| children | 9cca7b70f8df |
| files | hgext/pager.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/pager.py Sun May 20 14:31:56 2012 -0500 +++ b/hgext/pager.py Sun May 20 14:33:49 2012 -0500 @@ -53,7 +53,7 @@ testedwith = 'internal' -def _runpager(p): +def _runpager(ui, p): pager = subprocess.Popen(p, shell=True, bufsize=-1, close_fds=util.closefds, stdin=subprocess.PIPE, stdout=sys.stdout, stderr=sys.stderr) @@ -61,7 +61,7 @@ stdout = os.dup(sys.stdout.fileno()) stderr = os.dup(sys.stderr.fileno()) os.dup2(pager.stdin.fileno(), sys.stdout.fileno()) - if util.isatty(sys.stderr): + if ui._isatty(sys.stderr): os.dup2(pager.stdin.fileno(), sys.stderr.fileno()) @atexit.register @@ -72,7 +72,7 @@ pager.wait() def uisetup(ui): - if ui.plain() or '--debugger' in sys.argv or not util.isatty(sys.stdout): + if '--debugger' in sys.argv or not ui.formatted(): return def pagecmd(orig, ui, options, cmd, cmdfunc): @@ -89,7 +89,7 @@ ui.setconfig('ui', 'interactive', False) if util.safehasattr(signal, "SIGPIPE"): signal.signal(signal.SIGPIPE, signal.SIG_DFL) - _runpager(p) + _runpager(ui, p) return orig(ui, options, cmd, cmdfunc) extensions.wrapfunction(dispatch, '_runcommand', pagecmd)