outgoing: avoid running pager until we're actually showing changes
authorAugie Fackler <augie@google.com>
Tue, 21 Feb 2017 11:06:02 -0500
changeset 31078 d2ed0abce08e
parent 31077 16d7db8f752c
child 31079 2a0c8e3636b0
outgoing: avoid running pager until we're actually showing changes Consistent with the new behavior of incoming in the previous patch.
mercurial/commands.py
mercurial/hg.py
--- a/mercurial/commands.py	Tue Feb 21 10:53:13 2017 -0500
+++ b/mercurial/commands.py	Tue Feb 21 11:06:02 2017 -0500
@@ -3641,13 +3641,13 @@
     """
     if opts.get('graph'):
         cmdutil.checkunsupportedgraphflags([], opts)
-        ui.pager('outgoing')
         o, other = hg._outgoing(ui, repo, dest, opts)
         if not o:
             cmdutil.outgoinghooks(ui, repo, other, opts, o)
             return
 
         revdag = cmdutil.graphrevs(repo, o, opts)
+        ui.pager('outgoing')
         displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
         cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
         cmdutil.outgoinghooks(ui, repo, other, opts, o)
@@ -3660,13 +3660,12 @@
         if 'bookmarks' not in other.listkeys('namespaces'):
             ui.warn(_("remote doesn't support bookmarks\n"))
             return 0
+        ui.status(_('comparing with %s\n') % util.hidepassword(dest))
         ui.pager('outgoing')
-        ui.status(_('comparing with %s\n') % util.hidepassword(dest))
         return bookmarks.outgoing(ui, repo, other)
 
     repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
     try:
-        ui.pager('outgoing')
         return hg.outgoing(ui, repo, dest, opts)
     finally:
         del repo._subtoppath
--- a/mercurial/hg.py	Tue Feb 21 10:53:13 2017 -0500
+++ b/mercurial/hg.py	Tue Feb 21 11:06:02 2017 -0500
@@ -872,6 +872,7 @@
 
     if opts.get('newest_first'):
         o.reverse()
+    ui.pager('outgoing')
     displayer = cmdutil.show_changeset(ui, repo, opts)
     count = 0
     for n in o: