Mercurial > hg
changeset 31058:d2ed0abce08e
outgoing: avoid running pager until we're actually showing changes
Consistent with the new behavior of incoming in the previous patch.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 21 Feb 2017 11:06:02 -0500 |
| parents | 16d7db8f752c |
| children | 2a0c8e3636b0 |
| files | mercurial/commands.py mercurial/hg.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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