[PATCH 2 of 9 pager v2] pager: move more behavior into core
Augie Fackler
raf at durin42.com
Thu Feb 16 11:59:11 EST 2017
# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1487198877 18000
# Wed Feb 15 17:47:57 2017 -0500
# Node ID 1a7ae87a4e564240a76d4841f91ffdd4331c90ee
# Parent cd19a77477bcd18d1f7ab4fa73ee0dbf3c7a4e46
pager: move more behavior into core
This moves the global flag and the --pager=yes logic into core. Only
functionality change is that users now always get a --pager flag and
can enable the pager via the flag without the extension active.
Moving the flag into core exposes a defect in the ro localization,
which will have to be corrected later.
diff --git a/hgext/pager.py b/hgext/pager.py
--- a/hgext/pager.py
+++ b/hgext/pager.py
@@ -60,13 +60,11 @@ you can use --pager=<value>::
'''
from __future__ import absolute_import
-from mercurial.i18n import _
from mercurial import (
cmdutil,
commands,
dispatch,
extensions,
- util,
)
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
@@ -78,15 +76,9 @@ testedwith = 'ships-with-hg-core'
def uisetup(ui):
def pagecmd(orig, ui, options, cmd, cmdfunc):
- usepager = False
- always = util.parsebool(options['pager'])
auto = options['pager'] == 'auto'
-
- if always:
- usepager = True
- elif not auto:
+ if auto and not ui.pageractive:
usepager = False
- else:
attend = ui.configlist('pager', 'attend', attended)
ignore = ui.configlist('pager', 'ignore')
cmds, _ = cmdutil.findcmd(cmd, commands.table)
@@ -101,8 +93,8 @@ def uisetup(ui):
usepager = True
break
- if usepager:
- ui.pager('extension-via-attend-' + cmd)
+ if usepager:
+ ui.pager('extension-via-attend-' + cmd)
return orig(ui, options, cmd, cmdfunc)
# Wrap dispatch._runcommand after color is loaded so color can see
@@ -112,10 +104,4 @@ def uisetup(ui):
extensions.wrapfunction(dispatch, '_runcommand', pagecmd)
extensions.afterloaded('color', afterloaded)
-def extsetup(ui):
- commands.globalopts.append(
- ('', 'pager', 'auto',
- _("when to paginate (boolean, always, auto, or never)"),
- _('TYPE')))
-
attended = ['annotate', 'cat', 'diff', 'export', 'glog', 'log', 'qdiff']
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -93,6 +93,8 @@ globalopts = [
('', 'version', None, _('output version information and exit')),
('h', 'help', None, _('display help and exit')),
('', 'hidden', False, _('consider hidden changesets')),
+ ('', 'pager', 'auto',
+ _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
]
dryrunopts = [('n', 'dry-run', None,
diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -819,6 +819,8 @@ def _dispatch(req):
def _runcommand(ui, options, cmd, cmdfunc):
"""Run a command function, possibly with profiling enabled."""
+ if util.parsebool(options['pager']):
+ ui.pager('internal-always-' + cmd)
try:
return cmdfunc()
except error.SignatureError:
diff --git a/tests/test-completion.t b/tests/test-completion.t
--- a/tests/test-completion.t
+++ b/tests/test-completion.t
@@ -138,6 +138,7 @@ Show the global options
--help
--hidden
--noninteractive
+ --pager
--profile
--quiet
--repository
@@ -171,6 +172,7 @@ Show the options for the "serve" command
--ipv6
--name
--noninteractive
+ --pager
--pid-file
--port
--prefix
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -543,6 +543,8 @@ hide outer repo
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
@@ -578,6 +580,8 @@ hide outer repo
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
@@ -856,6 +860,8 @@ extension help itself
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
Make sure that single '-v' option shows help and built-ins only for 'dodo' command
$ hg help -v dodo
@@ -889,6 +895,8 @@ Make sure that single '-v' option shows
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
In case when extension name doesn't match any of its commands,
help message should ask for '-v' to get list of built-in aliases
@@ -960,6 +968,8 @@ help options '-v' and '-v -e' should be
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
$ hg help -v -e dudu
dudu extension -
@@ -992,6 +1002,8 @@ help options '-v' and '-v -e' should be
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
Disabled extension commands:
diff --git a/tests/test-gendoc-ro.t b/tests/test-gendoc-ro.t
--- a/tests/test-gendoc-ro.t
+++ b/tests/test-gendoc-ro.t
@@ -1,4 +1,9 @@
#require docutils gettext
+Error: the current ro localization has some rst defects exposed by
+moving pager to core. These two warnings about references are expected
+until the localization is corrected.
$ $TESTDIR/check-gendoc ro
checking for parse errors
+ gendoc.txt:55: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
+ gendoc.txt:55: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -326,6 +326,8 @@ Test short command list with verbose opt
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
(use 'hg help' for the full list of commands)
@@ -422,6 +424,8 @@ Verbose help for add
--version output version information and exit
-h --help display help and exit
--hidden consider hidden changesets
+ --pager TYPE when to paginate (boolean, always, auto, or never)
+ (default: auto)
Test the textwidth config option
@@ -2523,6 +2527,9 @@ Dish up an empty repo; serve it cold.
<tr><td></td>
<td>--hidden</td>
<td>consider hidden changesets</td></tr>
+ <tr><td></td>
+ <td>--pager TYPE</td>
+ <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
</table>
</div>
@@ -2718,6 +2725,9 @@ Dish up an empty repo; serve it cold.
<tr><td></td>
<td>--hidden</td>
<td>consider hidden changesets</td></tr>
+ <tr><td></td>
+ <td>--pager TYPE</td>
+ <td>when to paginate (boolean, always, auto, or never) (default: auto)</td></tr>
</table>
</div>
More information about the Mercurial-devel
mailing list