[PATCH] pager: remove quiet flag
David Soria Parra
dsp at php.net
Fri May 11 09:10:17 CDT 2012
# HG changeset patch
# User David Soria Parra <dsp at php.net>
# Date 1336745329 -7200
# Node ID cb23a0af563de4508a1c31dc6a98e03e396c2521
# Parent 0040c0897f65066502d7fcd08f8b5893ac350bdb
pager: remove quiet flag
With the pager running as a child process, exiting the pager doesn't
result in a broken pipe message. To distinguish the exit broken pipe code
from a mercurial abort we register the default action for SIGPIPE. This
results in a 141 exit code instead of a 255. On windows SIGPIPE doesn't
exists and a ValueError will be thrown.
diff --git a/hgext/pager.py b/hgext/pager.py
--- a/hgext/pager.py
+++ b/hgext/pager.py
@@ -22,12 +22,6 @@
If no pager is set, the pager extensions uses the environment variable
$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.
-If you notice "BROKEN PIPE" error messages, you can disable them by
-setting::
-
- [pager]
- quiet = True
-
You can disable the pager for certain commands by adding them to the
pager.ignore list::
@@ -91,9 +85,11 @@
(cmd not in ui.configlist('pager', 'ignore') and not attend))):
ui.setconfig('ui', 'formatted', ui.formatted())
ui.setconfig('ui', 'interactive', False)
+ try:
+ signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+ except ValueError:
+ pass
_runpager(p)
- if ui.configbool('pager', 'quiet'):
- signal.signal(signal.SIGPIPE, signal.SIG_DFL)
return orig(ui, options, cmd, cmdfunc)
extensions.wrapfunction(dispatch, '_runcommand', pagecmd)
More information about the Mercurial-devel
mailing list