changeset 31030:ed0023e47412

diff: migrate to modern pager API
author Augie Fackler <augie@google.com>
date Mon, 06 Feb 2017 22:58:26 -0500
parents d6a703af975b
children bd538ed3b9e6
files hgext/pager.py mercurial/commands.py
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/pager.py	Mon Feb 06 22:57:52 2017 -0500
+++ b/hgext/pager.py	Mon Feb 06 22:58:26 2017 -0500
@@ -110,4 +110,4 @@
         extensions.wrapfunction(dispatch, '_runcommand', pagecmd)
     extensions.afterloaded('color', afterloaded)
 
-attended = ['diff', 'export', 'glog', 'log', 'qdiff']
+attended = ['export', 'glog', 'log', 'qdiff']
--- a/mercurial/commands.py	Mon Feb 06 22:57:52 2017 -0500
+++ b/mercurial/commands.py	Mon Feb 06 22:58:26 2017 -0500
@@ -1940,6 +1940,7 @@
 
     diffopts = patch.diffallopts(ui, opts)
     m = scmutil.match(repo[node2], pats, opts)
+    ui.pager('diff')
     cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
                            listsubrepos=opts.get('subrepos'),
                            root=opts.get('root'))